chore(deps): update terraform (minor) (#216)

* chore(deps): update terraform * feat: update envrc files --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Barry Morrison <[email protected]>
trussworks · Jan 8, 2025 · 77d4e84 · 77d4e84
1 parent 13531d8
commit 77d4e84
Show file tree

Hide file tree

Showing 13 changed files with 443 additions and 286 deletions.
diff --git a/.envrc b/.envrc
@@ -1,5 +1,18 @@
-# Have aws-vault use the login keychain for better timeout behavior
-export AWS_VAULT_KEYCHAIN_NAME=login
+# shellcheck disable=SC2148
+AWS_PROFILE=$(basename "$(expand_path .)")
+export AWS_PROFILE
 
-# Have chamber use the default SSM alias
-export CHAMBER_KMS_KEY_ALIAS=aws/ssm
+# Let's be kind to ourselves and not time out every 60m
+export AWS_ASSUME_ROLE_TTL=8h
+
+##############################################
+# Load Local Overrides and Check Environment #
+##############################################
+
+# Load a local overrides file. Any changes you want to make for your local
+# environment should live in that file.
+
+if [ -e .envrc.local ]
+then
+  source_env .envrc.local
+fi
diff --git a/orgname-id/admin-global/.terraform.lock.hcl b/orgname-id/admin-global/.terraform.lock.hcl
diff --git a/orgname-infra/admin-global/.terraform.lock.hcl b/orgname-infra/admin-global/.terraform.lock.hcl
diff --git a/orgname-org-root/.envrc b/orgname-org-root/.envrc
@@ -1,6 +1,18 @@
-source_up
-PATH_add ../bin
+# shellcheck disable=SC2148
+AWS_PROFILE=$(basename "$(expand_path .)")
+export AWS_PROFILE
 
-# Setup profile for command line tools. This will allow vars to be
-# detected and used by the app automatically.
-export AWS_PROFILE=$(basename $(expand_path .))
+# Let's be kind to ourselves and not time out every 60m
+export AWS_ASSUME_ROLE_TTL=8h
+
+##############################################
+# Load Local Overrides and Check Environment #
+##############################################
+
+# Load a local overrides file. Any changes you want to make for your local
+# environment should live in that file.
+
+if [ -e .envrc.local ]
+then
+  source_env .envrc.local
+fi
diff --git a/orgname-org-root/admin-global/.terraform.lock.hcl b/orgname-org-root/admin-global/.terraform.lock.hcl
diff --git a/orgname-prod/.envrc b/orgname-prod/.envrc
@@ -1,6 +1,18 @@
-source_up
-PATH_add ../bin
+# shellcheck disable=SC2148
+AWS_PROFILE=$(basename "$(expand_path .)")
+export AWS_PROFILE
 
-# Setup profile for command line tools. This will allow vars to be
-# detected and used by the app automatically.
-export AWS_PROFILE=$(basename $(expand_path .))
+# Let's be kind to ourselves and not time out every 60m
+export AWS_ASSUME_ROLE_TTL=8h
+
+##############################################
+# Load Local Overrides and Check Environment #
+##############################################
+
+# Load a local overrides file. Any changes you want to make for your local
+# environment should live in that file.
+
+if [ -e .envrc.local ]
+then
+  source_env .envrc.local
+fi