From eaafb085e6ac9b7c1d0a4c319ba89faf2f1d015b Mon Sep 17 00:00:00 2001 From: Albert Heinle Date: Wed, 6 Sep 2023 08:38:01 -0400 Subject: [PATCH] COS-417 - Avoid gcp bug https://github.com/GoogleCloudPlatform/terraformer/issues/1695 states that any version of the GCP provider after 4.60.0 is having an issue. Fixing the version for now. --- .../terraformer_extract_image_helper/Dockerfile | 4 ++-- .../terraformer_extract_image_helper/data/versions.tf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/Dockerfile b/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/Dockerfile index 80f434f..4197cd3 100644 --- a/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/Dockerfile +++ b/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/Dockerfile @@ -25,7 +25,7 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* RUN yum install -y yum-utils-4.0.21-3.el8 RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo -RUN yum -y install terraform-1.2.9-1 +RUN yum -y install terraform-1.5.6-1 RUN yum -y install jq-1.5-12.el8 # Install Azure CLI @@ -37,7 +37,7 @@ RUN dnf install -y azure-cli # Using an older version until https://github.com/GoogleCloudPlatform/terraformer/issues/1648 is fixed. # Do not use 0.8.22 -ENV CURRENT_TERRAFORMER_VERSION=0.8.21 +ENV CURRENT_TERRAFORMER_VERSION=0.8.24 # For now, we assume the provider to be AWS only; we would need to # check for adjustments for other providers, and maybe need to create # extra Docker files for that. diff --git a/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/data/versions.tf b/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/data/versions.tf index 50f6884..b2151b2 100644 --- a/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/data/versions.tf +++ b/src/coguard_cli/discovery/cloud_discovery/terraformer_extract_image_helper/data/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { google = { source = "hashicorp/google" + version = "4.59.0" } aws = { source = "hashicorp/aws"