From b57003e959c00c30fc10037b13e84c37315a79b7 Mon Sep 17 00:00:00 2001 From: Yevhen Ivantsov Date: Fri, 29 Nov 2024 15:15:33 +1100 Subject: [PATCH 1/2] Try to fix 1.10.0 failures --- .github/workflows/e2e-test-no-domain.yaml | 2 +- test/e2etest/helper.go | 1 + test/e2etest/test-config.tfvars.tmpl | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test-no-domain.yaml b/.github/workflows/e2e-test-no-domain.yaml index 903c4a09..5e941c4f 100644 --- 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/test/e2etest/helper.go b/test/e2etest/helper.go index d4789ae4..99accc62 100644 --- 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 index 5da2f950..b6dcbb22 100644 --- 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 From 14b4bfa86529b89b35cc7245ec11e5ca31740539 Mon Sep 17 00:00:00 2001 From: Yevhen Ivantsov Date: Fri, 29 Nov 2024 16:22:59 +1100 Subject: [PATCH 2/2] Unblock pipeline --- .github/workflows/e2e-test-with-domain.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test-with-domain.yaml b/.github/workflows/e2e-test-with-domain.yaml index d3c3f29c..9203360f 100644 --- 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: