Fix for Openshift certification, 12.2.1.3 mySql driver, and Istio related changes (#4069)

* Fix for OpenShift certification, 12.2.1.3 MySQL driver, and Istio related changes

Author: sankarpn

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java

@@ -7,7 +7,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -65,6 +64,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
+import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_12213;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -95,6 +95,7 @@
 import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
+import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
 import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
@@ -561,10 +562,13 @@ void testOnRestartOverride() {
     //copy the template datasource file for override after replacing JDBC_URL with new datasource url
     Path srcDsOverrideFile = Paths.get(RESOURCE_DIR, "configfiles/configoverridesset1/jdbc-JdbcTestDataSource-1.xml");
     Path dstDsOverrideFile = Paths.get(WORK_DIR, "jdbc-JdbcTestDataSource-1.xml");
-    String tempString = assertDoesNotThrow(()
-        -> Files.readString(srcDsOverrideFile).replaceAll("JDBC_URL", dsUrl2));
-    assertDoesNotThrow(()
-        -> Files.write(dstDsOverrideFile, tempString.getBytes(StandardCharsets.UTF_8)));
+    assertDoesNotThrow(() -> {
+      Files.copy(srcDsOverrideFile, dstDsOverrideFile, StandardCopyOption.REPLACE_EXISTING);
+      replaceStringInFile(dstDsOverrideFile.toString(), "JDBC_URL", dsUrl2);
+      if (WEBLOGIC_12213) {
+        replaceStringInFile(dstDsOverrideFile.toString(), "com.mysql.cj.jdbc.Driver", "com.mysql.jdbc.Driver");
+      }
+    });
 
     List<Path> overrideFiles = new ArrayList<>();
     overrideFiles.add(dstDsOverrideFile);
@@ -1083,6 +1087,9 @@ private void createJdbcDataSource(String dsName, String user, String password,
       logger.info("hostAndPort = {0} ", hostAndPort);
       String jdbcDsUrl = "jdbc:mysql://" + hostAndPort;
 
+      // based on WebLogic image, change the mysql driver to 
+      // 12.2.1.3 - com.mysql.jdbc.Driver
+      // 12.2.1.4 and above - com.mysql.cj.jdbc.Driver
       // create a temporary WebLogic domain property file
       File domainPropertiesFile = File.createTempFile("domain", "properties");
       Properties p = new Properties();
@@ -1092,7 +1099,11 @@ private void createJdbcDataSource(String dsName, String user, String password,
       p.setProperty("admin_password", ADMIN_PASSWORD_DEFAULT);
       p.setProperty("dsName", dsName);
       p.setProperty("dsUrl", jdbcDsUrl);
-      p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
+      if (WEBLOGIC_12213) {
+        p.setProperty("dsDriver", "com.mysql.jdbc.Driver");
+      } else {
+        p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
+      }
       p.setProperty("dsUser", user);
       p.setProperty("dsPassword", password);
       p.setProperty("dsTarget", clusterName);

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java

@@ -213,6 +213,14 @@ void testIstioModelInImageDomain() {
           managedServerPrefix + i, domainNamespace);
       checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
     }
+    
+    
+    // delete the mTLS mode
+    ExecResult result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " delete -f "
+        + Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
+    assertEquals(0, result.exitValue(), "Got expected exit value");
+    logger.info(result.stdout());
+    logger.info(result.stderr());   
 
     String clusterService = domainUid + "-cluster-" + clusterName + "." + domainNamespace + ".svc.cluster.local";
 
@@ -243,17 +251,6 @@ void testIstioModelInImageDomain() {
     int istioIngressPort = getIstioHttpIngressPort();
     logger.info("Istio Ingress Port is {0}", istioIngressPort);
 
-    String curlCmd = "curl -j -sk --show-error --noproxy '*' "
-        + " -H 'Host: " + domainNamespace + ".org'"
-        + " --url http://" + K8S_NODEPORT_HOST + ":" + istioIngressPort + "/console/login/LoginForm.jsp";
-    ExecResult result;
-    logger.info("curl command {0}", curlCmd);
-    result = assertDoesNotThrow(() -> exec(curlCmd, true));
-    assertEquals(0, result.exitValue(), "Got expected exit value");
-    result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " delete -f "
-        + Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
-    assertEquals(0, result.exitValue(), "Got expected exit value");    
-
     // We can not verify Rest Management console thru Adminstration NodePort
     // in istio, as we can not enable Adminstration NodePort
     if (!WEBLOGIC_SLIM) {
@@ -379,14 +376,17 @@ private DomainResource createDomainResource(String domainUid, String domNamespac
   }
 
   private static void enableStrictMode(String namespace) {
-    assertDoesNotThrow(() -> copyFile(Paths.get(RESOURCE_DIR, "istio", "istio-tls-mode.yaml").toFile(),
-          Paths.get(WORK_DIR, "istio-tls-mode.yaml").toFile()));
-    assertDoesNotThrow(() -> replaceStringInFile(Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(),
-          "NAMESPACE", namespace));
-
-    ExecResult result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " apply -f "
-        + Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
-    logger.info(result.stdout());
-    logger.info(result.stderr());
+    Path srcFile = Paths.get(RESOURCE_DIR, "istio", "istio-tls-mode.yaml");
+    Path dstFile = Paths.get(WORK_DIR, "istio-tls-mode.yaml");
+    logger.info("Enabling STRICT mTLS mode in istio in namesapce {0}", namespace);
+    assertDoesNotThrow(() -> {
+      copyFile(srcFile.toFile(), dstFile.toFile());
+      replaceStringInFile(dstFile.toString(), "NAMESPACE", namespace);
+      ExecResult result = ExecCommand.exec(KUBERNETES_CLI + " apply -f "
+          + Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true);
+      assertEquals(0, result.exitValue(), "Failed to enable mTLS strict mode");
+      logger.info(result.stdout());
+      logger.info(result.stderr());
+    });
   }
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpenshiftIstioMiiDomain.java

@@ -295,7 +295,7 @@ private DomainResource createDomainResource(String domainUid, String domNamespac
             .webLogicCredentialsSecret(new V1LocalObjectReference()
                 .name(adminSecretName))
             .includeServerOutInPodLog(true)
-            .serverStartPolicy("IF_NEEDED")
+            .serverStartPolicy("IfNeeded")
             .serverPod(new ServerPod()
                 .putAnnotationsItem("sidecar.istio.io/inject", "true")
                 .addEnvItem(new V1EnvVar()

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/OperatorUtils.java

@@ -622,6 +622,8 @@ public static OperatorParams installAndVerifyOperator(String opNamespace,
 
     if (domainNamespaceSelectionStrategy != null) {
       opParams.domainNamespaceSelectionStrategy(domainNamespaceSelectionStrategy);
+    } else if (domainNamespace.length > 0) {
+      opParams.domainNamespaceSelectionStrategy("List");
     }
 
     // use default image in chart when repoUrl is set, otherwise use latest/current branch operator image