port 3713 to main (#3727)

Author: sankarpn

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

@@ -54,6 +54,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_NGINX_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
+import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.ITTESTS_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -228,7 +229,7 @@ void testSampleDomainInImage(String model) {
     // update domainHomeImageBase with right values in create-domain-inputs.yaml
     assertDoesNotThrow(() -> {
       replaceStringInFile(get(sampleBase.toString(), "create-domain-inputs.yaml").toString(),
-              "domainHomeImageBase: container-registry.oracle.com/middleware/weblogic:" + WEBLOGIC_IMAGE_TAG,
+              "domainHomeImageBase: container-registry.oracle.com/middleware/weblogic:" + WEBLOGIC_IMAGE_TAG_DEFAULT,
               "domainHomeImageBase: " + WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
       replaceStringInFile(get(sampleBase.toString(), "create-domain-inputs.yaml").toString(),
               "#image:",
@@ -303,7 +304,7 @@ void testSampleDomainInPv(String model) {
               "createDomainFilesDir: wlst", "createDomainFilesDir: "
                       +  script);
       replaceStringInFile(get(sampleBase.toString(), "create-domain-inputs.yaml").toString(),
-              "image: container-registry.oracle.com/middleware/weblogic:" + WEBLOGIC_IMAGE_TAG,
+              "image: container-registry.oracle.com/middleware/weblogic:" + WEBLOGIC_IMAGE_TAG_DEFAULT,
               "image: " + WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
     });
 

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

@@ -7,7 +7,6 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -500,15 +499,16 @@ public static void replaceStringInFile(String filePath, String regex, String rep
       throws IOException {
     LoggingFacade logger = getLogger();
     Path src = Paths.get(filePath);
-    logger.info("Replacing {0} in {1}", regex, src.toString());
-    Charset charset = StandardCharsets.UTF_8;
-    String content = new String(Files.readAllBytes(src), charset);
-    String newcontent = content.replaceAll(regex, replacement);
-    logger.info("with {0}", replacement);
-    if (content.equals(newcontent)) {
+    logger.info("Replacing {0} in {1} with {2}", regex, src.toString(), replacement);
+    String content = new String(Files.readAllBytes(src), StandardCharsets.UTF_8);
+    if (!content.contains(regex)) {
       logger.info("search string {0} not found to replace with {1}", regex, replacement);
     }
-    Files.write(src, newcontent.getBytes(charset));
+    long oldModified = src.toFile().lastModified();
+    Files.write(src, content.replaceAll(regex, replacement).getBytes(StandardCharsets.UTF_8));
+    if (oldModified == src.toFile().lastModified()) {
+      logger.info("No modification was done to the file");
+    }
   }
 
   /**