Skip to content

Commit 1d72987

Browse files
authored
[SDPPE-295] Update setup-terraform and allow version override (#85)
1 parent aab778c commit 1d72987

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

.github/workflows/tf_apply.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ on:
1717
type: string
1818
required: false
1919
default: dpc-sdp
20+
terraform_version:
21+
description: Terraform CLI version to install
22+
type: string
23+
required: false
24+
default: "1.5.7"
2025

2126
env:
2227
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
@@ -45,9 +50,10 @@ jobs:
4550
uses: actions/checkout@v4
4651

4752
- name: Set up Terraform
48-
uses: hashicorp/setup-terraform@v2
53+
uses: hashicorp/setup-terraform@v4
4954
with:
50-
terraform_version: 1.5.7
55+
terraform_version: ${{ inputs.terraform_version }}
56+
terraform_wrapper: false
5157

5258
- name: Initialize Terraform
5359
run: terraform init

.github/workflows/tf_diffscheck.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
type: string
1212
required: false
1313
default: "ops"
14+
terraform_version:
15+
description: Terraform CLI version to install
16+
type: string
17+
required: false
18+
default: "1.5.7"
1419

1520
env:
1621
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
@@ -27,7 +32,7 @@ env:
2732
CONSTELLIX_API_KEY: ${{ secrets.CONSTELLIX_API_KEY }}
2833
CONSTELLIX_SECRET_KEY: ${{ secrets.CONSTELLIX_SECRET_KEY }}
2934
QUANTCDN_API_TOKEN: ${{ secrets.QUANT_BEARER }}
30-
35+
3136
jobs:
3237
diffscheck:
3338
runs-on: ubuntu-latest
@@ -36,9 +41,10 @@ jobs:
3641
uses: actions/checkout@v4
3742

3843
- name: Set up Terraform
39-
uses: hashicorp/setup-terraform@v2
44+
uses: hashicorp/setup-terraform@v4
4045
with:
41-
terraform_version: 1.5.7
46+
terraform_version: ${{ inputs.terraform_version }}
47+
terraform_wrapper: false
4248

4349
# - name: Terraform fmt
4450
# id: fmt

.github/workflows/tf_plan.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ on:
1212
type: string
1313
required: false
1414
default: dpc-sdp
15+
terraform_version:
16+
description: Terraform CLI version to install
17+
type: string
18+
required: false
19+
default: "1.5.7"
1520

1621
env:
1722
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
@@ -29,7 +34,7 @@ env:
2934
CONSTELLIX_API_KEY: ${{ secrets.CONSTELLIX_API_KEY }}
3035
CONSTELLIX_SECRET_KEY: ${{ secrets.CONSTELLIX_SECRET_KEY }}
3136
QUANTCDN_API_TOKEN: ${{ secrets.QUANT_BEARER }}
32-
37+
3338
jobs:
3439
plan:
3540
runs-on: ubuntu-latest
@@ -38,9 +43,9 @@ jobs:
3843
uses: actions/checkout@v4
3944

4045
- name: Set up Terraform
41-
uses: hashicorp/setup-terraform@v3
46+
uses: hashicorp/setup-terraform@v4
4247
with:
43-
terraform_version: 1.5.7
48+
terraform_version: ${{ inputs.terraform_version }}
4449
terraform_wrapper: false
4550

4651
# - name: Terraform fmt
@@ -66,7 +71,7 @@ jobs:
6671
then
6772
exit 0
6873
else
69-
exit $exitcode
74+
exit $exitcode
7075
fi
7176
7277
- name: Check Terraform Plan

0 commit comments

Comments
 (0)