Merge branch 'upper-camel-case-checkifnotexists' into 'main'

rjeberhard · rjeberhard · commit 4d36865a1023 · 2023-07-01T12:29:37.000Z
Use CamelCase with initial capital letter for checkIfNotExists enum

See merge request weblogic-cloud/weblogic-kubernetes-operator!4329
diff --git a/common/src/main/resources/Operator.properties b/common/src/main/resources/Operator.properties
@@ -267,7 +267,7 @@ WLSDO-0061=When ''spec.configuration.initializeDomainOnPV'' is specified, one of
   needs to contain the path for domain home ''{0}'', and the ''domainHome'' directory needs to be at least three levels deep \
   under the mount path. For example, if the mount path is /shared, ''domainHome'' path can be ''/shared/domains/domain1'', \
   or ''/shared/wls/domains/domain1'', but cannot be ''/shared/domain1'', or ''/domain1''.
-WLSDO-0062=The ''spec.configuration.initializeDomainOnPV.domain.createIfNotExists'' value of ''domainAndRCU'' is \
+WLSDO-0062=The ''spec.configuration.initializeDomainOnPV.domain.createIfNotExists'' value of ''DomainAndRCU'' is \
   applicable only for ''JRF'' domains, and therefore, is not allowed when \
   ''spec.configuration.initializeDomainOnPV.domain.domainType'' is ''WLS''.
 WLSDO-0063=The ''spec.configuration.initializeDomainOnPV'' is specified but there is no volume in \
diff --git a/documentation/domains/Domain.json b/documentation/domains/Domain.json
@@ -320,12 +320,12 @@
           "$ref": "#/definitions/Opss"
         },
         "createIfNotExists": {
-          "default": "domain",
-          "description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain.",
+          "default": "Domain",
+          "description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain.",
           "type": "string",
           "enum": [
-            "domain",
-            "domainAndRCU"
+            "Domain",
+            "DomainAndRCU"
           ]
         }
       }
diff --git a/documentation/domains/Domain.md b/documentation/domains/Domain.md
@@ -302,7 +302,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain. |
+| `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain. |
 | `domainCreationConfigMap` | string | Name of a ConfigMap containing the WebLogic Deploy Tooling model. |
 | `domainCreationImages` | Array of [Domain Creation Image](#domain-creation-image) | Domain creation images containing WebLogic Deploy Tooling model, application archive, and WebLogic Deploy Tooling installation files. These files will be used to create the domain during introspection. This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share the files from the additional images  |
 | `domainType` | string | WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF. |
diff --git a/documentation/site/content/managing-domains/domain-on-pv/jrf-domain.md b/documentation/site/content/managing-domains/domain-on-pv/jrf-domain.md
@@ -89,7 +89,7 @@ In the domain resource YAML file, you can provide two secrets in the `opss` sect
         initializeDomainOnPV:
         ...
            domain:
-              createIfNotExists: domain
+              createIfNotExists: Domain
               domainType: JRF
               ...
               opss:
diff --git a/documentation/site/content/managing-domains/domain-on-pv/usage.md b/documentation/site/content/managing-domains/domain-on-pv/usage.md
@@ -229,8 +229,8 @@ spec:
     initializeDomainOnPV:
       ...
       domain:
-          # domain |  domainAndRCU
-          createIfNotExists: domainAndRCU
+          # Domain | DomainAndRCU
+          createIfNotExists: DomainAndRCU
           domainCreationImages:
             - image: 'myrepo/domain-images:v1'
           domainType: JRF
@@ -239,14 +239,14 @@ spec:
            walletPasswordSecret: sample-domain1-opss-wallet-password-secret
 ```
 
-| Field                     | Notes                                                                                | Values                                                                  | Required                                                            |
-|---------------------------|--------------------------------------------------------------------------------------|-------------------------------------------------------------------------|---------------------------------------------------------------------|
-| `domainType`                | Type of domain being created.                                                          | `JRF` or `WLS`                                                              | N (default `WLS`)                                           |
-| `createIfNotExists`         | Specifies whether the operator should create the RCU schema first, before creating the domain. | `domain` or `domainAndRCU` (drop existing RCU schema and create new RCU schema) | N (default `domain`) |
-| `domainCreationImages`      | WDT domain images.                                                                    | An array of images.                                                          | Y                                |
-| `domainCreationConfigMap`   | Optional ConfigMap containing extra WDT models.                                       | Kubernetes ConfigMap name.                                               | N                                                  |
-| `osss.walletPasswordSecret` | Password for extracting OPSS wallet for JRF domain.               | Kubernetes Secret name with the key `walletPassword`.                       | Y                                                                   |
-| `osss.walletFileSecret`     | Extracted OPSS wallet file.                                                        | Kubernetes Secret name with the key `walletFile`.                            | N (Only needed when recreating the domain during disaster recovery) |
+| Field                     | Notes                                                                                | Values                                                                          | Required                                                            |
+|---------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------|
+| `domainType`                | Type of domain being created.                                                          | `JRF` or `WLS`                                                                  | N (default `WLS`)                                                   |
+| `createIfNotExists`         | Specifies whether the operator should create the RCU schema first, before creating the domain. | `Domain` or `DomainAndRCU` (drop existing RCU schema and create new RCU schema) | N (default `Domain`)                                                |
+| `domainCreationImages`      | WDT domain images.                                                                    | An array of images.                                                             | Y                                                                   |
+| `domainCreationConfigMap`   | Optional ConfigMap containing extra WDT models.                                       | Kubernetes ConfigMap name.                                                      | N                                                                   |
+| `osss.walletPasswordSecret` | Password for extracting OPSS wallet for JRF domain.               | Kubernetes Secret name with the key `walletPassword`.                           | Y                                                                   |
+| `osss.walletFileSecret`     | Extracted OPSS wallet file.                                                        | Kubernetes Secret name with the key `walletFile`.                               | N (Only needed when recreating the domain during disaster recovery) |
 
 **After a JRF domain is successfully deployed**: follow the next section, [Best practices](#best-practices), to download and back up the OPSS wallet.
 
@@ -472,8 +472,8 @@ spec:
                 requests:
                     storage: 10Gi
       domain:
-          # domain |  domainAndRCU
-          createIfNotExists: domainAndRCU
+          # Domain | DomainAndRCU
+          createIfNotExists: DomainAndRCU
           domainCreationImages:
             - image: 'myrepo/domain-images:v1'
           domainType: JRF
diff --git a/integration-tests/src/test/java/oracle/weblogic/domain/CreateIfNotExists.java b/integration-tests/src/test/java/oracle/weblogic/domain/CreateIfNotExists.java
@@ -6,10 +6,10 @@
 import com.google.gson.annotations.SerializedName;
 
 public enum CreateIfNotExists {
-  @SerializedName("domain")
-  DOMAIN("domain"),
-  @SerializedName("domainAndRCU")
-  DOMAIN_AND_RCU("domainAndRCU");
+  @SerializedName("Domain")
+  DOMAIN("Domain"),
+  @SerializedName("DomainAndRCU")
+  DOMAIN_AND_RCU("DomainAndRCU");
 
   private final String value;
 
diff --git a/integration-tests/src/test/java/oracle/weblogic/domain/DomainOnPV.java b/integration-tests/src/test/java/oracle/weblogic/domain/DomainOnPV.java
@@ -14,7 +14,7 @@
 public class DomainOnPV {
 
   @ApiModelProperty("Specifies if the operator should create only the domain or the domain with RCU"
-      + " (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain.")
+      + " (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain.")
   private CreateIfNotExists createIfNotExists = CreateIfNotExists.DOMAIN;
 
   @ApiModelProperty("WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF.")
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPvUserCreateRcu.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPvUserCreateRcu.java
@@ -665,7 +665,7 @@ void testFmwDomainOnPvUserCreatesRCUMultiImages() {
 
   /**
    * Export the OPSS wallet file secret of Fmw domain from the previous run
-   * CrateIfNotExists set to domainAndRCU
+   * CrateIfNotExists set to DomainAndRCU
    * Use this OPSS wallet file secret to create Fmw domain on PV to connect to the same database
    * Verify Pod is ready and service exists for both admin server and managed servers.
    */
diff --git a/kubernetes/crd/domain-crd.yaml b/kubernetes/crd/domain-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: 84402da7f071cbcf0e5933f9f71f58a22199026bb60d7cd6100fde377bd4bb7b
+    weblogic.sha256: d5bf4792de6093d8414edc6efa477cb911342a195f5def8ed02834b4187ee9f2
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -336,14 +336,14 @@ spec:
                                 type: string
                             type: object
                           createIfNotExists:
-                            default: domain
+                            default: Domain
                             description: 'Specifies if the operator should create
                               only the domain or the domain with RCU (for JRF-based
-                              domains). Legal values: domain, domainAndRCU. Defaults
-                              to domain.'
+                              domains). Legal values: Domain, DomainAndRCU. Defaults
+                              to Domain.'
                             enum:
-                            - domain
-                            - domainAndRCU
+                            - Domain
+                            - DomainAndRCU
                             type: string
                         type: object
                       persistentVolumeClaim:
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-on-pv/domain-resources/JRF/domain-on-pv-JRF-v1.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-on-pv/domain-resources/JRF/domain-on-pv-JRF-v1.yaml
@@ -96,8 +96,8 @@ spec:
          domainType: JRF
 
          # Specifies if the operator should create only the domain or the domain with RCU."
-         # Legal values: domain, domainAndRCU. Defaults to domain."
-         createIfNotExists: domainAndRCU
+         # Legal values: Domain, DomainAndRCU. Defaults to Domain."
+         createIfNotExists: DomainAndRCU
 
          # Domain creation image(s) containing WDT model, archives, and install.
          #   `image`                - Image location
diff --git a/operator/integration-tests/domain-on-pv/README b/operator/integration-tests/domain-on-pv/README
@@ -92,7 +92,7 @@ NOTES:
     to 0 that's fine, the test will dynamically find
     the actual nodeport.
 
-- Call '-rcu' if `createIfExists` mode is other than `domainAndRCU` and the database is not already RCU initialized.
+- Call '-rcu' if `createIfExists` mode is other than `DomainAndRCU` and the database is not already RCU initialized.
 
 - You can run the test in stages. For example:
   ./run-test.sh -precleanup 
diff --git a/operator/integration-tests/domain-on-pv/dpv-sample-wrapper/dpv-domain.yaml.template-JRF b/operator/integration-tests/domain-on-pv/dpv-sample-wrapper/dpv-domain.yaml.template-JRF
@@ -96,8 +96,8 @@ spec:
          domainType: JRF
 
          # Specifies if the operator should create only the domain or the domain with RCU."
-         # Legal values: domain, domainAndRCU. Defaults to domain."
-         createIfNotExists: domainAndRCU
+         # Legal values: Domain, DomainAndRCU. Defaults to Domain."
+         createIfNotExists: DomainAndRCU
 
          # Domain creation image(s) containing WDT model, archives, and install.
          #   `image`                - Image location
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/CreateIfNotExists.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/CreateIfNotExists.java
@@ -6,10 +6,10 @@
 import com.google.gson.annotations.SerializedName;
 
 public enum CreateIfNotExists {
-  @SerializedName("domain")
-  DOMAIN("domain"),
-  @SerializedName("domainAndRCU")
-  DOMAIN_AND_RCU("domainAndRCU");
+  @SerializedName("Domain")
+  DOMAIN("Domain"),
+  @SerializedName("DomainAndRCU")
+  DOMAIN_AND_RCU("DomainAndRCU");
 
   private final String value;
 
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainOnPV.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainOnPV.java
@@ -19,8 +19,8 @@
 public class DomainOnPV {
 
   @Description("Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains)."
-      + " Legal values: domain, domainAndRCU. Defaults to domain.")
-  @Default(strDefault = "domain")
+      + " Legal values: Domain, DomainAndRCU. Defaults to Domain.")
+  @Default(strDefault = "Domain")
   private CreateIfNotExists createIfNotExists = CreateIfNotExists.DOMAIN;
 
   @Description("WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF.")
diff --git a/operator/src/main/resources/scripts/createDomainOnPV.sh b/operator/src/main/resources/scripts/createDomainOnPV.sh
@@ -26,7 +26,7 @@ WDT_CONFIGMAP_ROOT="/weblogic-operator/wdt-config-map"
 
 FATAL_JRF_INTROSPECTOR_ERROR_MSG="Domain On PV domain creation encountered an unrecoverable error.
  Please correct the errors and patch the domain resource 'domain.spec.introspectVersion' with a new
- value and try again. If the domain type requires RCU and you are not setting 'domainAndRCU' in 'domain.spec.configuration.initializeDomainOnPV.domain.createIfNotExists'
+ value and try again. If the domain type requires RCU and you are not setting 'DomainAndRCU' in 'domain.spec.configuration.initializeDomainOnPV.domain.createIfNotExists'
  then you may have to drop and recreate the RCU schema before retry. Introspection Error: "
 
 export WDT_MODEL_SECRETS_DIRS="/weblogic-operator/config-overrides-secrets"
@@ -212,7 +212,7 @@ createDomainFromWDTModel() {
 
     # Determine run rcu or not
 
-    if [ "${INIT_DOMAIN_ON_PV}" == "domainAndRCU" ] && [ "$(required_rcu)" == "1" ]; then
+    if [ "${INIT_DOMAIN_ON_PV}" == "DomainAndRCU" ] && [ "$(required_rcu)" == "1" ]; then
       wdtArgs+=" -run_rcu"
     fi
     trace "About to call '${WDT_BINDIR}/createDomain.sh ${wdtArgs}'."
diff --git a/operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainValidationTest.java b/operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainValidationTest.java
@@ -1519,7 +1519,7 @@ void whenDomainTypeWLSAndCreateIfNotExistsDomainAndRCU_initDomainOnPV_reportErro
 
     assertThat(domain.getValidationFailures(resourceLookup),
         contains(stringContainsInOrder("spec.configuration.initializeDomainOnPV.domain.createIfNotExists",
-            "domainAndRCU", "WLS")));
+            "DomainAndRCU", "WLS")));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -320,12 +320,12 @@`
`320`	`320`	`"$ref": "#/definitions/Opss"`
`321`	`321`	`},`
`322`	`322`	`"createIfNotExists": {`
`323`		`- "default": "domain",`
`324`		`- "description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain.",`
	`323`	`+ "default": "Domain",`
	`324`	`+ "description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain.",`
`325`	`325`	`"type": "string",`
`326`	`326`	`"enum": [`
`327`		`- "domain",`
`328`		`- "domainAndRCU"`
	`327`	`+ "Domain",`
	`328`	`+ "DomainAndRCU"`
`329`	`329`	`]`
`330`	`330`	`}`
`331`	`331`	`}`