Skip to content

Commit 4f5c9a3

Browse files
authored
Merge pull request #1364 from hashicorp/brandonc/bump_actions
bump github actions for node16 deprecation
2 parents 9d49212 + 5d98a79 commit 4f5c9a3

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.github/actions/test-provider-tfe/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ runs:
6969

7070
- name: Download artifact
7171
id: download-artifact
72-
uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
72+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
7373
with:
7474
workflow_conclusion: success
7575
name: junit-test-summary

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- name: Fetch Outputs
3131
id: tflocal
32-
uses: hashicorp-forge/terraform-cloud-action/outputs@4adbe7eea886138ac10a4c09e63c5c568aaa6672 # main
32+
uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
3333
with:
3434
token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
3535
organization: hashicorp-v2

.github/workflows/nightly-tfe-test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
timeout-minutes: 20
1212
steps:
1313
- name: Build nightly tflocal instance
14-
uses: hashicorp-forge/terraform-cloud-action/apply@4adbe7eea886138ac10a4c09e63c5c568aaa6672 # main
14+
uses: hashicorp-forge/terraform-cloud-action/apply@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
1515
with:
1616
token: ${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}
1717
organization: "hashicorp-v2"
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- name: Fetch Outputs
3232
id: tflocal
33-
uses: hashicorp-forge/terraform-cloud-action/outputs@4adbe7eea886138ac10a4c09e63c5c568aaa6672 # main
33+
uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
3434
with:
3535
token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
3636
organization: hashicorp-v2
@@ -106,10 +106,9 @@ jobs:
106106
cache: true
107107

108108
- name: Destroy nightly tflocal instance
109-
uses: hashicorp-forge/terraform-cloud-action/destroy@4adbe7eea886138ac10a4c09e63c5c568aaa6672 # main
109+
uses: hashicorp-forge/terraform-cloud-action/destroy@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
110110
with:
111111
token: ${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}
112112
organization: "hashicorp-v2"
113113
workspace: tflocal-terraform-provider-tfe-nightly
114114
wait: true
115-
is-destroy: true

internal/provider/resource_tfe_policy_set_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ func TestAccTFEPolicySet_pinnedPolicyRuntimeVersion(t *testing.T) {
6161
sha := genSentinelSha(t, "secret", "data")
6262
version := genSafeRandomSentinelVersion()
6363

64-
adminClient := testAdminClient(t, versionMaintenanceAdmin)
64+
adminClient := tfeClient
65+
if !enterpriseEnabled() {
66+
adminClient = testAdminClient(t, versionMaintenanceAdmin)
67+
}
6568

6669
opts := tfe.AdminSentinelVersionCreateOptions{
6770
Version: version,

0 commit comments

Comments
 (0)