fix: treat AWS account IDs as strings (#634)

chanzuckerberg · Apr 26, 2022 · d8f52bc · d8f52bc
1 parent d825491
commit d8f52bc
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 40 deletions.
diff --git a/templates/templates/component/terraform/fogg.tf.tmpl b/templates/templates/component/terraform/fogg.tf.tmpl
@@ -159,7 +159,7 @@ variable "aws_accounts" {
   type =  map(string)
   default = {
   {{ range $account, $id := .Accounts }}
-    {{ $account }} = {{ $id }}
+    {{ $account }} = "{{ $id }}"
   {{ end }}
   }
 }
diff --git a/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml b/testdata/v2_full_yaml/.github/workflows/fogg_ci.yml
@@ -44,7 +44,7 @@ jobs:
       - run: aws configure set aws_access_key_id     ${{ secrets.IDACCT_AWS_ACCESS_KEY_ID }}     --profile _idacct
       - run: aws configure set aws_secret_access_key ${{ secrets.IDACCT_AWS_SECRET_ACCESS_KEY }} --profile _idacct
       - run: aws --profile _idacct sts get-caller-identity
-      - run: aws configure set profile.profile.role_arn arn:aws:iam::456:role/foo
+      - run: aws configure set profile.profile.role_arn arn:aws:iam::00456:role/foo
       - run: aws configure set profile.profile.source_profile _idacct
       - run: aws --profile profile sts get-caller-identity
       # we only run the following if there are changes in the terraform/* directory

diff --git a/testdata/v2_full_yaml/fogg.yml b/testdata/v2_full_yaml/fogg.yml
@@ -2,7 +2,7 @@ accounts:
   bar:
     providers:
       aws:
-        account_id: 456
+        account_id: 00456
         additional_regions:
           - us-east-1
           - us-east-2
@@ -44,7 +44,7 @@ defaults:
   project: proj
   providers:
     aws:
-      account_id: 456
+      account_id: 00456
       profile: profile
       region: us-west-2
       version: 0.12.0

diff --git a/testdata/v2_full_yaml/terraform/accounts/bar/Makefile b/testdata/v2_full_yaml/terraform/accounts/bar/Makefile
diff --git a/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf b/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf b/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf
diff --git a/testdata/v2_full_yaml/terraform/global/fogg.tf b/testdata/v2_full_yaml/terraform/global/fogg.tf