From 0bf05cb0fe5ac133d78a556112ec310f12d7bcc4 Mon Sep 17 00:00:00 2001 From: Adam Hernandez Date: Fri, 7 Mar 2025 13:04:56 -0700 Subject: [PATCH 1/2] default to lower case dev --- .../im-deploy-tf-auto-apply-main-to-dev-on-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml b/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml index ff3ff730..08cae08e 100644 --- a/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml +++ b/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml @@ -41,7 +41,7 @@ env: TF_IN_AUTOMATION: 'true' TF_VERSION: '~>1.4.0' #TODO: Verify your version of terraform. TF_WORKING_DIR: './infrastructure/dev' # TODO: Verify this directory is correct for your repository (older projects may not be inside of an infrastructure folder) - RESOURCE_GROUP: '' # TODO: Populate this value + RESOURCE_GROUP: '' # TODO: Populate this value APP_INSIGHTS_NAME: '' # TODO: Populate this value # The following SSH_* secrets are org-level secrets SSH_KEY_STORAGE_ACCOUNT: ${{ secrets.SSH_STORAGE_ACCOUNT }} @@ -58,7 +58,7 @@ jobs: auto-apply-tf: if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' # TODO: verify default branch name runs-on: im-linux - environment: 'Dev' + environment: 'dev' defaults: run: @@ -110,7 +110,7 @@ jobs: # TODO: Remove the pagerduty token if not configuring pagerduty. If using pagerduty verify 'pagerduty_token' is the name of the variable that tf expects # TODO: Add any other secrets that would be required for a tf plan to succeed. Since this is a multi-line command every line except the last will need a \ on the end of it # PAGERDUTY_API_KEY is an org-level secret - + - name: Terraform Apply run: | terraform apply -auto-approve -lock-timeout=90s \ @@ -162,7 +162,7 @@ jobs: with: workflow-actor: ${{ github.actor }} # This will add the user who kicked off the workflow to the deployment payload token: ${{ secrets.GITHUB_TOKEN }} # Special per-job token generated by GH for interacting with the repo - environment: 'Dev' + environment: 'dev' release-ref: 'main' deployment-status: ${{ job.status }} deployment-description: 'Deployment to the Dev environment of the main branch' From 52e86247017202e4852680b5d9a143cd5f3843b7 Mon Sep 17 00:00:00 2001 From: Adam Hernandez Date: Fri, 7 Mar 2025 13:06:26 -0700 Subject: [PATCH 2/2] increment version --- .../im-deploy-tf-auto-apply-main-to-dev-on-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml b/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml index 08cae08e..f2282757 100644 --- a/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml +++ b/workflow-templates/im-deploy-tf-auto-apply-main-to-dev-on-merge.yml @@ -1,4 +1,4 @@ -# Workflow Code: IrritableEagle_v40 DO NOT REMOVE +# Workflow Code: IrritableEagle_v41 DO NOT REMOVE # Purpose: # Automatically runs a terraform apply -auto-approve with the changes # in the PR against the dev environment when a PR is merged to main.