Merge pull request #815 from DFE-Digital/er-790-azure-refinements

ER-790: Azure Refinements
DFE-Digital · Sep 7, 2023 · 3f06179 · 3f06179
2 parents 1b1109e + ba29e39
commit 3f06179
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/tf-azure-deploy.yml b/.github/workflows/tf-azure-deploy.yml
@@ -32,14 +32,12 @@ env:
   ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
   ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-  TF_VAR_oidc_request_token: ${{ env.ACTIONS_ID_TOKEN_REQUEST_TOKEN }}
-  TF_VAR_oidc_request_url: ${{ env.ACTIONS_ID_TOKEN_REQUEST_URL }}
 
 jobs:
   terraform-plan:
     name: 'Terraform Plan'
     runs-on: ubuntu-latest
-    environment: ${{ inputs.environment }}
+    environment: development
     outputs:
       tfplanExitCode: ${{ steps.tf-plan.outputs.exitcode }}
 

diff --git a/terraform-azure/main.tf b/terraform-azure/main.tf
@@ -1,7 +1,5 @@
 provider "azurerm" {
-  use_oidc           = true
-  oidc_request_token = var.oidc_request_token
-  oidc_request_url   = var.oidc_request_url
+  use_oidc = true
 
   features {
     resource_group {

diff --git a/terraform-azure/variables.tf b/terraform-azure/variables.tf
@@ -1,6 +1,3 @@
-variable "oidc_request_token" {}
-variable "oidc_request_url" {}
-
 variable "azure_region" {
   default     = "westeurope"
   description = "Name of the Azure region to deploy resources"