Skip to content

Commit 6b724ee

Browse files
committed
Updates to use remote backend
1 parent de2706f commit 6b724ee

File tree

2 files changed

+49
-7
lines changed

2 files changed

+49
-7
lines changed

.github/workflows/deploy.yml

+43-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313
jobs:
1414
deploy:
1515
runs-on: ubuntu-latest
16+
1617
steps:
1718
- uses: actions/checkout@v4
1819

@@ -28,28 +29,66 @@ jobs:
2829
with:
2930
terraform_version: "1.7.0"
3031

32+
# Deploy backend infrastructure
33+
- name: Terraform Init Backend
34+
run: terraform init
35+
working-directory: ./terraform/backend
36+
env:
37+
ARM_USE_OIDC: true
38+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
39+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
40+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
41+
42+
- name: Terraform Apply Backend
43+
run: terraform apply -auto-approve
44+
working-directory: ./terraform/backend
45+
env:
46+
ARM_USE_OIDC: true
47+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
48+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
49+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
50+
51+
# Deploy main infrastructure
3152
- name: Terraform Init
3253
run: terraform init
3354
working-directory: ./terraform
55+
env:
56+
ARM_USE_OIDC: true
57+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
58+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
59+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
3460

3561
- name: Terraform Plan
36-
run: terraform plan
62+
run: terraform plan -out=tfplan
3763
working-directory: ./terraform
3864
env:
39-
TF_VAR_environment: "prod"
65+
ARM_USE_OIDC: true
66+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
67+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
68+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
69+
TF_VAR_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
70+
TF_VAR_resource_group_name: ${{ vars.RESOURCE_GROUP_NAME }}
4071

4172
- name: Terraform Apply
42-
run: terraform apply -auto-approve
73+
run: terraform apply -auto-approve tfplan
4374
working-directory: ./terraform
4475
env:
45-
TF_VAR_environment: "prod"
76+
ARM_USE_OIDC: true
77+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
78+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
79+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
4680

4781
- name: Get Storage Account Name
4882
id: storage
4983
run: |
5084
STORAGE_ACCOUNT=$(terraform output -raw storage_account_name)
5185
echo "storage_account=$STORAGE_ACCOUNT" >> $GITHUB_OUTPUT
5286
working-directory: ./terraform
87+
env:
88+
ARM_USE_OIDC: true
89+
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
90+
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
91+
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
5392

5493
- name: Upload HTML files
5594
run: |

terraform/provider.tf

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
azurerm = {
44
source = "hashicorp/azurerm"
5-
version = "~> 3.0"
5+
version = "~> 4.0"
66
}
77
}
88

@@ -11,10 +11,13 @@ terraform {
1111
storage_account_name = "pranavtfremotestate"
1212
container_name = "tfstate"
1313
key = "xirr.terraform.tfstate"
14+
use_oidc = true
15+
use_azuread_auth = true
1416
}
1517
}
1618

1719
provider "azurerm" {
18-
skip_provider_registration = true
1920
features {}
20-
}
21+
use_oidc = true
22+
skip_provider_registration = true
23+
}

0 commit comments

Comments
 (0)