it: do not archive deps.dir into payloads

Explicitly specify plugin versions. Avoids classpath conflicts when
multiple versions of the same task are required.

Author: ibodrov

it/common/pom.xml

@@ -71,4 +71,16 @@
             <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${project.basedir}/src/main/filtered-resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>

it/runtime-v2/src/test/filtered-resources/version.properties renamed to it/common/src/main/filtered-resources/com/walmartlabs/concord/it/common/version.properties

@@ -21,8 +21,8 @@
  */
 
 import com.walmartlabs.concord.common.PathUtils;
+import com.walmartlabs.concord.common.TemporaryPath;
 import com.walmartlabs.concord.common.ZipUtils;
-import com.walmartlabs.concord.sdk.Constants;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -36,27 +36,24 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Stream;
 
 public final class ITUtils {
 
     private static final char[] RANDOM_CHARS = "abcdef0123456789".toCharArray();
 
     public static byte[] archive(URI uri) throws IOException {
-        return archive(uri, null);
-    }
-
-    public static byte[] archive(URI uri, String depsDir) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try (ZipArchiveOutputStream zip = new ZipArchiveOutputStream(out)) {
-            ZipUtils.zip(zip, Paths.get(uri));
-            if (depsDir != null) {
-                ZipUtils.zip(zip, Constants.Files.LIBRARIES_DIR_NAME + "/", Paths.get(depsDir));
+        try (TemporaryPath tmpDir = preprocessDir(uri)) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            try (ZipArchiveOutputStream zip = new ZipArchiveOutputStream(out)) {
+                ZipUtils.zip(zip, tmpDir.path());
             }
+            return out.toByteArray();
         }
-        return out.toByteArray();
     }
 
     public static String resourceToString(Class<?> klass, String resource) throws Exception {
@@ -109,6 +106,31 @@ public static String randomPwd() {
         return "pwd_" + randomString() + "A!";
     }
 
+    private static TemporaryPath preprocessDir(URI uri) throws IOException {
+        Path src = Paths.get(uri);
+
+        // copy files from the specified URI to a temporary directory
+        TemporaryPath tmpDir = PathUtils.tempDir("test");
+        PathUtils.copy(src, tmpDir.path());
+
+        // find and replace all PROJECT_VERSION strings with the current ${project.version}
+        try (Stream<Path> yamlFiles = Files.walk(tmpDir.path())) {
+            for (Path yamlFile : yamlFiles.filter(f -> {
+                String fileName = f.getFileName().toString().toLowerCase();
+                return fileName.endsWith(".yaml") || fileName.endsWith(".yml") || fileName.endsWith(".json");
+            }).toList()) {
+                String content = Files.readString(yamlFile);
+                if (!content.contains("PROJECT_VERSION")) {
+                    continue;
+                }
+                content = content.replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION);
+                Files.writeString(yamlFile, content, StandardOpenOption.TRUNCATE_EXISTING);
+            }
+        }
+
+        return tmpDir;
+    }
+
     private ITUtils() {
     }
 }

it/common/src/main/java/com/walmartlabs/concord/it/common/ITUtils.java

@@ -0,0 +1,43 @@
+package com.walmartlabs.concord.it.common;
+
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2018 Walmart Inc.
+ * -----
+ * Licensed 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.
+ * =====
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public final class Version {
+
+    public static final String PROJECT_VERSION;
+
+    static {
+        try (InputStream in = Version.class.getResourceAsStream("version.properties")) {
+            Properties props = new Properties();
+            props.load(in);
+            PROJECT_VERSION = props.getProperty("project.version");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Version() {
+    }
+}

it/common/src/main/java/com/walmartlabs/concord/it/common/Version.java

@@ -20,29 +20,10 @@
  * =====
  */
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
 public final class ITConstants {
 
-    public static final String PROJECT_VERSION;
     public static final long DEFAULT_TEST_TIMEOUT = 120000;
 
-    static {
-        PROJECT_VERSION = getProperties("version.properties").getProperty("project.version");
-    }
-
-    private static Properties getProperties(String path) {
-        try (InputStream in = ClassLoader.getSystemResourceAsStream(path)) {
-            Properties props = new Properties();
-            props.load(in);
-            return props;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     private ITConstants() {
     }
 }

it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ITConstants.java

@@ -26,6 +26,7 @@
 import com.walmartlabs.concord.client2.HostEntry;
 import com.walmartlabs.concord.client2.NodeRosterHostsApi;
 import com.walmartlabs.concord.client2.ProcessEntry;
+import com.walmartlabs.concord.it.common.Version;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -46,7 +47,7 @@ public void test() throws Exception {
         // run the Ansible flow first to get some data
 
         String concordYml = resourceToString(NodeRosterIT.class.getResource("noderoster/ansible.yml"))
-                .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION);
+                .replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION);
 
         ConcordProcess proc = concord.processes().start(new Payload()
                 .concordYml(concordYml)
@@ -67,7 +68,7 @@ public void test() throws Exception {
         // run the Node Roster flow next to test the plugin
 
         concordYml = resourceToString(ProcessIT.class.getResource("noderoster/noderoster.yml"))
-                .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION);
+                .replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION);
 
         proc = concord.processes().start(new Payload()
                 .concordYml(concordYml));

it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/NodeRosterIT.java

@@ -25,6 +25,7 @@
 import ca.ibodrov.concord.testcontainers.junit5.ConcordRule;
 import com.walmartlabs.concord.client2.*;
 import com.walmartlabs.concord.common.ConfigurationUtils;
+import com.walmartlabs.concord.it.common.Version;
 import com.walmartlabs.concord.sdk.Constants;
 import com.walmartlabs.concord.sdk.MapUtils;
 import org.junit.jupiter.api.Test;
@@ -347,7 +348,7 @@ public void testCheckpointsParallel() throws Exception {
     @Test
     public void testNoStateAfterCheckpoint() throws Exception {
         String concordYml = resourceToString(ProcessIT.class.getResource("checkpointState/concord.yml"))
-                .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION);
+                .replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION);
 
         Payload payload = new Payload().concordYml(concordYml);
 
@@ -418,7 +419,7 @@ public void testForkCheckpoints() throws Exception {
     @Test
     public void testCheckpointsWith3rdPartyClasses() throws Exception {
         String concordYml = resourceToString(NodeRosterIT.class.getResource("checkpointClasses/concord.yml"))
-                .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION);
+                .replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION);
 
         ConcordProcess proc = concord.processes().start(new Payload()
                 .concordYml(concordYml));

it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java

@@ -28,6 +28,7 @@
 import com.icegreen.greenmail.junit5.GreenMailExtension;
 import com.icegreen.greenmail.util.ServerSetup;
 import com.walmartlabs.concord.client2.ProcessEntry;
+import com.walmartlabs.concord.it.common.Version;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.Testcontainers;
@@ -61,7 +62,7 @@ public void test() throws Exception {
 
         // SMTP host and port must be accessible by the process
         // i.e. when running in a container the host must point to the docker host's address
-        concordYml = concordYml.replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION)
+        concordYml = concordYml.replaceAll("PROJECT_VERSION", Version.PROJECT_VERSION)
                 .replaceAll("SMTP_HOST", concord.hostAddressAccessibleByContainers())
                 .replaceAll("SMTP_PORT", String.valueOf(mailServer.getSmtp().getPort()));
 

it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/SmtpIT.java

@@ -38,7 +38,7 @@ public class AnsibleEventIT extends AbstractServerIT {
     @SuppressWarnings("unchecked")
     public void testEvent() throws Exception {
         URI uri = AnsibleEventIT.class.getResource("ansibleEvent").toURI();
-        byte[] payload = archive(uri, ITConstants.DEPENDENCIES_DIR);
+        byte[] payload = archive(uri);
 
         // ---
 
@@ -81,7 +81,7 @@ public void testEvent() throws Exception {
     @Test
     public void testIgnoredFailures() throws Exception {
         URI uri = AnsibleEventIT.class.getResource("ansibleIgnoredFailures").toURI();
-        byte[] payload = archive(uri, ITConstants.DEPENDENCIES_DIR);
+        byte[] payload = archive(uri);
 
         // ---
 
@@ -123,7 +123,7 @@ public void testIgnoredFailures() throws Exception {
     @Test
     public void testFailedHosts() throws Exception {
         URI uri = AnsibleEventIT.class.getResource("ansibleFailedHosts").toURI();
-        byte[] payload = archive(uri, ITConstants.DEPENDENCIES_DIR);
+        byte[] payload = archive(uri);
 
         // ---
 

it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleEventIT.java

@@ -38,7 +38,7 @@ public class AnsibleEventProcessorIT extends AbstractServerIT {
     @Test
     public void test() throws Exception {
         URI uri = AnsibleEventProcessorIT.class.getResource("ansibleEventProcessor").toURI();
-        byte[] payload = archive(uri, ITConstants.DEPENDENCIES_DIR);
+        byte[] payload = archive(uri);
 
         // ---
 
@@ -66,7 +66,7 @@ public void test() throws Exception {
     @Test
     public void testLongNames() throws Exception {
         URI uri = AnsibleEventProcessorIT.class.getResource("ansibleEventProcessor").toURI();
-        byte[] payload = archive(uri, ITConstants.DEPENDENCIES_DIR);
+        byte[] payload = archive(uri);
 
         // ---