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

Jump to bottom

DATAGO-66186: Swapping out terraform-1.5.5 for opentofu 1.6.0_beta3-r0 #143

Merged
merged 11 commits into from
Dec 14, 2023
Merged

DATAGO-66186: Swapping out terraform-1.5.5 for opentofu 1.6.0_beta3-r0 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3e477b3
Add thread pool to command manager
gregmeldrum Dec 13, 2023
70835f4
Fix message on error log
gregmeldrum Dec 13, 2023
94536c3
Add failure case for threaded command handling
gregmeldrum Dec 13, 2023
1211f42
Add a test to verify that MDC works
gregmeldrum Dec 14, 2023
e12bca6
Fix code smells
gregmeldrum Dec 14, 2023
e3feb55
Add awaitility dependency
gregmeldrum Dec 14, 2023
86bf00f
Test code cleanup
gregmeldrum Dec 14, 2023
776b6f0
Fix whitespace error
gregmeldrum Dec 14, 2023
6d5f798
Merge branch 'main' into DATAGO-66186-opentofu
gregmeldrum Dec 14, 2023
4b4a6b7
Update Dockerfile to use opentofu instead of terraform
gregmeldrum Dec 14, 2023
1942ddd
Remove terraform 1.5.5 executable from the repo
gregmeldrum Dec 14, 2023
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
7 changes: 5 additions & 2 deletions service/application/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ WORKDIR /opt/ema

ARG PLATFORM=linux_amd64

# Do not update, this is the latest MPL-licensed Terraform version
ADD terraform_1.5.5_${PLATFORM}.tar.gz /opt/ema/terraform
# This is a pre-release version of opentofu. Update to the GA version when it's available.
RUN apk add opentofu=1.6.0_beta3-r0 --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing

ARG SOLACE_PROVIDER_VERSION=0.9.0
ADD terraform-provider-solacebroker_${SOLACE_PROVIDER_VERSION}_${PLATFORM}.tar.gz /opt/ema/terraform

COPY .terraformrc /root/.terraformrc

RUN printf '#!/bin/bash\ntofu $*' > /opt/ema/terraform/terraform
RUN chmod +x /opt/ema/terraform/terraform

ENV PATH $PATH:/opt/ema/terraform

ARG GITHASH
Expand Down
Binary file removed service/application/docker/terraform_1.5.5_linux_amd64.tar.gz
View file
Open in desktop
Binary file not shown.
Loading