Fix for Terraform 1.10.0 (#439)

* Try to fix 1.10.0 failures * Unblock pipeline --------- Co-authored-by: Yevhen Ivantsov <[email protected]>
atlassian-labs · Dec 2, 2024 · 2ca4064 · 2ca4064
1 parent 4c084b9
commit 2ca4064
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/e2e-test-no-domain.yaml b/.github/workflows/e2e-test-no-domain.yaml
@@ -33,12 +33,12 @@ jobs:
       TF_VAR_bamboo_admin_password: ${{ secrets.TF_VAR_BAMBOO_ADMIN_PASSWORD }}
       TF_VAR_crowd_admin_password: ${{ secrets.TF_VAR_CROWD_ADMIN_PASSWORD }}
       TF_VAR_bitbucket_admin_password: ${{ secrets.TF_VAR_BITBUCKET_ADMIN_PASSWORD }}
-      TF_VAR_kinesis_log_producers_role_arns: ${{ secrets.TF_VAR_KINESIS_LOG_PRODUCERS_ROLE_ARNS }}
       TF_VAR_osquery_fleet_enrollment_secret_name: ${{ secrets.TF_VAR_OSQUERY_FLEET_ENROLLMENT_SECRET_NAME }}
       TF_VAR_osquery_fleet_enrollment_host: ${{ secrets.TF_VAR_OSQUERY_FLEET_ENROLLMENT_HOST }}
       TF_VAR_crowdstrike_secret_name: ${{ secrets.TF_VAR_CROWDSTRIKE_SECRET_NAME }}
       TF_VAR_crowdstrike_kms_key_name: ${{ secrets.TF_VAR_CROWDSTRIKE_KMS_KEY_NAME }}
       TF_VAR_crowdstrike_aws_account_id: ${{ secrets.TF_VAR_CROWDSTRIKE_AWS_ACCOUNT_ID }}
+      kinesis_log_producers_role_arns: ${{ secrets.TF_VAR_KINESIS_LOG_PRODUCERS_ROLE_ARNS }}
       USE_DOMAIN: "false"
 
     steps:

diff --git a/.github/workflows/e2e-test-with-domain.yaml b/.github/workflows/e2e-test-with-domain.yaml
@@ -33,12 +33,12 @@ jobs:
       TF_VAR_bamboo_admin_password: ${{ secrets.TF_VAR_BAMBOO_ADMIN_PASSWORD }}
       TF_VAR_bitbucket_admin_password: ${{ secrets.TF_VAR_BITBUCKET_ADMIN_PASSWORD }}
       TF_VAR_crowd_admin_password: ${{ secrets.TF_VAR_CROWD_ADMIN_PASSWORD }}
-      TF_VAR_kinesis_log_producers_role_arns: ${{ secrets.TF_VAR_KINESIS_LOG_PRODUCERS_ROLE_ARNS }}
       TF_VAR_osquery_fleet_enrollment_secret_name: ${{ secrets.TF_VAR_OSQUERY_FLEET_ENROLLMENT_SECRET_NAME }}
       TF_VAR_osquery_fleet_enrollment_host: ${{ secrets.TF_VAR_OSQUERY_FLEET_ENROLLMENT_HOST }}
       TF_VAR_crowdstrike_secret_name: ${{ secrets.TF_VAR_CROWDSTRIKE_SECRET_NAME }}
       TF_VAR_crowdstrike_kms_key_name: ${{ secrets.TF_VAR_CROWDSTRIKE_KMS_KEY_NAME }}
       TF_VAR_crowdstrike_aws_account_id: ${{ secrets.TF_VAR_CROWDSTRIKE_AWS_ACCOUNT_ID }}
+      kinesis_log_producers_role_arns: ${{ secrets.TF_VAR_KINESIS_LOG_PRODUCERS_ROLE_ARNS }}
       USE_DOMAIN: "true"
 
     steps:

diff --git a/test/e2etest/helper.go b/test/e2etest/helper.go
@@ -195,6 +195,7 @@ func createConfig(t *testing.T, productList []string, useDomain bool, additional
 		vars["domain"] = domain
 		vars["jsm"] = true // This is to cover jsw and jsm in the existing 2 tests to save time and cost.
 	}
+	vars["kinesis_log_producers_role_arns"] = os.Getenv("kinesis_log_producers_role_arns")
 
 	// parse the template
 	tmpl, _ := template.ParseFiles("test-config.tfvars.tmpl")

diff --git a/test/e2etest/test-config.tfvars.tmpl b/test/e2etest/test-config.tfvars.tmpl
@@ -32,6 +32,8 @@ instance_types = ["m5.2xlarge"]
 {{if .domain}}domain = "{{.domain}}"{{end}}
 
 
+kinesis_log_producers_role_arns = {{.kinesis_log_producers_role_arns}}
+
 # Monitoring settings
 monitoring_enabled = true
 monitoring_grafana_expose_lb = true