Merge pull request #203 from SolaceProducts/moodiRealist/DATAGO-79385…

…-update-opentofu DATAGO-79385: update opentofu and solace provider
SolaceProducts · Sep 18, 2024 · 3bfd50d · 3bfd50d
2 parents 1f44081 + fd4ff88
commit 3bfd50d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/service/application/docker/Dockerfile b/service/application/docker/Dockerfile
@@ -20,16 +20,19 @@ WORKDIR /opt/ema
 
 ARG PLATFORM=linux_amd64
 
-COPY tofu_1.7.0_amd64.apk /opt/ema/terraform
-RUN apk --update add --allow-untrusted /opt/ema/terraform/tofu_1.7.0_amd64.apk
+COPY tofu_1.8.2_amd64.apk /opt/ema/terraform
+RUN apk --update add --allow-untrusted /opt/ema/terraform/tofu_1.8.2_amd64.apk
 
 COPY .terraformrc $HOME/.terraformrc
 RUN printf '#!/bin/ash\ntofu $*' > /opt/ema/terraform/terraform
 RUN chmod +x /opt/ema/terraform/terraform
 ENV PATH $PATH:/opt/ema/terraform
 
-ARG SOLACE_PROVIDER_VERSION=0.9.2-rc.2
-ADD terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.tar.gz /opt/ema/terraform
+ARG SOLACE_PROVIDER_VERSION=1.0.1
+ADD terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.zip /opt/ema/terraform
+
+RUN unzip /opt/ema/terraform/terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.zip -d /opt/ema/terraform && \
+    rm /opt/ema/terraform/terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.zip
 
 ARG GITHASH
 ARG GITBRANCH

diff --git a/service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz b/service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz
diff --git a/service/application/docker/terraform-provider-solacebroker_0.9.2-rc.2_linux_amd64.tar.gz b/service/application/docker/terraform-provider-solacebroker_0.9.2-rc.2_linux_amd64.tar.gz
diff --git a/service/application/docker/terraform-provider-solacebroker_1.0.1_linux_amd64.zip b/service/application/docker/terraform-provider-solacebroker_1.0.1_linux_amd64.zip
diff --git a/...e/application/docker/tofu_1.7.0_amd64.apk → ...e/application/docker/tofu_1.8.2_amd64.apk b/...e/application/docker/tofu_1.7.0_amd64.apk → ...e/application/docker/tofu_1.8.2_amd64.apk
diff --git a/service/application/pom.xml b/service/application/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty-http</artifactId>
-            <version>1.1.13</version>
+            <version>1.1.22</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/service/kafka-plugin/pom.xml b/service/kafka-plugin/pom.xml
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>
-            <version>2.21.27</version>
+            <version>2.28.1</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.msk</groupId>

diff --git a/service/plugin/pom.xml b/service/plugin/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty-http</artifactId>
-            <version>1.1.13</version>
+            <version>1.1.22</version>
             <scope>compile</scope>
         </dependency>
         <dependency>