♻️ Staging

examples/snippets/.github/workflows/atmos-components-updater.yml

@@ -4,14 +4,15 @@ on:
   workflow_dispatch: {}
 
   schedule:
-    - cron: 0 8 * * *
+    - cron: "0 8 * * *"
 
 jobs:
   update:
     environment: atmos
     runs-on:
-      - self-hosted
-      - terraform
+      - "runs-on=${{ github.run_id }}"
+      - "runner=small"
+      - "private=false"
     steps:
       - name: "Checkout source code at current commit"
         uses: actions/checkout@v4

examples/snippets/.github/workflows/atmos-terraform-apply-matrix.yaml

@@ -31,9 +31,11 @@ jobs:
   atmos-apply:
     if: ${{ inputs.stacks != '{include:[]}' }}
     name: ${{ matrix.stack_slug }}
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     strategy:
       max-parallel: 10
       fail-fast: false # Don't fail fast to avoid locking TF State

examples/snippets/.github/workflows/atmos-terraform-apply.yaml

@@ -34,9 +34,11 @@ jobs:
     name: Determine Affected Stacks
     if: needs.pr.outputs.no-apply == 'false'
     needs: ["pr"]
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - id: affected
         uses: cloudposse/github-action-atmos-affected-stacks@v4

examples/snippets/.github/workflows/atmos-terraform-dispatch.yaml

@@ -28,9 +28,11 @@ permissions:
 
 jobs:
   dispatch-id:
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - name: echo Distinct ID ${{ github.event.inputs.distinct_id }}
         run: echo ${{ github.event.inputs.distinct_id }}

examples/snippets/.github/workflows/atmos-terraform-drift-detection.yaml

@@ -17,9 +17,11 @@ permissions:
 jobs:
   select-components:
     name: Select Components
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - name: Selected Components
         id: components
@@ -54,10 +56,14 @@ jobs:
     needs: ["plan-atmos-components"]
     if: always()
     name: Reconcile issues
-    runs-on: ['self-hosted', 'terraform']
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - name: Drift Detection
         uses: cloudposse/github-action-atmos-terraform-drift-detection@v2
         with:
-          max-opened-issues: '25'
+          max-opened-issues: '10'
           process-all: 'true'

examples/snippets/.github/workflows/atmos-terraform-drift-remediation.yaml

@@ -16,9 +16,11 @@ jobs:
   remediate-drift:
     if: github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'apply')
     name: Remediate Drift
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - uses: unfor19/install-aws-cli-action@v1
       - name: Remediate Drift
@@ -37,7 +39,11 @@ jobs:
       ) &&
       !contains(github.event.issue.labels.*.name, 'remediated')
     name: Discard Drift
-    runs-on: ['self-hosted', 'terraform']
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - name: Discard Drift
         uses: cloudposse/github-action-atmos-terraform-drift-remediation@v2

examples/snippets/.github/workflows/atmos-terraform-plan-matrix.yaml

@@ -41,9 +41,11 @@ jobs:
   atmos-plan:
     if: ${{ inputs.stacks != '{include:[]}' }}
     name: ${{ matrix.stack_slug }}
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     continue-on-error: ${{ inputs.continue-on-error == 'true' }}
     strategy:
       max-parallel: 10

examples/snippets/.github/workflows/atmos-terraform-plan.yaml

@@ -18,9 +18,11 @@ jobs:
   atmos-affected:
     if: ${{ !contains( github.event.pull_request.labels.*.name, 'no-plan') }}
     name: Determine Affected Stacks
-    runs-on: 
-      - self-hosted
-      - terraform
+    runs-on:
+      - "runs-on=${{ github.run_id }}"
+      - "runner=terraform"
+      - "tag=${{ inputs.component }}-${{ inputs.stack }}"
+      - "private=false"
     steps:
       - id: affected
         uses: cloudposse/github-action-atmos-affected-stacks@v4

examples/snippets/Dockerfile

@@ -4,8 +4,7 @@ ARG GEODESIC_OS=debian
 # https://github.com/cloudposse/atmos
 ARG ATMOS_VERSION=1.180.0
 # This should match the version set in .github/workflows/auto-format.yaml
-ARG TF_1_VERSION=1.5.7
-ARG TOFU_VERSION=1.8.8
+ARG TOFU_VERSION=1.10.1
 
 FROM public.ecr.aws/cloudposse/geodesic:${GEODESIC_VERSION}-${GEODESIC_OS}
 
@@ -24,12 +23,9 @@ ENV AWS_DEFAULT_REGION=us-east-1
 ENV AWS_DEFAULT_SHORT_REGION=use1
 ENV AWS_REGION_ABBREVIATION_TYPE=short
 
-ARG TF_1_VERSION
 ARG TOFU_VERSION
-RUN apt-get update && apt-get install -y -u --allow-downgrades \
-    terraform-1="${TF_1_VERSION}-*" && \
-    tofu="${TOFU_VERSION}" && \
-    update-alternatives --set terraform /usr/share/terraform/1/bin/terraform
+RUN apt-get update && apt-get install -y --allow-downgrades \
+    tofu="${TOFU_VERSION}"
 ARG ATMOS_VERSION
 RUN apt-get update && apt-get install -y --allow-downgrades \
     atmos="${ATMOS_VERSION}-*" \
@@ -49,7 +45,7 @@ ARG TENANT="core"
 ENV NAMESPACE=acme
 # Format of Geodesic banner prompt
 ENV BANNER=${NAMESPACE}
-ENV DOCKER_IMAGE="acme/infra-acme"
+ENV DOCKER_IMAGE="acme/infrastructure"
 ENV DOCKER_TAG="latest"
 
 # Default AWS_PROFILE

examples/snippets/Makefile

@@ -1,6 +1,6 @@
 export DOCKER_ORG ?= acme
 export DOCKER_TAG ?= latest
-export ECR_IMAGE ?= infra-acme
+export ECR_IMAGE ?= infrastructure
 export DOCKER_IMAGE ?= $(DOCKER_ORG)/$(ECR_IMAGE)
 export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG)