From f7feec3557309eb6c48c95e9640d9bb1a3e7a704 Mon Sep 17 00:00:00 2001 From: Anubhav Mishra Date: Wed, 26 Jul 2017 16:17:59 -0700 Subject: [PATCH 01/47] Initial commit --- main.tf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 main.tf diff --git a/main.tf b/main.tf new file mode 100644 index 00000000..a69cb2e9 --- /dev/null +++ b/main.tf @@ -0,0 +1,2 @@ +resource "null_resource" "example" { +} From 8846c375586c0a942006465e9cc8aabdaaadf27c Mon Sep 17 00:00:00 2001 From: Luke Kysow <1034429+lkysow@users.noreply.github.com> Date: Mon, 27 Mar 2023 13:19:50 -0700 Subject: [PATCH 02/47] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e551e3e0..15de6569 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # atlantis-example -A simple terraform project to use along with atlantis bootstrap mode +A simple terraform project to use with `atlantis testdrive`. # NOTE -**Please don't create pull request against this repo to test atlantis. Follow the instructions here: https://github.com/hootsuite/atlantis#getting-started instead. The atlantis `bootstrap` mode will do all the hard work for you** :) +**Please don't create pull request against this repo to test atlantis. Follow the instructions here: https://www.runatlantis.io/guide/test-drive.html instead. The atlantis `testdrive` mode will do all the hard work for you** :) From a40bcaf87d4a11f6caf91ef9c44cea4aa8dc87e0 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 14:43:33 -0500 Subject: [PATCH 03/47] whitespace change --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index a69cb2e9..2e030f3e 100644 --- a/main.tf +++ b/main.tf @@ -1,2 +1,3 @@ resource "null_resource" "example" { } + From 1640bb61a7608a2d214ea347b39fa1f8fa5f82c5 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 20:17:01 -0500 Subject: [PATCH 04/47] rename resource --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 2e030f3e..ebffe447 100644 --- a/main.tf +++ b/main.tf @@ -1,3 +1,3 @@ -resource "null_resource" "example" { +resource "null_resource" "example2" { } From 3d668cd5b4169e3c77be7bbdd8c3ab1bc743adf0 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 20:43:00 -0500 Subject: [PATCH 05/47] atlantis server WIP --- bin/a-server | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 bin/a-server diff --git a/bin/a-server b/bin/a-server new file mode 100755 index 00000000..a445d68b --- /dev/null +++ b/bin/a-server @@ -0,0 +1,13 @@ +#!/bin/bash + +export ATLANTIS_GH_USER="bhoggard-sothebys" +export ATLANTIS_GH_WEBHOOK_SECRET="$ATLANTIS_WEBHOOK_SECRET" +export ATLANTIS_GH_TOKEN="$ATLANTIS_TOKEN" +export ATLANTIST_GH_WEBHOOK_SECRET="$ATLANTIS_WEBHOOK_SECRET" +# export ATLANTIST_GH_TEAM_ALLOWLIST=":plan,:policy_check,@sothebys/identity:apply" +export ATLANTIST_GH_TEAM_ALLOWLIST=":plan,:policy_check,@sothebys/nobody:apply" + +atlantis server \ + --atlantis-url="https://956c-100-38-10-160.ngrok-free.app" \ + --repo-allowlist="github.com/bhoggard-sothebys/atlantis-example" + From c6aa5338d4ec47c02b36788edc15566c0e507661 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 21:13:57 -0500 Subject: [PATCH 06/47] set up environments --- main.tf => dev/main.tf | 0 prod/main.tf | 3 +++ staging/main.tf | 3 +++ 3 files changed, 6 insertions(+) rename main.tf => dev/main.tf (100%) create mode 100644 prod/main.tf create mode 100644 staging/main.tf diff --git a/main.tf b/dev/main.tf similarity index 100% rename from main.tf rename to dev/main.tf diff --git a/prod/main.tf b/prod/main.tf new file mode 100644 index 00000000..ebffe447 --- /dev/null +++ b/prod/main.tf @@ -0,0 +1,3 @@ +resource "null_resource" "example2" { +} + diff --git a/staging/main.tf b/staging/main.tf new file mode 100644 index 00000000..ebffe447 --- /dev/null +++ b/staging/main.tf @@ -0,0 +1,3 @@ +resource "null_resource" "example2" { +} + From 52fe307b7fa1585456059b808be9de1c3f3159ec Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 21:22:33 -0500 Subject: [PATCH 07/47] Add CLAUDE.md for Claude Code guidance Co-Authored-By: Claude Opus 4.5 --- CLAUDE.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..ec5afcd4 --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,25 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Overview + +This is a simple Terraform example repository designed for use with [Atlantis](https://www.runatlantis.io/) testdrive mode. It contains minimal Terraform configurations across three environments (dev, staging, prod) for demonstrating Atlantis Pull Request automation. + +## Repository Structure + +- `dev/`, `staging/`, `prod/` - Terraform configurations per environment +- `bin/a-server` - Local Atlantis server startup script (requires `ATLANTIS_WEBHOOK_SECRET` and `ATLANTIS_TOKEN` environment variables) + +## Working with Terraform + +```bash +# Initialize Terraform in an environment +cd dev && terraform init + +# Plan changes +terraform plan + +# Apply changes +terraform apply +``` From c04770b56cb08684f2416832e745b39445b592eb Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 21:41:56 -0500 Subject: [PATCH 08/47] Add Atlantis config for plan-only workflow on prod Configure Atlantis to use a plan-only workflow for the prod directory, preventing terraform apply while still allowing plan. Dev and staging use the default workflow with full plan+apply capability. Co-Authored-By: Claude Opus 4.5 --- CLAUDE.md | 1 + atlantis.yaml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 atlantis.yaml diff --git a/CLAUDE.md b/CLAUDE.md index ec5afcd4..95812fc4 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -23,3 +23,4 @@ terraform plan # Apply changes terraform apply ``` + diff --git a/atlantis.yaml b/atlantis.yaml new file mode 100644 index 00000000..ed2eb6a5 --- /dev/null +++ b/atlantis.yaml @@ -0,0 +1,19 @@ +version: 3 +projects: + - name: dev + dir: dev + workflow: default + - name: staging + dir: staging + workflow: default + - name: prod + dir: prod + workflow: plan-only + +workflows: + plan-only: + plan: + steps: + - init + - plan + # No apply stage defined - apply commands will be rejected From 413eed833c1c8eca52ab742d03191a2cc1b1ac64 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 21:49:59 -0500 Subject: [PATCH 09/47] Add server-side config to allow workflow overrides Create repos.yaml with allowed_overrides: [workflow] and allow_custom_workflows: true so that the repo-level atlantis.yaml can define and use custom workflows like plan-only for prod. Co-Authored-By: Claude Opus 4.5 --- bin/a-server | 3 ++- repos.yaml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 repos.yaml diff --git a/bin/a-server b/bin/a-server index a445d68b..26ae7154 100755 --- a/bin/a-server +++ b/bin/a-server @@ -9,5 +9,6 @@ export ATLANTIST_GH_TEAM_ALLOWLIST=":plan,:policy_check,@sothebys/nobody:apply" atlantis server \ --atlantis-url="https://956c-100-38-10-160.ngrok-free.app" \ - --repo-allowlist="github.com/bhoggard-sothebys/atlantis-example" + --repo-allowlist="github.com/bhoggard-sothebys/atlantis-example" \ + --repo-config="$(dirname "$0")/../repos.yaml" diff --git a/repos.yaml b/repos.yaml new file mode 100644 index 00000000..2a8735de --- /dev/null +++ b/repos.yaml @@ -0,0 +1,4 @@ +repos: + - id: /.*/ + allowed_overrides: [workflow] + allow_custom_workflows: true From 2f0d6f02e8aaa19a0e3176b16652342885a25efa Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 21:51:55 -0500 Subject: [PATCH 10/47] whitespace change --- prod/main.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prod/main.tf b/prod/main.tf index ebffe447..582ee72d 100644 --- a/prod/main.tf +++ b/prod/main.tf @@ -1,3 +1,2 @@ resource "null_resource" "example2" { -} - +} \ No newline at end of file From fd4c0e7aa11235b356314745bbc60008dfdf18bf Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 22:00:30 -0500 Subject: [PATCH 11/47] Restrict prod apply to @sothebys/identity team - Change prod from plan-only workflow to default with apply_requirements - Require PR approval before atlantis apply on prod - Add CODEOWNERS requiring @sothebys/identity approval for prod/ - Update repos.yaml to allow apply_requirements override Co-Authored-By: Claude Opus 4.5 --- .github/CODEOWNERS | 2 ++ atlantis.yaml | 11 ++--------- repos.yaml | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..12f7c020 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# Require @sothebys/identity team approval for prod changes +/prod/ @sothebys/identity diff --git a/atlantis.yaml b/atlantis.yaml index ed2eb6a5..85a797bb 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -8,12 +8,5 @@ projects: workflow: default - name: prod dir: prod - workflow: plan-only - -workflows: - plan-only: - plan: - steps: - - init - - plan - # No apply stage defined - apply commands will be rejected + workflow: default + apply_requirements: [approved] diff --git a/repos.yaml b/repos.yaml index 2a8735de..cc396963 100644 --- a/repos.yaml +++ b/repos.yaml @@ -1,4 +1,4 @@ repos: - id: /.*/ - allowed_overrides: [workflow] + allowed_overrides: [workflow, apply_requirements] allow_custom_workflows: true From 59474d6ad0b9afaa41b2602c9569a0b006bb51c4 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Tue, 3 Mar 2026 22:02:18 -0500 Subject: [PATCH 12/47] whitespace change --- prod/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prod/main.tf b/prod/main.tf index 582ee72d..1ed69a4d 100644 --- a/prod/main.tf +++ b/prod/main.tf @@ -1,2 +1,2 @@ resource "null_resource" "example2" { -} \ No newline at end of file +} From d0e1542ef832ab272dbdc2aca30f83bca074fc47 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 5 Mar 2026 15:04:56 -0500 Subject: [PATCH 13/47] change resource names --- prod/main.tf | 2 +- staging/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prod/main.tf b/prod/main.tf index 1ed69a4d..a69cb2e9 100644 --- a/prod/main.tf +++ b/prod/main.tf @@ -1,2 +1,2 @@ -resource "null_resource" "example2" { +resource "null_resource" "example" { } diff --git a/staging/main.tf b/staging/main.tf index ebffe447..2e030f3e 100644 --- a/staging/main.tf +++ b/staging/main.tf @@ -1,3 +1,3 @@ -resource "null_resource" "example2" { +resource "null_resource" "example" { } From 240cbbebf52ce1f83a786c3a729490b6198b79f4 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 5 Mar 2026 18:01:12 -0500 Subject: [PATCH 14/47] added README for helm setup --- infrastructure/helm/.gitignore | 1 + infrastructure/helm/README.md | 19 +++++++++++++++++++ infrastructure/helm/values.yaml | 7 +++++++ 3 files changed, 27 insertions(+) create mode 100644 infrastructure/helm/.gitignore create mode 100644 infrastructure/helm/README.md create mode 100644 infrastructure/helm/values.yaml diff --git a/infrastructure/helm/.gitignore b/infrastructure/helm/.gitignore new file mode 100644 index 00000000..ee3892e8 --- /dev/null +++ b/infrastructure/helm/.gitignore @@ -0,0 +1 @@ +charts/ diff --git a/infrastructure/helm/README.md b/infrastructure/helm/README.md new file mode 100644 index 00000000..364bc6b9 --- /dev/null +++ b/infrastructure/helm/README.md @@ -0,0 +1,19 @@ +# Atlantis Helm setup + +## Setup + +The following environment variables must be defined: + +- ATLANTIS_TOKEN +- ATLANTIS_WEBHOOK_SECRET + +Then run + +```bash +helm upgrade --install atlantis runatlantis/atlantis \ + --kubeconfig "$HOME/kube_config_cluster.yml" \ + -f values.yaml \ + --set github.user="bhoggard-sothebys" \ + --set github.token="$ATLANTIS_TOKEN" \ + --set github.secret="$ATLANTIS_WEBHOOK_SECRET" +``` \ No newline at end of file diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml new file mode 100644 index 00000000..ab37f4c6 --- /dev/null +++ b/infrastructure/helm/values.yaml @@ -0,0 +1,7 @@ +orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" + +repoConfig: | + repos: + - id: /.*/ + allowed_overrides: [workflow, apply_requirements] + allow_custom_workflows: true From 4a209382876420ef14852ac403ea8db8baca0b8e Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 5 Mar 2026 18:02:12 -0500 Subject: [PATCH 15/47] whitespace --- prod/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/prod/main.tf b/prod/main.tf index a69cb2e9..2e030f3e 100644 --- a/prod/main.tf +++ b/prod/main.tf @@ -1,2 +1,3 @@ resource "null_resource" "example" { } + From 09bd776d4287dfdcac0c38dd97295ab0cb3df0d3 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 5 Mar 2026 18:24:25 -0500 Subject: [PATCH 16/47] describe env vars --- infrastructure/helm/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/helm/README.md b/infrastructure/helm/README.md index 364bc6b9..dc1a98cf 100644 --- a/infrastructure/helm/README.md +++ b/infrastructure/helm/README.md @@ -4,8 +4,8 @@ The following environment variables must be defined: -- ATLANTIS_TOKEN -- ATLANTIS_WEBHOOK_SECRET +- ATLANTIS_TOKEN - a fine-grained GitHub token - details TBD +- ATLANTIS_WEBHOOK_SECRET - see https://github.com/bhoggard-sothebys/atlantis-example/settings/hooks Then run From cae7fd19096da509eecf8ad3f2e622ec6e96d1a4 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 6 Mar 2026 17:38:38 -0500 Subject: [PATCH 17/47] resource name change --- staging/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/main.tf b/staging/main.tf index 2e030f3e..ebffe447 100644 --- a/staging/main.tf +++ b/staging/main.tf @@ -1,3 +1,3 @@ -resource "null_resource" "example" { +resource "null_resource" "example2" { } From c1e2d38867f3cae388069b7aa0976397be2e4b09 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 15:41:30 -0400 Subject: [PATCH 18/47] test running a script as part of plan step --- atlantis.yaml | 13 ++++++++++--- scripts/print-plan-dir.sh | 7 +++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 scripts/print-plan-dir.sh diff --git a/atlantis.yaml b/atlantis.yaml index 85a797bb..08aaa5c3 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -2,11 +2,18 @@ version: 3 projects: - name: dev dir: dev - workflow: default + workflow: custom - name: staging dir: staging - workflow: default + workflow: custom - name: prod dir: prod - workflow: default + workflow: custom apply_requirements: [approved] +workflows: + custom: + plan: + steps: + - run: ./scripts/print-plan-dir.sh + - init + - plan diff --git a/scripts/print-plan-dir.sh b/scripts/print-plan-dir.sh new file mode 100755 index 00000000..504ba29e --- /dev/null +++ b/scripts/print-plan-dir.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# Prints the directory Atlantis is using for the plan step. +# Atlantis sets several environment variables during workflow steps: +# DIR - absolute path to the directory where Atlantis runs the plan +# See https://www.runatlantis.io/docs/custom-workflows.html#reference + +echo "Atlantis plan directory: ${DIR}" From 53c67c16287e0f6053e4441bd12994f4c176f8c7 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 15:46:02 -0400 Subject: [PATCH 19/47] whitespace change --- scripts/print-plan-dir.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/print-plan-dir.sh b/scripts/print-plan-dir.sh index 504ba29e..a3a472cc 100755 --- a/scripts/print-plan-dir.sh +++ b/scripts/print-plan-dir.sh @@ -5,3 +5,4 @@ # See https://www.runatlantis.io/docs/custom-workflows.html#reference echo "Atlantis plan directory: ${DIR}" + From d7f48f684ebbc4dd9aa452dc9195a5be83bb3072 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 15:48:38 -0400 Subject: [PATCH 20/47] fix script path --- atlantis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlantis.yaml b/atlantis.yaml index 08aaa5c3..1da6ab31 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -14,6 +14,6 @@ workflows: custom: plan: steps: - - run: ./scripts/print-plan-dir.sh + - run: ${REPO_REL_DIR}/../scripts/print-plan-dir.sh - init - plan From c1987d13e83d0dbf193b2def989b0afa4b515dd3 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 15:49:50 -0400 Subject: [PATCH 21/47] fix script path --- atlantis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlantis.yaml b/atlantis.yaml index 1da6ab31..bd5bbf04 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -14,6 +14,6 @@ workflows: custom: plan: steps: - - run: ${REPO_REL_DIR}/../scripts/print-plan-dir.sh + - run: ../scripts/print-plan-dir.sh - init - plan From 079702f8dd1e5a865faab2c99969a1702515d287 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 15:53:22 -0400 Subject: [PATCH 22/47] print just dev/staging/prod --- dev/main.tf | 2 +- scripts/print-plan-dir.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/main.tf b/dev/main.tf index ebffe447..a2178ad0 100644 --- a/dev/main.tf +++ b/dev/main.tf @@ -1,3 +1,3 @@ -resource "null_resource" "example2" { +resource "null_resource" "example1" { } diff --git a/scripts/print-plan-dir.sh b/scripts/print-plan-dir.sh index a3a472cc..6571dfd5 100755 --- a/scripts/print-plan-dir.sh +++ b/scripts/print-plan-dir.sh @@ -4,5 +4,5 @@ # DIR - absolute path to the directory where Atlantis runs the plan # See https://www.runatlantis.io/docs/custom-workflows.html#reference -echo "Atlantis plan directory: ${DIR}" +echo "Atlantis environment: ${REPO_REL_DIR}" From 008cdc862fe6f402a330a61eaa5ef82894cc3030 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:22:41 -0400 Subject: [PATCH 23/47] set up test dirs with same structure as auth0 --- standalone/auth0/settings/dev/main.tf | 3 +++ standalone/auth0/settings/prod/main.tf | 3 +++ standalone/auth0/settings/staging/main.tf | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 standalone/auth0/settings/dev/main.tf create mode 100644 standalone/auth0/settings/prod/main.tf create mode 100644 standalone/auth0/settings/staging/main.tf diff --git a/standalone/auth0/settings/dev/main.tf b/standalone/auth0/settings/dev/main.tf new file mode 100644 index 00000000..a2178ad0 --- /dev/null +++ b/standalone/auth0/settings/dev/main.tf @@ -0,0 +1,3 @@ +resource "null_resource" "example1" { +} + diff --git a/standalone/auth0/settings/prod/main.tf b/standalone/auth0/settings/prod/main.tf new file mode 100644 index 00000000..a2178ad0 --- /dev/null +++ b/standalone/auth0/settings/prod/main.tf @@ -0,0 +1,3 @@ +resource "null_resource" "example1" { +} + diff --git a/standalone/auth0/settings/staging/main.tf b/standalone/auth0/settings/staging/main.tf new file mode 100644 index 00000000..a2178ad0 --- /dev/null +++ b/standalone/auth0/settings/staging/main.tf @@ -0,0 +1,3 @@ +resource "null_resource" "example1" { +} + From e61be9c427dc14b692e8dbd98b4c1cf636ac023f Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:22:55 -0400 Subject: [PATCH 24/47] disable apply and set up ingress --- infrastructure/helm/ingress.yaml | 17 +++++++++++++++++ infrastructure/helm/values.yaml | 13 +++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 infrastructure/helm/ingress.yaml diff --git a/infrastructure/helm/ingress.yaml b/infrastructure/helm/ingress.yaml new file mode 100644 index 00000000..63c5ecd7 --- /dev/null +++ b/infrastructure/helm/ingress.yaml @@ -0,0 +1,17 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: atlantis +spec: + ingressClassName: traefik + rules: + - host: atlantis.lvh.me + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: atlantis + port: + number: 80 diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index ab37f4c6..3e75c7e7 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -1,5 +1,18 @@ orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" +basicAuth: + username: fwKHRRdiz4RXsKenAR + password: u3GcCCsutRo3yVFEdx + +ingress: + enabled: true + ingressClassName: traefik + host: atlantis.lvh.me + path: / + pathType: Prefix + +disableApply: true + repoConfig: | repos: - id: /.*/ From f81ae84aed8f9cb674d1b0142525fe70c67c9353 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:30:36 -0400 Subject: [PATCH 25/47] rename script and set up auth0-type paths --- atlantis.yaml | 21 ++++++++++----------- repos.yaml | 4 ---- scripts/{print-plan-dir.sh => setup-env.sh} | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 repos.yaml rename scripts/{print-plan-dir.sh => setup-env.sh} (85%) diff --git a/atlantis.yaml b/atlantis.yaml index bd5bbf04..be877d16 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -1,19 +1,18 @@ version: 3 projects: - - name: dev - dir: dev - workflow: custom - - name: staging - dir: staging - workflow: custom - - name: prod - dir: prod - workflow: custom + - name: auth0-settings-dev + dir: standalone/auth0/settings/dev + workflow: default + - name: auth0-settings-staging + dir: standalone/auth0/settings/staging + workflow: default + - name: auth0-settings-prod + dir: standalone/auth0/settings/prod + workflow: default apply_requirements: [approved] workflows: custom: plan: steps: - - run: ../scripts/print-plan-dir.sh - - init + - run: ../scripts/setup-env.sh - plan diff --git a/repos.yaml b/repos.yaml deleted file mode 100644 index cc396963..00000000 --- a/repos.yaml +++ /dev/null @@ -1,4 +0,0 @@ -repos: - - id: /.*/ - allowed_overrides: [workflow, apply_requirements] - allow_custom_workflows: true diff --git a/scripts/print-plan-dir.sh b/scripts/setup-env.sh similarity index 85% rename from scripts/print-plan-dir.sh rename to scripts/setup-env.sh index 6571dfd5..adaab979 100755 --- a/scripts/print-plan-dir.sh +++ b/scripts/setup-env.sh @@ -4,5 +4,5 @@ # DIR - absolute path to the directory where Atlantis runs the plan # See https://www.runatlantis.io/docs/custom-workflows.html#reference -echo "Atlantis environment: ${REPO_REL_DIR}" +echo "Atlantis environment: ${REPO_REL_DIR##*/}" From 3f15cc60f6013eec24b3fe4aae151f5106a70062 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:32:57 -0400 Subject: [PATCH 26/47] workflow fix --- atlantis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atlantis.yaml b/atlantis.yaml index be877d16..fe3c08e2 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -2,13 +2,13 @@ version: 3 projects: - name: auth0-settings-dev dir: standalone/auth0/settings/dev - workflow: default + workflow: custom - name: auth0-settings-staging dir: standalone/auth0/settings/staging - workflow: default + workflow: custom - name: auth0-settings-prod dir: standalone/auth0/settings/prod - workflow: default + workflow: custom apply_requirements: [approved] workflows: custom: From 99be6c2a24ee7df1625672b4a41a0526b39ea6a5 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:33:53 -0400 Subject: [PATCH 27/47] fix script path --- atlantis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlantis.yaml b/atlantis.yaml index fe3c08e2..7967a83a 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -14,5 +14,5 @@ workflows: custom: plan: steps: - - run: ../scripts/setup-env.sh + - run: ../../../../scripts/setup-env.sh - plan From 3c6aee338f8fa1fe7421b240711d53e6e801243d Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 19 Mar 2026 18:34:58 -0400 Subject: [PATCH 28/47] add back init --- atlantis.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/atlantis.yaml b/atlantis.yaml index 7967a83a..f7613035 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -15,4 +15,5 @@ workflows: plan: steps: - run: ../../../../scripts/setup-env.sh + - init - plan From c5fad7cd840dbde091588935f749c17c8331c736 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 13:25:15 -0400 Subject: [PATCH 29/47] add script to set up env --- atlantis.yaml | 1 + scripts/setup-env.sh | 11 ++++++----- scripts/verify-env.sh | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100755 scripts/verify-env.sh diff --git a/atlantis.yaml b/atlantis.yaml index f7613035..e8da8548 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -15,5 +15,6 @@ workflows: plan: steps: - run: ../../../../scripts/setup-env.sh + - run: ../../../../scripts/verify-env.sh - init - plan diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh index adaab979..ebd16e65 100755 --- a/scripts/setup-env.sh +++ b/scripts/setup-env.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Prints the directory Atlantis is using for the plan step. -# Atlantis sets several environment variables during workflow steps: -# DIR - absolute path to the directory where Atlantis runs the plan -# See https://www.runatlantis.io/docs/custom-workflows.html#reference +# Reads environment-specific secrets from the atlantis K8s secret +# and exports them as environment variables for Terraform. -echo "Atlantis environment: ${REPO_REL_DIR##*/}" +ENV="${REPO_REL_DIR##*/}" +echo "Atlantis environment: ${ENV}" +AUTH0_CLIENT_ID=$(kubectl get secret atlantis -n default -o jsonpath="{.data.${ENV}-auth0-client-id}" | base64 -d) +export AUTH0_CLIENT_ID diff --git a/scripts/verify-env.sh b/scripts/verify-env.sh new file mode 100755 index 00000000..c016fc20 --- /dev/null +++ b/scripts/verify-env.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo "AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}" From ce12c2ec9e42a77033ce55649f1d3b2ce1cdf3d2 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 13:36:30 -0400 Subject: [PATCH 30/47] fix setup-env for mounted secrets --- scripts/setup-env.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh index ebd16e65..94d27e67 100755 --- a/scripts/setup-env.sh +++ b/scripts/setup-env.sh @@ -1,9 +1,10 @@ #!/bin/bash -# Reads environment-specific secrets from the atlantis K8s secret -# and exports them as environment variables for Terraform. +# Sets environment-specific variables for Terraform based on the project directory. +# Secret values are mounted as env vars by the Helm chart (environmentSecrets). ENV="${REPO_REL_DIR##*/}" echo "Atlantis environment: ${ENV}" -AUTH0_CLIENT_ID=$(kubectl get secret atlantis -n default -o jsonpath="{.data.${ENV}-auth0-client-id}" | base64 -d) +ENV_UPPER=$(echo "${ENV}" | tr '[:lower:]' '[:upper:]') +AUTH0_CLIENT_ID=$(eval echo "\$${ENV_UPPER}_AUTH0_CLIENT_ID") export AUTH0_CLIENT_ID From 51b7dce566affd1a07134c45be7a25febbe85cbc Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 13:56:51 -0400 Subject: [PATCH 31/47] use secrets for all atlantis cnfig --- infrastructure/helm/values.yaml | 36 ++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index 3e75c7e7..6b545f3a 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -1,8 +1,8 @@ orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" -basicAuth: - username: fwKHRRdiz4RXsKenAR - password: u3GcCCsutRo3yVFEdx +environment: + ATLANTIS_WEB_BASIC_AUTH: "true" + ATLANTIS_GH_USER: bhoggard-sothebys ingress: enabled: true @@ -13,6 +13,36 @@ ingress: disableApply: true +environmentSecrets: + - name: ATLANTIS_WEB_USERNAME + secretKeyRef: + name: atlantis + key: basic-auth-username + - name: ATLANTIS_WEB_PASSWORD + secretKeyRef: + name: atlantis + key: basic-auth-password + - name: ATLANTIS_GH_TOKEN + secretKeyRef: + name: atlantis + key: github-token + - name: ATLANTIS_GH_WEBHOOK_SECRET + secretKeyRef: + name: atlantis + key: github-secret + - name: DEV_AUTH0_CLIENT_ID + secretKeyRef: + name: atlantis + key: dev-auth0-client-id + - name: STAGING_AUTH0_CLIENT_ID + secretKeyRef: + name: atlantis + key: staging-auth0-client-id + - name: PROD_AUTH0_CLIENT_ID + secretKeyRef: + name: atlantis + key: prod-auth0-client-id + repoConfig: | repos: - id: /.*/ From 950b18480b1d5994df055cac92d374e0bd341e68 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 14:07:45 -0400 Subject: [PATCH 32/47] add in auth0 secret setup --- atlantis.yaml | 7 ++++++- infrastructure/helm/values.yaml | 12 ++++++++++++ scripts/setup-env.sh | 11 +++++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/atlantis.yaml b/atlantis.yaml index e8da8548..5b8ca8ff 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -14,7 +14,12 @@ workflows: custom: plan: steps: - - run: ../../../../scripts/setup-env.sh + - env: + name: AUTH0_CLIENT_ID + command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_ID + - env: + name: AUTH0_CLIENT_SECRET + command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_SECRET - run: ../../../../scripts/verify-env.sh - init - plan diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index 6b545f3a..50fa2e19 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -38,6 +38,18 @@ environmentSecrets: secretKeyRef: name: atlantis key: staging-auth0-client-id + - name: DEV_AUTH0_CLIENT_SECRET + secretKeyRef: + name: atlantis + key: dev-auth0-client-secret + - name: STAGING_AUTH0_CLIENT_SECRET + secretKeyRef: + name: atlantis + key: staging-auth0-client-secret + - name: PROD_AUTH0_CLIENT_SECRET + secretKeyRef: + name: atlantis + key: prod-auth0-client-secret - name: PROD_AUTH0_CLIENT_ID secretKeyRef: name: atlantis diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh index 94d27e67..0049c80c 100755 --- a/scripts/setup-env.sh +++ b/scripts/setup-env.sh @@ -1,10 +1,9 @@ #!/bin/bash -# Sets environment-specific variables for Terraform based on the project directory. -# Secret values are mounted as env vars by the Helm chart (environmentSecrets). +# Outputs an environment-specific variable value based on the project directory. +# Used as an Atlantis env step command — stdout becomes the variable value. +# Usage: setup-env.sh +# Example: setup-env.sh AUTH0_CLIENT_ID → resolves DEV_AUTH0_CLIENT_ID for dev ENV="${REPO_REL_DIR##*/}" -echo "Atlantis environment: ${ENV}" - ENV_UPPER=$(echo "${ENV}" | tr '[:lower:]' '[:upper:]') -AUTH0_CLIENT_ID=$(eval echo "\$${ENV_UPPER}_AUTH0_CLIENT_ID") -export AUTH0_CLIENT_ID +eval echo "\$${ENV_UPPER}_${1}" From 2e1a4af5753258722ced9d06897c9d45b7b08064 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 14:18:50 -0400 Subject: [PATCH 33/47] setup auth0 domain too --- atlantis.yaml | 3 +++ infrastructure/helm/values.yaml | 3 +++ scripts/verify-env.sh | 1 + 3 files changed, 7 insertions(+) diff --git a/atlantis.yaml b/atlantis.yaml index 5b8ca8ff..afa0571c 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -20,6 +20,9 @@ workflows: - env: name: AUTH0_CLIENT_SECRET command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_SECRET + - env: + name: AUTH0_DOMAIN + command: ../../../../scripts/setup-env.sh AUTH0_DOMAIN - run: ../../../../scripts/verify-env.sh - init - plan diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index 50fa2e19..5278385a 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -3,6 +3,9 @@ orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" environment: ATLANTIS_WEB_BASIC_AUTH: "true" ATLANTIS_GH_USER: bhoggard-sothebys + DEV_AUTH0_DOMAIN: sothelabs.auth0.com + STAGING_AUTH0_DOMAIN: sothebys-stg.auth0.com + PROD_AUTH0_DOMAIN: sothebys.auth0.com ingress: enabled: true diff --git a/scripts/verify-env.sh b/scripts/verify-env.sh index c016fc20..ab4c1ff8 100755 --- a/scripts/verify-env.sh +++ b/scripts/verify-env.sh @@ -1,2 +1,3 @@ #!/bin/bash echo "AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}" +echo "AUTH0_DOMAIN: ${AUTH0_DOMAIN}" From 563451130a7f7d54b0f7201887bdf195a4d7bad4 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 14:49:32 -0400 Subject: [PATCH 34/47] don't use secrets for client IDs --- infrastructure/helm/values.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index 5278385a..6484142c 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -6,6 +6,9 @@ environment: DEV_AUTH0_DOMAIN: sothelabs.auth0.com STAGING_AUTH0_DOMAIN: sothebys-stg.auth0.com PROD_AUTH0_DOMAIN: sothebys.auth0.com + DEV_AUTH0_CLIENT_ID: rhqbwencyHvtCTouEqLd76Iippucb8De + STAGING_AUTH0_CLIENT_ID: CDTuWIVBChmrTkHtO4q3cx1cxlTVLW1b + PROD_AUTH0_CLIENT_ID: xtFW63CtGXxydb6LGPWYp30FwLncl2oL ingress: enabled: true @@ -33,14 +36,6 @@ environmentSecrets: secretKeyRef: name: atlantis key: github-secret - - name: DEV_AUTH0_CLIENT_ID - secretKeyRef: - name: atlantis - key: dev-auth0-client-id - - name: STAGING_AUTH0_CLIENT_ID - secretKeyRef: - name: atlantis - key: staging-auth0-client-id - name: DEV_AUTH0_CLIENT_SECRET secretKeyRef: name: atlantis @@ -53,10 +48,6 @@ environmentSecrets: secretKeyRef: name: atlantis key: prod-auth0-client-secret - - name: PROD_AUTH0_CLIENT_ID - secretKeyRef: - name: atlantis - key: prod-auth0-client-id repoConfig: | repos: From 5a464a76cd6bfc55f60a40ed4b7097799cdea150 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 15:30:37 -0400 Subject: [PATCH 35/47] fix disabling of appy --- atlantis.yaml | 12 ++++++++++++ infrastructure/helm/values.yaml | 1 + 2 files changed, 13 insertions(+) diff --git a/atlantis.yaml b/atlantis.yaml index afa0571c..24fa33df 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -26,3 +26,15 @@ workflows: - run: ../../../../scripts/verify-env.sh - init - plan + apply: + steps: + - env: + name: AUTH0_CLIENT_ID + command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_ID + - env: + name: AUTH0_CLIENT_SECRET + command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_SECRET + - env: + name: AUTH0_DOMAIN + command: ../../../../scripts/setup-env.sh AUTH0_DOMAIN + - apply diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index 6484142c..b7f5de74 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -18,6 +18,7 @@ ingress: pathType: Prefix disableApply: true +disableApplyAll: true environmentSecrets: - name: ATLANTIS_WEB_USERNAME From 5a3a23cc5875baa60f14c1e081e60f30da9955d9 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 15:47:45 -0400 Subject: [PATCH 36/47] use env var for disable apply --- infrastructure/helm/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index b7f5de74..aeffe3e8 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -3,6 +3,7 @@ orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" environment: ATLANTIS_WEB_BASIC_AUTH: "true" ATLANTIS_GH_USER: bhoggard-sothebys + ATLANTIS_DISABLE_APPLY_ALL: "true" DEV_AUTH0_DOMAIN: sothelabs.auth0.com STAGING_AUTH0_DOMAIN: sothebys-stg.auth0.com PROD_AUTH0_DOMAIN: sothebys.auth0.com @@ -17,8 +18,6 @@ ingress: path: / pathType: Prefix -disableApply: true -disableApplyAll: true environmentSecrets: - name: ATLANTIS_WEB_USERNAME From af89595620ceb27be67745de63205297ed9e713b Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 16:01:02 -0400 Subject: [PATCH 37/47] whitespace change --- dev/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/main.tf b/dev/main.tf index a2178ad0..3cdb6d10 100644 --- a/dev/main.tf +++ b/dev/main.tf @@ -1,3 +1,2 @@ resource "null_resource" "example1" { } - From abf707104ebd3739875b8c7ba3e8000fb70443a8 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 16:16:54 -0400 Subject: [PATCH 38/47] ok really disable apply --- atlantis.yaml | 12 +----------- infrastructure/helm/values.yaml | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/atlantis.yaml b/atlantis.yaml index 24fa33df..2f6e6533 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -27,14 +27,4 @@ workflows: - init - plan apply: - steps: - - env: - name: AUTH0_CLIENT_ID - command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_ID - - env: - name: AUTH0_CLIENT_SECRET - command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_SECRET - - env: - name: AUTH0_DOMAIN - command: ../../../../scripts/setup-env.sh AUTH0_DOMAIN - - apply + steps: [] diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index aeffe3e8..d4689243 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -18,7 +18,6 @@ ingress: path: / pathType: Prefix - environmentSecrets: - name: ATLANTIS_WEB_USERNAME secretKeyRef: From 4cc551ad2e8b6e8c89e208556d5a196ba40bfec1 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 16:24:30 -0400 Subject: [PATCH 39/47] get rid of disable all flag --- infrastructure/helm/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index d4689243..a5f221f4 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -3,7 +3,6 @@ orgAllowlist: "github.com/bhoggard-sothebys/atlantis-example" environment: ATLANTIS_WEB_BASIC_AUTH: "true" ATLANTIS_GH_USER: bhoggard-sothebys - ATLANTIS_DISABLE_APPLY_ALL: "true" DEV_AUTH0_DOMAIN: sothelabs.auth0.com STAGING_AUTH0_DOMAIN: sothebys-stg.auth0.com PROD_AUTH0_DOMAIN: sothebys.auth0.com From 9b1d90be3aab1a18e1f1ab8988799e999ae1aa78 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Fri, 20 Mar 2026 16:30:20 -0400 Subject: [PATCH 40/47] try disabling apply with a command --- atlantis.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atlantis.yaml b/atlantis.yaml index 2f6e6533..5f577a65 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -27,4 +27,5 @@ workflows: - init - plan apply: - steps: [] + steps: + - run: echo "Apply is disabled. Changes must be applied manually." From bb7c8b5ea678538e72f058b2139fbded54fa7fda Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Mon, 23 Mar 2026 15:24:47 -0400 Subject: [PATCH 41/47] changes --- dev/main.tf | 2 +- prod/main.tf | 2 +- staging/main.tf | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/main.tf b/dev/main.tf index 3cdb6d10..1ed69a4d 100644 --- a/dev/main.tf +++ b/dev/main.tf @@ -1,2 +1,2 @@ -resource "null_resource" "example1" { +resource "null_resource" "example2" { } diff --git a/prod/main.tf b/prod/main.tf index 2e030f3e..ebffe447 100644 --- a/prod/main.tf +++ b/prod/main.tf @@ -1,3 +1,3 @@ -resource "null_resource" "example" { +resource "null_resource" "example2" { } diff --git a/staging/main.tf b/staging/main.tf index ebffe447..1ed69a4d 100644 --- a/staging/main.tf +++ b/staging/main.tf @@ -1,3 +1,2 @@ resource "null_resource" "example2" { } - From f88c42845a7ce7cf91d1609b78012d2c8b588e8d Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Mon, 23 Mar 2026 17:01:23 -0400 Subject: [PATCH 42/47] fix paths --- atlantis.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/atlantis.yaml b/atlantis.yaml index 5f577a65..c3237ed2 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -1,13 +1,13 @@ version: 3 projects: - - name: auth0-settings-dev - dir: standalone/auth0/settings/dev + - name: dev + dir: dev workflow: custom - - name: auth0-settings-staging - dir: standalone/auth0/settings/staging + - name: staging + dir: staging workflow: custom - - name: auth0-settings-prod - dir: standalone/auth0/settings/prod + - name: staging + dir: prod workflow: custom apply_requirements: [approved] workflows: From 8f919e148ec5b7b284c5d7a467e069a46b0fc583 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Mon, 23 Mar 2026 17:01:57 -0400 Subject: [PATCH 43/47] fix paths --- atlantis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlantis.yaml b/atlantis.yaml index c3237ed2..11b214a5 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -6,7 +6,7 @@ projects: - name: staging dir: staging workflow: custom - - name: staging + - name: prod dir: prod workflow: custom apply_requirements: [approved] From 505e47d5243c4cdaf20a8a604df7e4776d62bbf8 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Mon, 23 Mar 2026 17:09:17 -0400 Subject: [PATCH 44/47] use proper script setup --- atlantis.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/atlantis.yaml b/atlantis.yaml index 11b214a5..a6ab688c 100644 --- a/atlantis.yaml +++ b/atlantis.yaml @@ -14,18 +14,6 @@ workflows: custom: plan: steps: - - env: - name: AUTH0_CLIENT_ID - command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_ID - - env: - name: AUTH0_CLIENT_SECRET - command: ../../../../scripts/setup-env.sh AUTH0_CLIENT_SECRET - - env: - name: AUTH0_DOMAIN - command: ../../../../scripts/setup-env.sh AUTH0_DOMAIN - - run: ../../../../scripts/verify-env.sh + - run: ../scripts/setup-env.sh - init - - plan - apply: - steps: - - run: echo "Apply is disabled. Changes must be applied manually." + - plan \ No newline at end of file From c549c57418128042dc31ef5de8233a96fc268cef Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 26 Mar 2026 17:05:14 -0400 Subject: [PATCH 45/47] new location for atlantis --- dev/main.tf | 2 -- infrastructure/helm/values.yaml | 1 + prod/main.tf | 3 --- staging/main.tf | 2 -- atlantis.yaml => standalone/auth0/atlantis.yaml | 2 +- 5 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 dev/main.tf delete mode 100644 prod/main.tf delete mode 100644 staging/main.tf rename atlantis.yaml => standalone/auth0/atlantis.yaml (87%) diff --git a/dev/main.tf b/dev/main.tf deleted file mode 100644 index 1ed69a4d..00000000 --- a/dev/main.tf +++ /dev/null @@ -1,2 +0,0 @@ -resource "null_resource" "example2" { -} diff --git a/infrastructure/helm/values.yaml b/infrastructure/helm/values.yaml index a5f221f4..a99b370a 100644 --- a/infrastructure/helm/values.yaml +++ b/infrastructure/helm/values.yaml @@ -52,3 +52,4 @@ repoConfig: | - id: /.*/ allowed_overrides: [workflow, apply_requirements] allow_custom_workflows: true + repo_config_file: standalone/auth0/atlantis.yaml diff --git a/prod/main.tf b/prod/main.tf deleted file mode 100644 index ebffe447..00000000 --- a/prod/main.tf +++ /dev/null @@ -1,3 +0,0 @@ -resource "null_resource" "example2" { -} - diff --git a/staging/main.tf b/staging/main.tf deleted file mode 100644 index 1ed69a4d..00000000 --- a/staging/main.tf +++ /dev/null @@ -1,2 +0,0 @@ -resource "null_resource" "example2" { -} diff --git a/atlantis.yaml b/standalone/auth0/atlantis.yaml similarity index 87% rename from atlantis.yaml rename to standalone/auth0/atlantis.yaml index a6ab688c..6cce7c31 100644 --- a/atlantis.yaml +++ b/standalone/auth0/atlantis.yaml @@ -14,6 +14,6 @@ workflows: custom: plan: steps: - - run: ../scripts/setup-env.sh + - run: ../../scripts/setup-env.sh - init - plan \ No newline at end of file From b1d8f587836016090a60a2f22a9919c4fb49160c Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 26 Mar 2026 17:07:24 -0400 Subject: [PATCH 46/47] fix paths --- standalone/auth0/atlantis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/standalone/auth0/atlantis.yaml b/standalone/auth0/atlantis.yaml index 6cce7c31..219ad945 100644 --- a/standalone/auth0/atlantis.yaml +++ b/standalone/auth0/atlantis.yaml @@ -1,13 +1,13 @@ version: 3 projects: - name: dev - dir: dev + dir: standalone/auth0/dev workflow: custom - name: staging - dir: staging + dir: standalone/auth0/staging workflow: custom - name: prod - dir: prod + dir: standalone/auth0/prod workflow: custom apply_requirements: [approved] workflows: From 308eccb0a5b1063e9d2cd3caf5bd9e0b5667cf61 Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Thu, 26 Mar 2026 17:21:48 -0400 Subject: [PATCH 47/47] path fix again --- standalone/auth0/atlantis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/standalone/auth0/atlantis.yaml b/standalone/auth0/atlantis.yaml index 219ad945..f0ad3e35 100644 --- a/standalone/auth0/atlantis.yaml +++ b/standalone/auth0/atlantis.yaml @@ -1,13 +1,13 @@ version: 3 projects: - name: dev - dir: standalone/auth0/dev + dir: standalone/auth0/settings/dev workflow: custom - name: staging - dir: standalone/auth0/staging + dir: standalone/auth0/settings/staging workflow: custom - name: prod - dir: standalone/auth0/prod + dir: standalone/auth0/settings/prod workflow: custom apply_requirements: [approved] workflows: