From f79f46639c677f6a4f2ceab829ba300586774547 Mon Sep 17 00:00:00 2001 From: Brett McHargue Date: Mon, 9 Oct 2023 15:11:11 +0100 Subject: [PATCH] Update PR template --- .github/PULL_REQUEST_TEMPLATE.md | 13 +------------ .github/workflows/tf-azure-deploy.yml | 6 ++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6bd42bdb4..013f37df5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,15 +1,4 @@ ## Ticket and context -Ticket: [HFEYP-###](https://dfedigital.atlassian.net/browse/HFEYP-###) -## Tech review +Ticket: [ER-###](https://dfedigital.atlassian.net/browse/ER-###) -### Is there anything that the code reviewer should know? - -### Code quality checks -- [ ] All commit messages are meaningful and true - -## Product review - -### How can someone see it in review app? -1. Click the link to review app (posted by a `github-actions` bot below) -2. Follow the steps from the ticket. \ No newline at end of file diff --git a/.github/workflows/tf-azure-deploy.yml b/.github/workflows/tf-azure-deploy.yml index 69b734673..c28769719 100644 --- a/.github/workflows/tf-azure-deploy.yml +++ b/.github/workflows/tf-azure-deploy.yml @@ -167,6 +167,12 @@ jobs: jq 'with_entries(.key |= ascii_downcase)' tmp-secrets.json > web-secrets.auto.tfvars.json jq 'with_entries(.key |= ascii_downcase)' tmp-vars.json > web-vars.auto.tfvars.json + # Terraform import + - name: Terraform import + id: tf-import + run: > + terraform import azurerm_resource_group.rg /subscriptions/***/resourceGroups/s195d01-hfeyp-rg + # Download saved plan from artifacts - name: Download Terraform Plan uses: actions/download-artifact@v3