Merge branch 'brig/client2-switch' of https://github.com/walmartlabs/…

…concord into brig/client2-switch

.github/workflows/build.yml

@@ -44,6 +44,3 @@ jobs:
         env:
           SKIP_DOCKER_TESTS: "true"
         run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -Pjdk${{ matrix.jdk_version }}
-
-      - name: Build with debian docker images
-        run: ./mvnw -s .github/settings.xml -C -B -f docker-images install -DskipTests -Pgha -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }}

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Change log
 
+## [2.5.0] - 2023-12-10
+
+### Added
+
+- concord-server: support @Priority annotation when binding
+Jetty components
+([#841](https://github.com/walmartlabs/concord/pull/841));
+
+### Changed
+
+- runtime-v2: allow "true|false" string in if expression
+([#844](https://github.com/walmartlabs/concord/pull/844));
+- docker-images: Upgrade default Ansible installation to 2.14
+([#843](https://github.com/walmartlabs/concord/pull/843));
+- ansible-plugin: callback compatibility for Ansible 2.14
+([#842](https://github.com/walmartlabs/concord/pull/842));
+- concord-server: resume process now returns BAD_REQUEST
+if no event found
+([#838](https://github.com/walmartlabs/concord/pull/838)).
+
+### Breaking
+
+- docker-images: drop CentOS-based images, use Debian by default
+([#843](https://github.com/walmartlabs/concord/pull/843).
+
+
+
 ## [2.4.0] - 2023-11-26
 
 ### Added

README.md

@@ -39,14 +39,13 @@ cd concord
 Available Maven profiles:
 
 - `docker` - build Docker images;
-- `debian` - build Debian-based Docker images instead of the default CentOS base;
 - `it` - run integration tests;
-- ``jdk17-aarch64` - use a different JDK version for building artifacts and Docker images.
+- `jdk17-aarch64` - use a different JDK version for building artifacts and Docker images.
 
 Profiles can be combined, e.g.
 
 ```
-./mvnw clean install -Pdocker -Pdebian -Pit -Pjdk17-aarch64
+./mvnw clean install -Pdocker -Pit -Pjdk17-aarch64
 ```
 
 ## Console

agent/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

cli/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client2/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client2/src/main/java/com/walmartlabs/concord/client2/impl/MultipartRequestBodyHandler.java

@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 
@@ -36,6 +37,7 @@ public static HttpEntity handle(ObjectMapper objectMapper, Map<String, Object> d
         return handle(new MultipartBuilder(), objectMapper, data);
     }
 
+    @SuppressWarnings("unchecked")
     public static HttpEntity handle(MultipartBuilder b, ObjectMapper objectMapper, Map<String, Object> data) {
         for (Map.Entry<String, Object> e : data.entrySet()) {
             String k = e.getKey();
@@ -60,6 +62,8 @@ public static HttpEntity handle(MultipartBuilder b, ObjectMapper objectMapper, M
                 b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, v.toString()));
             } else if (v instanceof String[]) {
                 b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, String.join(",", (String[]) v)));
+            } else if (v instanceof Collection<?>) {
+                b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, String.join(",", (Collection) v)));
             } else if (v instanceof UUID) {
                 b.addFormDataPart(k, v.toString());
             } else if (v instanceof Enum<?>) {

common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

console2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

dependency-manager/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docker-images/agent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.walmartlabs.concord.docker</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <properties>
         <agent.image>${docker.namespace}/concord-agent</agent.image>
         <docker.tagbase>${agent.image}</docker.tagbase>
-        <docker.file>oss/centos/Dockerfile</docker.file>
+        <docker.file>oss/debian/Dockerfile</docker.file>
         <docker.allowPull>false</docker.allowPull>
     </properties>
 
@@ -117,12 +117,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>debian</id>
-            <properties>
-                <docker.file>oss/debian/Dockerfile</docker.file>
-            </properties>
-        </profile>
-    </profiles>
 </project>

docker-images/ansible/galaxy_requirements.yml

@@ -0,0 +1,28 @@
+---
+collections:
+  - name: community.general
+    version: "7.0.1"
+  - name: ansible.windows
+    version: "1.14.0"
+  - name: ansible.posix
+    version: "1.5.4"
+  - name: community.windows
+    version: "1.13.0"
+  - name: kubernetes.core
+    version: "2.4.0"
+  - name: community.crypto
+    version: "2.13.1"
+  - name: community.mysql
+    version: "3.7.1"
+  - name: openstack.cloud
+    version: "2.1.0"
+  - name: community.postgresql
+    version: "2.4.1"
+  - name: community.docker
+    version: "3.4.6"
+  - name: "ansible.netcommon"
+    version: "5.1.1"
+  - name: "google.cloud"
+    version: "1.1.3"
+  - name: "chocolatey.chocolatey"
+    version: "1.4.0"

docker-images/ansible/oss/debian/Dockerfile

@@ -10,6 +10,8 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 RUN mkdir -p /workspace
 WORKDIR /workspace
 
+COPY galaxy_requirements.yml galaxy_requirements.yml
+
 RUN DEBIAN_FRONTEND=${DEBIAN_FRONTEND} apt-get -y install \
     gcc \
     g++ \
@@ -29,21 +31,27 @@ ENV VIRTUAL_ENV=/usr/local/bin/concord_venv
 
 RUN umask 0022 && \
     pip3 install --no-cache-dir --upgrade --break-system-packages --ignore-installed \
-    "cryptography<=3.3.1" \
-    "ansible>=2.8.0,<2.9.0" \
-    "Appium-Python-Client<1.0" \
-    "openshift<=0.11.2" \
-    "jinja2<=3.0.3" \
-    boto3 \
-    botocore \
-    bzt \
-    docker \
-    kerberos \
-    pbr \
-    pyvmomi \
-    "pywinrm>=0.4.1" \
-    requests_kerberos \
-    urllib3 \
-    ujson 
+        "cryptography<=3.4.8" \
+        "ansible-core>=2.14,<2.15" \
+        "Appium-Python-Client<1.0" \
+        "openshift==0.13.2" \
+        "jinja2<=3.1.0" \
+        boto3 \
+        botocore \
+        bzt \
+        docker \
+        kerberos \
+        kubernetes \
+        pyyaml \
+        pbr \
+        pyvmomi \
+        "pywinrm>=0.4.3" \
+        requests_kerberos \
+        urllib3 \
+        ujson \
+        virtualenv
+
+RUN umask 0022 && \
+    ansible-galaxy collection install -p /usr/share/ansible/collections -r galaxy_requirements.yml
 
 USER concord

docker-images/ansible/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.walmartlabs.concord.docker</groupId>
         <artifactId>parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <properties>
         <ansible.image>${docker.namespace}/concord-ansible</ansible.image>
         <docker.tagbase>${ansible.image}</docker.tagbase>
-        <docker.file>oss/centos/Dockerfile</docker.file>
+        <docker.file>oss/debian/Dockerfile</docker.file>
         <docker.allowPull>false</docker.allowPull>
     </properties>
 
@@ -42,13 +42,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>debian</id>
-            <properties>
-                <docker.file>oss/debian/Dockerfile</docker.file>
-            </properties>
-        </profile>
-    </profiles>
 </project>