fix

Author: pegasas

dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/test/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistryDigestTestCase.java

@@ -17,6 +17,8 @@
 
 package org.apache.dolphinscheduler.plugin.registry.zookeeper;
 
+import static org.apache.zookeeper.ZooDefs.Ids.OPEN_ACL_UNSAFE;
+
 import org.apache.dolphinscheduler.plugin.registry.RegistryTestCase;
 
 import org.apache.zookeeper.ZooDefs;
@@ -27,6 +29,7 @@
 import org.apache.zookeeper.server.DumbWatcher;
 import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.stream.Stream;
 
@@ -37,11 +40,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.utility.DockerImageName;
 
+@ActiveProfiles("digest")
 @SpringBootTest(classes = ZookeeperRegistryProperties.class)
 @SpringBootApplication(scanBasePackageClasses = ZookeeperRegistryProperties.class)
 public class ZookeeperRegistryDigestTestCase extends RegistryTestCase<ZookeeperRegistry> {
@@ -67,6 +72,10 @@ public static void setupRootACLForDigest(final ZooKeeper zk) throws Exception {
         zk.setACL("/", Collections.singletonList(acl), -1);
     }
 
+    public static void resetRootACL(final ZooKeeper zk) throws Exception {
+        zk.setACL("/", OPEN_ACL_UNSAFE, -1);
+    }
+
     @SneakyThrows
     @BeforeAll
     public static void setUpTestingServer() {
@@ -78,7 +87,6 @@ public static void setUpTestingServer() {
         System.setProperty("registry.zookeeper.connect-string", "localhost:" + zookeeperContainer.getMappedPort(2181));
         zk = new ZooKeeper("localhost:" + zookeeperContainer.getMappedPort(2181),
                 30000, new DumbWatcher(), new ZKClientConfig());
-        System.setProperty("registry.zookeeper.authorization.digest", ID_PASSWORD);
         setupRootACLForDigest(zk);
     }
 
@@ -91,6 +99,8 @@ public ZookeeperRegistry createRegistry() {
     @SneakyThrows
     @AfterAll
     public static void tearDownTestingServer() {
+        zk.addAuthInfo("digest", ID_PASSWORD.getBytes(StandardCharsets.UTF_8));
+        resetRootACL(zk);
         zk.close();
         zookeeperContainer.close();
     }

dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/test/resources/application-digest.yaml

@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+registry:
+  type: zookeeper
+  zookeeper:
+    namespace: dolphinscheduler
+    connect-string: 127.0.0.1:2181
+    retry-policy:
+      base-sleep-time: 60ms
+      max-sleep: 300ms
+      max-retries: 5
+    session-timeout: 30s
+    connection-timeout: 9s
+    block-until-connected: 3s
+    authorization:
+      digest: root:root_passwd