Merge pull request #616 from oracle/schema-fix5

rjeberhard · web-flow · commit 2711d982acf3 · 2018-12-12T07:19:30.000-05:00
Schema issue: use webLogicCredentialsSecret
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md
@@ -125,7 +125,7 @@ spec:
   imagePullPolicy: "Never"
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret:
+  webLogicCredentialsSecret:
     name: domain1-weblogic-credentials
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: true
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml
@@ -22,7 +22,7 @@ spec:
   imagePullPolicy: "Never"
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret: 
+  webLogicCredentialsSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md
@@ -146,7 +146,7 @@ spec:
   #- name:
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret:
+  webLogicCredentialsSecret:
     name: domain1-weblogic-credentials
   # The name of the Admin Server
   asName: "admin-server"
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml
@@ -26,7 +26,7 @@ spec:
   %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%- name: %WEBLOGIC_IMAGE_PULL_SECRET_NAME%
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret: 
+  webLogicCredentialsSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Domain.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Domain.java
@@ -289,12 +289,12 @@ public void setStatus(DomainStatus status) {
   }
 
   /**
-   * Reference to secret containing domain administrator username and password.
+   * Reference to secret containing WebLogic startup credentials username and password.
    *
-   * @return admin secret
+   * @return credentials secret
    */
-  public V1SecretReference getAdminSecret() {
-    return spec.getAdminSecret();
+  public V1SecretReference getWebLogicCredentialsSecret() {
+    return spec.getWebLogicCredentialsSecret();
   }
 
   /**
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java
@@ -45,10 +45,10 @@ public class DomainSpec extends BaseConfiguration {
   private String domainHome;
 
   /**
-   * Reference to secret containing domain administrator username and password. Secret must contain
-   * keys names 'username' and 'password' (Required)
+   * Reference to secret containing WebLogic startup credentials username and password. Secret must
+   * contain keys names 'username' and 'password' (Required)
    */
-  @Valid @NotNull private V1SecretReference adminSecret;
+  @Valid @NotNull private V1SecretReference webLogicCredentialsSecret;
 
   /**
    * The in-pod name of the directory to store the domain, node manager, server logs, and server
@@ -264,24 +264,24 @@ public DomainSpec withImage(String image) {
     return this;
   }
 
-  public V1SecretReference getAdminSecret() {
-    return adminSecret;
+  public V1SecretReference getWebLogicCredentialsSecret() {
+    return webLogicCredentialsSecret;
   }
 
   @SuppressWarnings("unused")
-  public void setAdminSecret(V1SecretReference adminSecret) {
-    this.adminSecret = adminSecret;
+  public void setWebLogicCredentialsSecret(V1SecretReference webLogicCredentialsSecret) {
+    this.webLogicCredentialsSecret = webLogicCredentialsSecret;
   }
 
   /**
-   * Reference to secret containing domain administrator username and password. Secret must contain
-   * keys names 'username' and 'password' (Required)
+   * Reference to secret containing WebLogic startup credentials username and password. Secret must
+   * contain keys names 'username' and 'password' (Required)
    *
-   * @param adminSecret admin secret
+   * @param webLogicCredentialsSecret WebLogic startup credentials secret
    * @return this
    */
-  public DomainSpec withAdminSecret(V1SecretReference adminSecret) {
-    this.adminSecret = adminSecret;
+  public DomainSpec withWebLogicCredentialsSecret(V1SecretReference webLogicCredentialsSecret) {
+    this.webLogicCredentialsSecret = webLogicCredentialsSecret;
     return this;
   }
 
@@ -477,7 +477,7 @@ public String toString() {
             .append("domainUID", domainUID)
             .append("domainHome", domainHome)
             .append("domainHomeInImage", domainHomeInImage)
-            .append("adminSecret", adminSecret)
+            .append("webLogicCredentialsSecret", webLogicCredentialsSecret)
             .append("image", image)
             .append("imagePullPolicy", imagePullPolicy)
             .append("storage", storage)
@@ -503,7 +503,7 @@ public int hashCode() {
             .append(domainUID)
             .append(domainHome)
             .append(domainHomeInImage)
-            .append(adminSecret)
+            .append(webLogicCredentialsSecret)
             .append(image)
             .append(imagePullPolicy)
             .append(storage)
@@ -533,7 +533,7 @@ public boolean equals(Object other) {
             .append(domainUID, rhs.domainUID)
             .append(domainHome, rhs.domainHome)
             .append(domainHomeInImage, rhs.domainHomeInImage)
-            .append(adminSecret, rhs.adminSecret)
+            .append(webLogicCredentialsSecret, rhs.webLogicCredentialsSecret)
             .append(image, rhs.image)
             .append(storage, rhs.storage)
             .append(imagePullPolicy, rhs.imagePullPolicy)
diff --git a/model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java b/model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java
@@ -51,7 +51,7 @@ public abstract class DomainTestBase {
   protected static Domain createDomain() {
     return new Domain()
         .withMetadata(new V1ObjectMeta().namespace(NS))
-        .withSpec(new DomainSpec().withAdminSecret(SECRET).withDomainUID(DOMAIN_UID));
+        .withSpec(new DomainSpec().withWebLogicCredentialsSecret(SECRET).withDomainUID(DOMAIN_UID));
   }
 
   protected abstract DomainConfigurator configureDomain(Domain domain);
@@ -66,7 +66,7 @@ protected static String getNamespace() {
 
   @Test
   public void canGetAdminServerInfoFromDomain() {
-    assertThat(domain.getAdminSecret(), equalTo(SECRET));
+    assertThat(domain.getWebLogicCredentialsSecret(), equalTo(SECRET));
   }
 
   @Test
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: domain_ns
 spec:
   # Identify which Secret contains the WebLogic Admin credentials
-  adminSecret:
+  webLogicCredentialsSecret:
     name: admin-secret
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
   # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-3.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-3.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: domain_ns
 spec:
   # Identify which Secret contains the WebLogic Admin credentials
-  adminSecret:
+  webLogicCredentialsSecret:
     name: admin-secret
   adminServer:
   # the T3 endpoints to export. Each entry is an endpoint name,
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: domain_ns
 spec:
   # Identify which Secret contains the WebLogic Admin credentials
-  adminSecret:
+  webLogicCredentialsSecret:
     name: admin-secret
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
   # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java
@@ -82,7 +82,7 @@ List<V1EnvVar> getEnvironmentVariables(TuningParameters tuningParameters) {
       addEnvVar(envVarList, "LOG_HOME", getEffectiveLogHome());
       addEnvVar(envVarList, "INTROSPECT_HOME", getIntrospectHome());
       addEnvVar(envVarList, "SERVER_OUT_IN_POD_LOG", getIncludeServerOutInPodLog());
-      addEnvVar(envVarList, "ADMIN_SECRET_NAME", getAdminSecretName());
+      addEnvVar(envVarList, "CREDENTIALS_SECRET_NAME", getWebLogicCredentialsSecretName());
 
       return envVarList;
     }
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java
@@ -55,8 +55,8 @@ private String getDomainResourceName() {
 
   abstract String getJobName();
 
-  String getAdminSecretName() {
-    return getDomain().getAdminSecret().getName();
+  String getWebLogicCredentialsSecretName() {
+    return getDomain().getWebLogicCredentialsSecret().getName();
   }
 
   private List<V1PersistentVolumeClaim> getClaims() {
@@ -291,7 +291,9 @@ private static V1VolumeMount volumeMount(String volumeName, String mountPath) {
   }
 
   protected V1SecretVolumeSource getSecretsVolume() {
-    return new V1SecretVolumeSource().secretName(getAdminSecretName()).defaultMode(420);
+    return new V1SecretVolumeSource()
+        .secretName(getWebLogicCredentialsSecretName())
+        .defaultMode(420);
   }
 
   protected V1ConfigMapVolumeSource getConfigMapVolumeSource() {
diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/ReadHealthStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/ReadHealthStep.java
@@ -58,12 +58,15 @@ public NextAction apply(Packet packet) {
     String serverName = (String) packet.get(ProcessingConstants.SERVER_NAME);
 
     ServerKubernetesObjects sko = info.getServers().get(serverName);
-    String adminSecretName = spec.getAdminSecret() == null ? null : spec.getAdminSecret().getName();
+    String secretName =
+        spec.getWebLogicCredentialsSecret() == null
+            ? null
+            : spec.getWebLogicCredentialsSecret().getName();
 
     Step getClient =
         HttpClient.createAuthenticatedClientForServer(
             namespace,
-            adminSecretName,
+            secretName,
             new ReadHealthWithHttpClientStep(sko.getService().get(), getNext()));
     return doNext(getClient, packet);
   }
diff --git a/operator/src/main/resources/scripts/introspectDomain.py b/operator/src/main/resources/scripts/introspectDomain.py
@@ -42,7 +42,7 @@
 #     DOMAIN_UID         - completely unique id for this domain
 #     DOMAIN_HOME        - path for the domain configuration
 #     LOG_HOME           - path to override WebLogic server log locations
-#     ADMIN_SECRET_NAME  - name of secret containing admin credentials
+#     CREDENTIALS_SECRET_NAME  - name of secret containing credentials
 #
 # ---------------------------------
 # Outputs (files copied to stdout):
@@ -104,10 +104,10 @@ def open(self):
 
     # before doing anything, get each env var and verify it exists 
 
-    self.DOMAIN_UID         = self.getEnv('DOMAIN_UID')
-    self.DOMAIN_HOME        = self.getEnv('DOMAIN_HOME')
-    self.LOG_HOME           = self.getEnv('LOG_HOME')
-    self.ADMIN_SECRET_NAME  = self.getEnv('ADMIN_SECRET_NAME')
+    self.DOMAIN_UID               = self.getEnv('DOMAIN_UID')
+    self.DOMAIN_HOME              = self.getEnv('DOMAIN_HOME')
+    self.LOG_HOME                 = self.getEnv('LOG_HOME')
+    self.CREDENTIALS_SECRET_NAME  = self.getEnv('CREDENTIALS_SECRET_NAME')
 
     # initialize globals
 
@@ -125,10 +125,10 @@ def open(self):
     self.USERKEY_FILE       = self.INTROSPECT_HOME + '/userKeyNodeManager.secure'
 
     # The following 4 env vars are for unit testing, their defaults are correct for production.
-    self.ADMIN_SECRET_PATH  = self.getEnvOrDef('ADMIN_SECRET_PATH', '/weblogic-operator/secrets')
-    self.CUSTOM_SECRET_ROOT = self.getEnvOrDef('CUSTOM_SECRET_ROOT', '/weblogic-operator/config-overrides-secrets')
-    self.CUSTOM_SITCFG_PATH = self.getEnvOrDef('CUSTOM_SITCFG_PATH', '/weblogic-operator/config-overrides')
-    self.NM_HOST            = self.getEnvOrDef('NM_HOST', 'localhost')
+    self.CREDENTIALS_SECRET_PATH = self.getEnvOrDef('CREDENTIALS_SECRET_PATH', '/weblogic-operator/secrets')
+    self.CUSTOM_SECRET_ROOT      = self.getEnvOrDef('CUSTOM_SECRET_ROOT', '/weblogic-operator/config-overrides-secrets')
+    self.CUSTOM_SITCFG_PATH      = self.getEnvOrDef('CUSTOM_SITCFG_PATH', '/weblogic-operator/config-overrides')
+    self.NM_HOST                 = self.getEnvOrDef('NM_HOST', 'localhost')
 
     # maintain a list of errors that we include in topology.yaml on completion, if any
 
@@ -230,8 +230,8 @@ def __init__(self, env):
   def encrypt(self, cleartext):
     return self.env.encrypt(cleartext)
 
-  def readAdminSecret(self, key):
-    path = self.env.ADMIN_SECRET_PATH + '/' + key
+  def readCredentialsSecret(self, key):
+    path = self.env.CREDENTIALS_SECRET_PATH + '/' + key
     return self.env.readFile(path)
 
 class Generator(SecretManager):
@@ -583,8 +583,8 @@ def generate(self):
       self.close()
 
   def addBootProperties(self):
-    self.writeln("username=" + self.encrypt(self.readAdminSecret("username")))
-    self.writeln("password=" + self.encrypt(self.readAdminSecret("password")))
+    self.writeln("username=" + self.encrypt(self.readCredentialsSecret("username")))
+    self.writeln("password=" + self.encrypt(self.readCredentialsSecret("password")))
 
 class UserConfigAndKeyGenerator(Generator):
 
@@ -607,8 +607,8 @@ def generate(self):
       self.close()
 
   def addUserConfigAndKey(self):
-    username = self.readAdminSecret("username")
-    password = self.readAdminSecret("password")
+    username = self.readCredentialsSecret("username")
+    password = self.readCredentialsSecret("password")
     nm_host = 'localhost'
     nm_port = '5556' 
     domain_name = self.env.getDomain().getName()
@@ -665,12 +665,12 @@ def addSitCfgXml(self):
     self.writeln("</d:domain>")
 
   def customizeNodeManagerCreds(self):
-    admin_username = self.readAdminSecret('username')
-    admin_password = self.encrypt(self.readAdminSecret('password'))
+    username = self.readCredentialsSecret('username')
+    password = self.encrypt(self.readCredentialsSecret('password'))
     self.writeln("<d:security-configuration>")
     self.indent()
-    self.writeln("<d:node-manager-user-name f:combine-mode=\"replace\">" + admin_username + "</d:node-manager-user-name>")
-    self.writeln("<d:node-manager-password-encrypted f:combine-mode=\"replace\">" + admin_password + "</d:node-manager-password-encrypted>")
+    self.writeln("<d:node-manager-user-name f:combine-mode=\"replace\">" + username + "</d:node-manager-user-name>")
+    self.writeln("<d:node-manager-password-encrypted f:combine-mode=\"replace\">" + password + "</d:node-manager-password-encrypted>")
     self.undent()
     self.writeln("</d:security-configuration>")
 
@@ -751,8 +751,8 @@ def __init__(self, env):
         secret_path = os.path.join(self.env.CUSTOM_SECRET_ROOT, secret_name)
         self.addSecretsFromDirectory(secret_path, secret_name)
 
-    self.addSecretsFromDirectory(self.env.ADMIN_SECRET_PATH, 
-                                 self.env.ADMIN_SECRET_NAME)
+    self.addSecretsFromDirectory(self.env.CREDENTIALS_SECRET_PATH, 
+                                 self.env.CREDENTIALS_SECRET_NAME)
 
     self.macroMap['env:DOMAIN_UID']  = self.env.DOMAIN_UID
     self.macroMap['env:DOMAIN_HOME'] = self.env.DOMAIN_HOME
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java
@@ -46,7 +46,7 @@ public class DomainIntrospectorJobTest {
   static final String ADMIN_SERVER = "ADMIN_SERVER";
   static final Integer ADMIN_PORT = 7001;
 
-  private static final String ADMIN_SECRET_NAME = "adminSecretName";
+  private static final String CREDENTIALS_SECRET_NAME = "webLogicCredentialsSecretName";
   private static final String STORAGE_VOLUME_NAME = "weblogic-domain-storage-volume";
   private static final String LATEST_IMAGE = "image:latest";
   static final String VERSIONED_IMAGE = "image:1.2.3";
@@ -164,7 +164,7 @@ private DomainSpec createDomainSpec() {
     DomainSpec spec =
         new DomainSpec()
             .withDomainUID(UID)
-            .withAdminSecret(new V1SecretReference().name(ADMIN_SECRET_NAME))
+            .withWebLogicCredentialsSecret(new V1SecretReference().name(CREDENTIALS_SECRET_NAME))
             .withConfigOverrides(OVERRIDES_CM)
             .withCluster(cluster)
             .withImage(LATEST_IMAGE)
@@ -266,7 +266,7 @@ public void whenJobCreated_hasPredefinedEnvVariables() {
             hasEnvVar("LOG_HOME", LOG_HOME),
             hasEnvVar("INTROSPECT_HOME", getDomainHome()),
             hasEnvVar("SERVER_OUT_IN_POD_LOG", "true"),
-            hasEnvVar("ADMIN_SECRET_NAME", ADMIN_SECRET_NAME)));
+            hasEnvVar("CREDENTIALS_SECRET_NAME", CREDENTIALS_SECRET_NAME)));
   }
 
   V1Container getCreatedJobSpecContainer() {
@@ -452,7 +452,7 @@ List<V1EnvVar> getEnvironmentVariables(TuningParameters tuningParameters) {
     addEnvVar(envVarList, "NODEMGR_HOME", NODEMGR_HOME);
     addEnvVar(envVarList, "LOG_HOME", LOG_HOME);
     addEnvVar(envVarList, "INTROSPECT_HOME", getDomainHome());
-    addEnvVar(envVarList, "ADMIN_SECRET_NAME", ADMIN_SECRET_NAME);
+    addEnvVar(envVarList, "CREDENTIALS_SECRET_NAME", CREDENTIALS_SECRET_NAME);
     addEnvVar(envVarList, "SERVER_OUT_IN_POD_LOG", "true");
 
     return envVarList;
@@ -467,7 +467,7 @@ protected String getDomainHome() {
   }
 
   protected V1SecretVolumeSource getSecretsVolume() {
-    return new V1SecretVolumeSource().secretName(ADMIN_SECRET_NAME).defaultMode(420);
+    return new V1SecretVolumeSource().secretName(CREDENTIALS_SECRET_NAME).defaultMode(420);
   }
 
   protected V1ConfigMapVolumeSource getConfigMapVolumeSource() {
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java
@@ -79,7 +79,7 @@ public abstract class PodHelperTestBase {
   static final Integer ADMIN_PORT = 7001;
   private static final boolean INCLUDE_SERVER_OUT_IN_POD_LOG = true;
 
-  private static final String ADMIN_SECRET_NAME = "adminSecretName";
+  private static final String CREDENTIALS_SECRET_NAME = "webLogicCredentialsSecretName";
   private static final String STORAGE_VOLUME_NAME = "weblogic-domain-storage-volume";
   private static final String LATEST_IMAGE = "image:latest";
   static final String VERSIONED_IMAGE = "image:1.2.3";
@@ -176,7 +176,7 @@ private Domain createDomain() {
   private DomainSpec createDomainSpec() {
     return new DomainSpec()
         .withDomainUID(UID)
-        .withAdminSecret(new V1SecretReference().name(ADMIN_SECRET_NAME))
+        .withWebLogicCredentialsSecret(new V1SecretReference().name(CREDENTIALS_SECRET_NAME))
         .withIncludeServerOutInPodLog(INCLUDE_SERVER_OUT_IN_POD_LOG)
         .withImage(LATEST_IMAGE);
   }

Original file line number	Diff line number	Diff line change
`@@ -289,12 +289,12 @@ public void setStatus(DomainStatus status) {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`/**`
`292`		`- * Reference to secret containing domain administrator username and password.`
	`292`	`+ * Reference to secret containing WebLogic startup credentials username and password.`
`293`	`293`	`*`
`294`		`- * @return admin secret`
	`294`	`+ * @return credentials secret`
`295`	`295`	`*/`
`296`		`- public V1SecretReference getAdminSecret() {`
`297`		`- return spec.getAdminSecret();`
	`296`	`+ public V1SecretReference getWebLogicCredentialsSecret() {`
	`297`	`+ return spec.getWebLogicCredentialsSecret();`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public abstract class DomainTestBase {`
`51`	`51`	`protected static Domain createDomain() {`
`52`	`52`	`return new Domain()`
`53`	`53`	`.withMetadata(new V1ObjectMeta().namespace(NS))`
`54`		`- .withSpec(new DomainSpec().withAdminSecret(SECRET).withDomainUID(DOMAIN_UID));`
	`54`	`+ .withSpec(new DomainSpec().withWebLogicCredentialsSecret(SECRET).withDomainUID(DOMAIN_UID));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`protected abstract DomainConfigurator configureDomain(Domain domain);`
`@@ -66,7 +66,7 @@ protected static String getNamespace() {`
`66`	`66`
`67`	`67`	`@Test`
`68`	`68`	`public void canGetAdminServerInfoFromDomain() {`
`69`		`- assertThat(domain.getAdminSecret(), equalTo(SECRET));`
	`69`	`+ assertThat(domain.getWebLogicCredentialsSecret(), equalTo(SECRET));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Test`