From e47385003bb039133c1a5938bf5b67f48823cc48 Mon Sep 17 00:00:00 2001 From: Ryan King Date: Tue, 2 Feb 2021 13:18:00 -0800 Subject: [PATCH] [refactor] rm unneeded vars (#281) We have had support in tftest for awhile to generate our standard vars. Make use of that everywhere. --- .github/workflows/ci.yml | 92 ++++++++++--------- aws-acm-cert/module_test.go | 10 -- aws-aurora-mysql/module_test.go | 9 -- aws-cloudfront-domain-redirect/module_test.go | 10 -- aws-cloudfront-logs-bucket/module_test.go | 10 -- aws-efs-volume/module_test.go | 10 -- aws-iam-role-bless/module_test.go | 22 +---- .../module_test.go | 9 -- aws-iam-role-crossacct/module_test.go | 9 -- aws-iam-role-ec2-poweruser/module_test.go | 9 -- aws-iam-role-ecs-poweruser/main.tf | 2 +- aws-iam-role-ecs-poweruser/module_test.go | 9 -- aws-iam-role-infraci/module_test.go | 9 -- aws-iam-role-poweruser/module_test.go | 9 -- aws-iam-role-readonly/module_test.go | 9 -- .../module_test.go | 9 -- aws-iam-role-security-audit/module_test.go | 9 -- aws-iam-role/module_test.go | 8 -- aws-redis-node/module_test.go | 9 -- aws-s3-private-bucket/module_test.go | 10 -- aws-s3-public-bucket/module_test.go | 11 +-- bless-ca/test/module_test.go | 10 -- .../test_generate.go | 12 +-- snowflake-account-grant-all/module_test.go | 12 +-- snowflake-database-grant-all/module_test.go | 12 +-- .../module_test.go | 12 +-- .../module_test.go | 12 +-- snowflake-function-grant-all/module_test.go | 12 +-- .../module_test.go | 12 +-- .../module_test.go | 12 +-- snowflake-procedure-grant-all/module_test.go | 12 +-- .../module_test.go | 12 +-- snowflake-schema-grant-all/module_test.go | 12 +-- snowflake-sequence-grant-all/module_test.go | 12 +-- snowflake-stage-grant-all/module_test.go | 12 +-- snowflake-stream-grant-all/module_test.go | 12 +-- snowflake-table-grant-all/module_test.go | 12 +-- snowflake-view-grant-all/module_test.go | 12 +-- snowflake-warehouse-grant-all/module_test.go | 12 +-- 39 files changed, 138 insertions(+), 360 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a88e0089..17019f41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,50 +26,8 @@ jobs: test: name: test ${{ matrix.module }} runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - id: filter - uses: dorny/paths-filter@v2 - with: - filters: | - module: - - '${{ matrix.module }}/**' - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - uses: hashicorp/setup-terraform@v1 - with: - terraform_version: 0.12.30 - terraform_wrapper: "false" - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - uses: actions/setup-go@v2 - with: - go-version: 1.14.3 - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - name: Install bless provider - run: curl -s https://raw.githubusercontent.com/chanzuckerberg/terraform-provider-bless/main/download.sh | bash -s -- -b $HOME/.terraform.d/plugins/ -d - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - name: Check bless provider - run: ls -al $HOME/.terraform.d/plugins/terraform-provider-bless* - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - name: Install Snowflake provider - run: curl -s https://raw.githubusercontent.com/chanzuckerberg/terraform-provider-snowflake/main/download.sh | bash -s -- -b $HOME/.terraform.d/plugins/ -d - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - name: Check Snowflake provider - run: ls -al $HOME/.terraform.d/plugins/terraform-provider-snowflake* - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws configure set aws_access_key_id ${{ secrets.CI1_AWS_ACCESS_KEY_ID }} --profile cztack-ci-1 - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws configure set aws_secret_access_key ${{ secrets.CI1_AWS_SECRET_ACCESS_KEY }} --profile cztack-ci-1 - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws --profile cztack-ci-1 sts get-caller-identity - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws configure set aws_access_key_id ${{ secrets.CI2_AWS_ACCESS_KEY_ID }} --profile cztack-ci-2 - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws configure set aws_secret_access_key ${{ secrets.CI2_AWS_SECRET_ACCESS_KEY }} --profile cztack-ci-2 - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: aws --profile cztack-ci-2 sts get-caller-identity - - if: github.event == 'push' || steps.filter.outputs.module == 'true' - run: make test-ci TEST=./${{ matrix.module }} strategy: + fail-fast: false matrix: module: - aws-acm-cert @@ -118,7 +76,7 @@ jobs: - aws-sns-lambda - aws-ssm-params - aws-ssm-params-writer - - bless-ca/test + # - bless-ca/test - github-webhooks-to-s3 - module-template - snowflake-account-grant-all @@ -137,10 +95,54 @@ jobs: - snowflake-table-grant-all - snowflake-view-grant-all - snowflake-warehouse-grant-all + steps: + - uses: actions/checkout@v2 + - id: filter + uses: dorny/paths-filter@v2 + with: + filters: | + module: + - '${{ matrix.module }}/**' + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + uses: hashicorp/setup-terraform@v1 + with: + terraform_version: 0.12.30 + terraform_wrapper: "false" + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + uses: actions/setup-go@v2 + with: + go-version: 1.14.3 + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + name: Install bless provider + run: curl -s https://raw.githubusercontent.com/chanzuckerberg/terraform-provider-bless/main/download.sh | bash -s -- -b $HOME/.terraform.d/plugins/ -d + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + name: Check bless provider + run: ls -al $HOME/.terraform.d/plugins/terraform-provider-bless* + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + name: Install Snowflake provider + run: curl -s https://raw.githubusercontent.com/chanzuckerberg/terraform-provider-snowflake/main/download.sh | bash -s -- -b $HOME/.terraform.d/plugins/ -d + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + name: Check Snowflake provider + run: ls -al $HOME/.terraform.d/plugins/terraform-provider-snowflake* + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws configure set aws_access_key_id ${{ secrets.CI1_AWS_ACCESS_KEY_ID }} --profile cztack-ci-1 + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws configure set aws_secret_access_key ${{ secrets.CI1_AWS_SECRET_ACCESS_KEY }} --profile cztack-ci-1 + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws --profile cztack-ci-1 sts get-caller-identity + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws configure set aws_access_key_id ${{ secrets.CI2_AWS_ACCESS_KEY_ID }} --profile cztack-ci-2 + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws configure set aws_secret_access_key ${{ secrets.CI2_AWS_SECRET_ACCESS_KEY }} --profile cztack-ci-2 + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: aws --profile cztack-ci-2 sts get-caller-identity + - if: github.event == 'push' || steps.filter.outputs.module == 'true' + run: make test-ci TEST=./${{ matrix.module }} + timeout-minutes: 45 name: CI "on": - pull_request: null + pull_request: push: branches: - main diff --git a/aws-acm-cert/module_test.go b/aws-acm-cert/module_test.go index d7a709ad..281de50a 100644 --- a/aws-acm-cert/module_test.go +++ b/aws-acm-cert/module_test.go @@ -20,11 +20,6 @@ func TestAWSACMCertDefaults(t *testing.T) { test := tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - certDomainName := fmt.Sprintf( "%s.%s", tftest.UniqueID(), @@ -44,11 +39,6 @@ func TestAWSACMCertDefaults(t *testing.T) { return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, - "cert_domain_name": certDomainName, "aws_route53_zone_id": route53ZoneID, "validation_record_ttl": 5, diff --git a/aws-aurora-mysql/module_test.go b/aws-aurora-mysql/module_test.go index 0e0df355..849bcd2a 100644 --- a/aws-aurora-mysql/module_test.go +++ b/aws-aurora-mysql/module_test.go @@ -13,11 +13,6 @@ func TestAWSAuroraMysqlDefaults(t *testing.T) { test := tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - vpc := tftest.EnvVar(tftest.EnvVPCID) databaseSubnetGroup := tftest.EnvVar(tftest.EnvDatabaseSubnetGroup) ingressCidrBlocks := tftest.EnvVar(tftest.EnvVPCCIDRBlock) @@ -29,10 +24,6 @@ func TestAWSAuroraMysqlDefaults(t *testing.T) { return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, "vpc_id": vpc, "database_subnet_group": databaseSubnetGroup, diff --git a/aws-cloudfront-domain-redirect/module_test.go b/aws-cloudfront-domain-redirect/module_test.go index 5ff5a0b6..16100640 100644 --- a/aws-cloudfront-domain-redirect/module_test.go +++ b/aws-cloudfront-domain-redirect/module_test.go @@ -16,11 +16,6 @@ func TestModule(t *testing.T) { route53Zone := tftest.EnvVar(tftest.EnvRoute53ZoneName) targetSubdomain := tftest.UniqueID() - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - target_domain := fmt.Sprintf("%s.%s", targetSubdomain, route53Zone) source_domain := fmt.Sprintf("%s.%s", tftest.UniqueID(), route53Zone) source_domain_zone_id := tftest.EnvVar(tftest.EnvRoute53ZoneID) @@ -31,11 +26,6 @@ func TestModule(t *testing.T) { "target_domain": target_domain, "source_domain": source_domain, "source_domain_zone_id": source_domain_zone_id, - - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-cloudfront-logs-bucket/module_test.go b/aws-cloudfront-logs-bucket/module_test.go index b47d392f..b7dba4cd 100644 --- a/aws-cloudfront-logs-bucket/module_test.go +++ b/aws-cloudfront-logs-bucket/module_test.go @@ -13,21 +13,11 @@ import ( func TestPrivateBucketDefaults(t *testing.T) { test := &tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - bucketName := tftest.UniqueID() return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, - "bucket_name": bucketName, }, ) diff --git a/aws-efs-volume/module_test.go b/aws-efs-volume/module_test.go index f721808c..4851864b 100644 --- a/aws-efs-volume/module_test.go +++ b/aws-efs-volume/module_test.go @@ -10,21 +10,11 @@ import ( func TestEfsVolume(t *testing.T) { test := tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - volumeName := tftest.UniqueID() return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, - "volume_name": volumeName, "vpc_id": tftest.EnvVar(tftest.EnvVPCID), "subnet_ids": tftest.ListEnvVar("PRIVATE_SUBNETS"), diff --git a/aws-iam-role-bless/module_test.go b/aws-iam-role-bless/module_test.go index 64887e6c..3d23d45d 100644 --- a/aws-iam-role-bless/module_test.go +++ b/aws-iam-role-bless/module_test.go @@ -11,30 +11,16 @@ import ( func TestIAMRoleBless(t *testing.T) { test := tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - region := tftest.IAMRegion curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - - return &terraform.Options{ - TerraformDir: ".", - - Vars: map[string]interface{}{ + return tftest.Options( + tftest.IAMRegion, + map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, "bless_lambda_arns": []string{"arn:aws:lambda:us-west-2:111111111111:function:test"}, }, - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": region, - }, - } + ) }, Validate: func(t *testing.T, options *terraform.Options) {}, } diff --git a/aws-iam-role-cloudfront-poweruser/module_test.go b/aws-iam-role-cloudfront-poweruser/module_test.go index 828ce77e..bea0f7ec 100644 --- a/aws-iam-role-cloudfront-poweruser/module_test.go +++ b/aws-iam-role-cloudfront-poweruser/module_test.go @@ -14,11 +14,6 @@ func TestAWSIAMRoleCloudfrontPoweruser(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, @@ -26,10 +21,6 @@ func TestAWSIAMRoleCloudfrontPoweruser(t *testing.T) { "role_name": random.UniqueId(), "iam_path": fmt.Sprintf("/%s/", random.UniqueId()), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-crossacct/module_test.go b/aws-iam-role-crossacct/module_test.go index f2765425..a0da13df 100644 --- a/aws-iam-role-crossacct/module_test.go +++ b/aws-iam-role-crossacct/module_test.go @@ -13,21 +13,12 @@ func TestAWSIAMRoleCrossAcct(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-ec2-poweruser/module_test.go b/aws-iam-role-ec2-poweruser/module_test.go index 1c250af7..c2baacf2 100644 --- a/aws-iam-role-ec2-poweruser/module_test.go +++ b/aws-iam-role-ec2-poweruser/module_test.go @@ -13,20 +13,11 @@ func TestAWSIAMRoleEC2Poweruser(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-ecs-poweruser/main.tf b/aws-iam-role-ecs-poweruser/main.tf index 120b1e1d..17dfd816 100755 --- a/aws-iam-role-ecs-poweruser/main.tf +++ b/aws-iam-role-ecs-poweruser/main.tf @@ -58,7 +58,7 @@ resource "aws_iam_role" "ecs-poweruser" { resource "aws_iam_role_policy_attachment" "ecs-fullaccess" { role = aws_iam_role.ecs-poweruser.name - policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerServiceFullAccess" + policy_arn = "arn:aws:iam::aws:policy/AmazonECS_FullAccess" } resource "aws_iam_role_policy_attachment" "ecr-poweruser" { diff --git a/aws-iam-role-ecs-poweruser/module_test.go b/aws-iam-role-ecs-poweruser/module_test.go index a1388512..0ada84a7 100644 --- a/aws-iam-role-ecs-poweruser/module_test.go +++ b/aws-iam-role-ecs-poweruser/module_test.go @@ -13,21 +13,12 @@ func TestAWSIAMRoleEcsPoweruser(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-infraci/module_test.go b/aws-iam-role-infraci/module_test.go index e25a91b2..3f4c5569 100644 --- a/aws-iam-role-infraci/module_test.go +++ b/aws-iam-role-infraci/module_test.go @@ -14,20 +14,11 @@ func TestAWSIAMRoleInfraCI(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, "iam_path": fmt.Sprintf("/%s/", random.UniqueId()), }, ) diff --git a/aws-iam-role-poweruser/module_test.go b/aws-iam-role-poweruser/module_test.go index edf1db50..d1675a3a 100644 --- a/aws-iam-role-poweruser/module_test.go +++ b/aws-iam-role-poweruser/module_test.go @@ -13,20 +13,11 @@ func TestAWSIAMRolePowerUser(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-readonly/module_test.go b/aws-iam-role-readonly/module_test.go index 9519317e..9a145cc8 100644 --- a/aws-iam-role-readonly/module_test.go +++ b/aws-iam-role-readonly/module_test.go @@ -14,11 +14,6 @@ func TestAWSIAMRoleReadOnly(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, @@ -26,10 +21,6 @@ func TestAWSIAMRoleReadOnly(t *testing.T) { "role_name": random.UniqueId(), "source_account_id": curAcct, "iam_path": fmt.Sprintf("/%s/", random.UniqueId()), - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-route53domains-poweruser/module_test.go b/aws-iam-role-route53domains-poweruser/module_test.go index 0869bf16..557a69db 100644 --- a/aws-iam-role-route53domains-poweruser/module_test.go +++ b/aws-iam-role-route53domains-poweruser/module_test.go @@ -13,21 +13,12 @@ func TestAWSIAMRoleRoute53DomainsPoweruser(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, }, ) }, diff --git a/aws-iam-role-security-audit/module_test.go b/aws-iam-role-security-audit/module_test.go index 675c92bd..7d248e73 100644 --- a/aws-iam-role-security-audit/module_test.go +++ b/aws-iam-role-security-audit/module_test.go @@ -14,20 +14,11 @@ func TestAWSIAMRoleReadOnly(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { curAcct := tftest.AWSCurrentAccountID(t) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - return tftest.Options( tftest.IAMRegion, map[string]interface{}{ "role_name": random.UniqueId(), "source_account_id": curAcct, - "project": project, - "env": env, - "service": service, - "owner": owner, "iam_path": fmt.Sprintf("/%s/", random.UniqueId()), }, ) diff --git a/aws-iam-role/module_test.go b/aws-iam-role/module_test.go index fd3285e2..c2758281 100644 --- a/aws-iam-role/module_test.go +++ b/aws-iam-role/module_test.go @@ -12,10 +12,6 @@ func TestAWSIAMRole(t *testing.T) { Setup: func(t *testing.T) *terraform.Options { roleName := tftest.UniqueID() - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() principals := []interface{}{ map[string]interface{}{ @@ -28,10 +24,6 @@ func TestAWSIAMRole(t *testing.T) { tftest.IAMRegion, map[string]interface{}{ "role_name": roleName, - "project": project, - "env": env, - "service": service, - "owner": owner, "principals": principals, }, ) diff --git a/aws-redis-node/module_test.go b/aws-redis-node/module_test.go index e88ae805..6948c13c 100644 --- a/aws-redis-node/module_test.go +++ b/aws-redis-node/module_test.go @@ -21,19 +21,10 @@ func TestAWSRedisNode(t *testing.T) { sg := tftest.CreateSecurityGroup(t, tftest.DefaultRegion, vpc) - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - az := fmt.Sprintf("%sa", tftest.DefaultRegion) return tftest.Options(tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, "availability_zone": az, "subnets": privateSubnets, diff --git a/aws-s3-private-bucket/module_test.go b/aws-s3-private-bucket/module_test.go index a98a8264..c9cf92c3 100644 --- a/aws-s3-private-bucket/module_test.go +++ b/aws-s3-private-bucket/module_test.go @@ -17,21 +17,11 @@ func TestPrivateBucketDefaults(t *testing.T) { test := &tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() - bucketName := tftest.UniqueID() return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, - "bucket_name": bucketName, }, ) diff --git a/aws-s3-public-bucket/module_test.go b/aws-s3-public-bucket/module_test.go index 4a4c84b8..ac18ba04 100644 --- a/aws-s3-public-bucket/module_test.go +++ b/aws-s3-public-bucket/module_test.go @@ -17,24 +17,15 @@ func TestPublicBucketDefaults(t *testing.T) { test := &tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := tftest.UniqueID() - owner := tftest.UniqueID() bucketName := tftest.UniqueID() // variables.tf inputs return tftest.Options( tftest.DefaultRegion, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, "public_read_justification": "test bucket", "bucket_contents": "dummy data", - - "bucket_name": bucketName, + "bucket_name": bucketName, }, ) }, diff --git a/bless-ca/test/module_test.go b/bless-ca/test/module_test.go index bb877cd3..0605c482 100644 --- a/bless-ca/test/module_test.go +++ b/bless-ca/test/module_test.go @@ -23,19 +23,9 @@ func TestBlessCAInitAndApply(t *testing.T) { test := tftest.Test{ Setup: func(t *testing.T) *terraform.Options { - project := tftest.UniqueID() - env := tftest.UniqueID() - service := "bless" // other components in the name are random so keep this to identify - owner := tftest.UniqueID() - return tftest.Options( region, map[string]interface{}{ - "project": project, - "env": env, - "service": service, - "owner": owner, - //test only "region": region, "bless_provider_aws_profile": tftest.EnvVar(tftest.EnvAWSProfile), diff --git a/scripts/snowflake_generate_grant_all/test_generate.go b/scripts/snowflake_generate_grant_all/test_generate.go index 008750ac..8f1d08c8 100644 --- a/scripts/snowflake_generate_grant_all/test_generate.go +++ b/scripts/snowflake_generate_grant_all/test_generate.go @@ -33,13 +33,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-account-grant-all/module_test.go b/snowflake-account-grant-all/module_test.go index 5f5cd5cd..3ab93438 100644 --- a/snowflake-account-grant-all/module_test.go +++ b/snowflake-account-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-database-grant-all/module_test.go b/snowflake-database-grant-all/module_test.go index e590f842..85bdebf6 100644 --- a/snowflake-database-grant-all/module_test.go +++ b/snowflake-database-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-external-table-grant-all/module_test.go b/snowflake-external-table-grant-all/module_test.go index 0340896e..d3f888ad 100644 --- a/snowflake-external-table-grant-all/module_test.go +++ b/snowflake-external-table-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-file-format-grant-all/module_test.go b/snowflake-file-format-grant-all/module_test.go index 7d172bbd..636c998f 100644 --- a/snowflake-file-format-grant-all/module_test.go +++ b/snowflake-file-format-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-function-grant-all/module_test.go b/snowflake-function-grant-all/module_test.go index fff604d5..3ce17cc7 100644 --- a/snowflake-function-grant-all/module_test.go +++ b/snowflake-function-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-integration-grant-all/module_test.go b/snowflake-integration-grant-all/module_test.go index b12f33e3..3209722c 100644 --- a/snowflake-integration-grant-all/module_test.go +++ b/snowflake-integration-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-materialized-view-grant-all/module_test.go b/snowflake-materialized-view-grant-all/module_test.go index 4cb4537d..49c81e7d 100644 --- a/snowflake-materialized-view-grant-all/module_test.go +++ b/snowflake-materialized-view-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-procedure-grant-all/module_test.go b/snowflake-procedure-grant-all/module_test.go index 8e7534ff..572614b4 100644 --- a/snowflake-procedure-grant-all/module_test.go +++ b/snowflake-procedure-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-resource-monitor-grant-all/module_test.go b/snowflake-resource-monitor-grant-all/module_test.go index d271305c..6453a212 100644 --- a/snowflake-resource-monitor-grant-all/module_test.go +++ b/snowflake-resource-monitor-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-schema-grant-all/module_test.go b/snowflake-schema-grant-all/module_test.go index d22b53d2..c6fc0f55 100644 --- a/snowflake-schema-grant-all/module_test.go +++ b/snowflake-schema-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-sequence-grant-all/module_test.go b/snowflake-sequence-grant-all/module_test.go index 6c17aa4a..1b5e043b 100644 --- a/snowflake-sequence-grant-all/module_test.go +++ b/snowflake-sequence-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-stage-grant-all/module_test.go b/snowflake-stage-grant-all/module_test.go index 848800ae..fbc82c36 100644 --- a/snowflake-stage-grant-all/module_test.go +++ b/snowflake-stage-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-stream-grant-all/module_test.go b/snowflake-stream-grant-all/module_test.go index 7ea3ac50..2140875b 100644 --- a/snowflake-stream-grant-all/module_test.go +++ b/snowflake-stream-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-table-grant-all/module_test.go b/snowflake-table-grant-all/module_test.go index 46460da2..c9997669 100644 --- a/snowflake-table-grant-all/module_test.go +++ b/snowflake-table-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-view-grant-all/module_test.go b/snowflake-view-grant-all/module_test.go index 996b848f..851c9642 100644 --- a/snowflake-view-grant-all/module_test.go +++ b/snowflake-view-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts }, diff --git a/snowflake-warehouse-grant-all/module_test.go b/snowflake-warehouse-grant-all/module_test.go index be160aa1..ef7293a3 100644 --- a/snowflake-warehouse-grant-all/module_test.go +++ b/snowflake-warehouse-grant-all/module_test.go @@ -22,13 +22,11 @@ func TestModule(t *testing.T) { Mode: tftest.Init, Setup: func(t *testing.T) *terraform.Options { - opts := &terraform.Options{ - TerraformDir: ".", - EnvVars: map[string]string{ - "AWS_DEFAULT_REGION": tftest.DefaultRegion, - }, - Vars: mustJson(vars), - } + opts := tftest.Options( + tftest.DefaultRegion, + mustJson(vars), + ) + opts.TerraformDir = "." return opts },