Skip to content

Commit b652fcc

Browse files
authored
Merge branch 'main' into patch-3
2 parents 31ed716 + 71d839b commit b652fcc

File tree

467 files changed

+23224
-7134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+23224
-7134
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @hashicorp/tf-cli
1+
* @hashicorp/tf-core-cloud

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
using: composite
88
steps:
99
- name: Setup Go Environment
10-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
10+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
1111
with:
1212
go-version-file: "go.mod"
1313
cache: true
@@ -21,10 +21,10 @@ runs:
2121
shell: bash
2222

2323
- name: Install golangci-lint
24-
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/0b5709648c8ba9780e821faf16c5c2bb3262ce3e/install.sh | sh -s -- -b $(go env GOPATH)/bin $GOLANGCILINT_VERSION
24+
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/c1149695535fda62f6b574bc55dfbc333693647e/install.sh | sh -s -- -b $(go env GOPATH)/bin $GOLANGCILINT_VERSION
2525
shell: bash
2626
env:
27-
GOLANGCILINT_VERSION: v1.55.2
27+
GOLANGCILINT_VERSION: v1.64.8
2828

2929
- run: make lint
3030
shell: bash

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,16 @@ inputs:
4747
description: Accepts regex rules to either include or exclude specific tests from running in either CI or nightly workflows.
4848
required: false
4949
default: "."
50+
run_tasks_url:
51+
description: The mock run tasks URL to use for testing.
52+
required: false
53+
default: "http://testing-mocks.tfe:22180/runtasks/pass"
5054

5155
runs:
5256
using: composite
5357
steps:
5458
- name: Set up Go
55-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
59+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5660
with:
5761
go-version-file: go.mod
5862
cache: true
@@ -102,7 +106,7 @@ runs:
102106
TFE_USER2: tfe-provider-user2
103107
TF_ACC: "1"
104108
ENABLE_TFE: "${{ inputs.enterprise }}"
105-
RUN_TASKS_URL: "http://testing-mocks.tfe:22180/runtasks/pass"
109+
RUN_TASKS_URL: "${{ inputs.run_tasks_url }}"
106110
GITHUB_POLICY_SET_IDENTIFIER: "hashicorp/test-policy-set"
107111
GITHUB_REGISTRY_MODULE_IDENTIFIER: "hashicorp/terraform-random-module"
108112
GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-module"
@@ -112,10 +116,10 @@ runs:
112116
MOD_TFE: github.com/hashicorp/terraform-provider-tfe/internal/provider
113117
MOD_VERSION: github.com/hashicorp/terraform-provider-tfe/version
114118
run: |
115-
gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=30m -run "${{ steps.test_split.outputs.run }}"
119+
gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=60m -run "${{ steps.test_split.outputs.run }}"
116120
117121
- name: Upload test artifacts
118-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
122+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
119123
with:
120124
name: junit-test-summary-${{ matrix.index }}
121125
path: summary.xml

.github/workflows/call-jira-issue-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
with:
1313
project: TF
1414
issue-extra-fields: |
15-
{ "customfield_10091": ["TF-CLI"],
15+
{ "customfield_10091": ["TF-Core-Cloud"],
1616
"customfield_10008": "${{ contains(github.event.issue.labels.*.name, 'bug') && 'TF-7331' || 'TF-3484' }}"
1717
}
1818
secrets: inherit

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
name: lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
- uses: ./.github/actions/lint-provider-tfe
1818

1919
tests:
2020
name: run
2121
runs-on: ubuntu-latest
22-
timeout-minutes: 40
22+
timeout-minutes: 60
2323
strategy:
2424
fail-fast: false
2525
matrix:
2626
# If you adjust these parameters, also adjust the jrm input files on the "Merge reports" step below
27-
total: [ 5 ]
28-
index: [ 0, 1, 2, 3, 4 ]
27+
total: [ 1 ]
28+
index: [ 0 ]
2929
steps:
3030
- name: Fetch Outputs
3131
id: tflocal
@@ -35,7 +35,7 @@ jobs:
3535
organization: hashicorp-v2
3636
workspace: tflocal-terraform-provider-tfe
3737

38-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
38+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939

4040
- uses: ./.github/actions/test-provider-tfe
4141
with:
@@ -62,12 +62,12 @@ jobs:
6262
needs: [ tests ]
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
65+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
6666
with:
6767
node-version: 20
6868

6969
- name: Download artifacts
70-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
70+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.18.0
7171

7272
- name: Install junit-report-merger
7373
run: npm install -g junit-report-merger
@@ -76,7 +76,7 @@ jobs:
7676
run: jrm ./ci-summary-provider.xml "junit-test-summary-0/*.xml" "junit-test-summary-1/*.xml" "junit-test-summary-2/*.xml" "junit-test-summary-3/*.xml" "junit-test-summary-4/*.xml"
7777

7878
- name: Upload test artifacts
79-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
79+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8080
with:
8181
name: junit-test-summary
8282
path: ./ci-summary-provider.xml

.github/workflows/create-release-pr.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
outputs:
1818
version: ${{ steps.remove-leading-v.outputs.version }}
1919
steps:
20-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121

2222
- uses: actions-ecosystem/action-get-latest-tag@b7c32daec3395a9616f88548363a42652b22d435 # v1.6.0
2323
id: get-latest-tag
@@ -33,9 +33,9 @@ jobs:
3333
buildBinary:
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
- name: Set up Go
38-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
38+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
3939
with:
4040
go-version-file: go.mod
4141
cache: true
@@ -51,7 +51,7 @@ jobs:
5151
go build -o terraform-provider-tfe
5252
5353
- name: Upload test artifacts
54-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
54+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5555
with:
5656
name: terraform-provider-tfe
5757
path: terraform-provider-tfe
@@ -68,28 +68,28 @@ jobs:
6868
CHECKPOINT_DISABLE: "1"
6969
timeout-minutes: 120
7070
steps:
71-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
71+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7272
- run: git config --global user.email "[email protected]"
7373
- run: git config --global user.name "Brandon Croft"
7474
- name: Get yarn cache directory path
7575
id: global-cache-dir-path
7676
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
77-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
77+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7878
id: global-cache
7979
with:
8080
path: ${{ steps.global-cache-dir-path.outputs.dir }}
8181
key: ${{ runner.os }}-integration-yarn-${{ hashFiles('**/yarn.lock') }}
8282

8383
- name: Setup Node.js
84-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
84+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
8585
with:
8686
node-version: "20.x"
8787

8888
- name: Install cdktf-registry-docs
8989
run: npm install -g [email protected]
9090

9191
- name: Download artifacts
92-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
92+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.18.0
9393
with:
9494
name: terraform-provider-tfe
9595

@@ -102,7 +102,7 @@ jobs:
102102
TF_PLUGIN_CACHE_DIR: ${{ steps.global-cache-dir-path.outputs.dir }}/terraform-plugins
103103

104104
- name: Create Pull Request
105-
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
105+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
106106
with:
107107
commit-message: "cdktf: update documentation"
108108
title: "release: ${{ github.event.inputs.version }}"

.github/workflows/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout main
14-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515

1616
- name: Deploy docs
1717
uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
organization: hashicorp-v2
3737
workspace: tflocal-terraform-provider-tfe-nightly
3838

39-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4040

4141
- uses: ./.github/actions/test-provider-tfe
4242
with:
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
steps:
6767
- name: Send slack notification on failure
68-
uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
68+
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
6969
with:
7070
payload: |
7171
{
@@ -96,10 +96,10 @@ jobs:
9696
needs: [tests-summarize]
9797
if: "${{ always() }}"
9898
steps:
99-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
99+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
100100

101101
- name: Set up Go
102-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
102+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
103103
with:
104104
go-version-file: go.mod
105105
check-latest: true

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
release-notes:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616
with:
1717
fetch-depth: 0
1818
- name: Generate Release Notes
1919
run: sed -n -e "1{/# /d;}" -e "2{/^$/d;}" -e "/# $(git describe --abbrev=0 --exclude="$(git describe --abbrev=0 --match='v*.*.*' --tags)" --match='v*.*.*' --tags | tr -d v)/q;p" CHANGELOG.md > release-notes.txt
20-
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
20+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2121
with:
2222
name: release-notes
2323
path: release-notes.txt
2424
retention-days: 1
2525
terraform-provider-release:
2626
name: 'Terraform Provider Release'
2727
needs: [release-notes]
28-
uses: hashicorp/ghaction-terraform-provider-release/.github/workflows/hashicorp.yml@v3
28+
uses: hashicorp/ghaction-terraform-provider-release/.github/workflows/hashicorp.yml@v5
2929
secrets:
3030
hc-releases-github-token: '${{ secrets.HASHI_RELEASES_GITHUB_TOKEN }}'
3131
hc-releases-host-staging: '${{ secrets.HC_RELEASES_HOST_STAGING }}'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ provider_tfe_override.tfrc
2121

2222
# mkdocs build output
2323
site/
24+
.envrc

0 commit comments

Comments
 (0)