Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DATAGO-79385: update opentofu and solace provider #203

Merged
merged 6 commits into from
Sep 18, 2024
Merged

DATAGO-79385: update opentofu and solace provider #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5164bf
[DATAGO-79385] Update openTofu and solaceProvider
moodiRealist Sep 13, 2024
6cc46bd
[DATAGO-79385] remove the other old solaceprovider
moodiRealist Sep 13, 2024
29ac609
[DATAGO-79385] remove openTofu old
moodiRealist Sep 13, 2024
b1ea59f
add terraform-provider for solace
moodiRealist Sep 13, 2024
9bf5335
add tofy 1.8.2 apk
CameronRushton Sep 13, 2024
fd4ff88
[DATAGO-79385] Address netty vuls
moodiRealist Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions service/application/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Comment on lines +32 to +33
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why zip file?
you could use .tar and just use add (I think add also works with zip)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this version 1.0.1 only had the zip format available.

As for the command I followed the steps from this confluence page. Please let me know if that's wrong instruction!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ADD command already extracts content no?
the point I am trying to make is most likely, you do not need the unzip command https://docs.docker.com/build/building/best-practices/#add-or-copy

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested removing the unzip command:
Screenshot 2024-09-17 at 11 43 16 AM

The result was that I will be missing the terraform-provider if I do that:
Screenshot 2024-09-17 at 11 18 17 AM
Screenshot 2024-09-17 at 11 42 17 AM

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
Expand Down
Binary file removed service/application/docker/terraform-provider-solacebroker_0.9.1_linux_amd64.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file removed service/application/docker/terraform-provider-solacebroker_0.9.2-rc.2_linux_amd64.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added service/application/docker/terraform-provider-solacebroker_1.0.1_linux_amd64.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...e/application/docker/tofu_1.7.0_amd64.apk → ...e/application/docker/tofu_1.8.2_amd64.apk
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion service/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/kafka-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading