Merge branch 'main' into data-source-org-membership-by-id

Author: Maed223

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,16 +9,16 @@ labels: bug
 Hi there,
 
 Thank you for opening an issue! Please note that we try to keep the this issue tracker reserved for
-bug reports and feature requests related to the Terraform Cloud/Enterprise provider. If you know
-your issue relates to the Terraform Cloud/Enterprise platform itself, please contact
+bug reports and feature requests related to the HCP Terraform and Terraform Enterprise provider. If you know
+your issue relates to the HCP Terraform or Terraform Enterprise platform itself, please contact
 [email protected]. For general usage questions, please post to our community forum:
 https://discuss.hashicorp.com.
 -->
 
-#### Terraform Cloud/Enterprise version
+#### Terraform Enterprise version
 
 <!---
-Are you using Terraform Cloud or Terraform Enterprise? If Terraform Enterprise, please include the version
+If you are using Terraform Enterprise, please include the version
 Example: Terraform Enterprise v202104-1
 -->
 
@@ -27,8 +27,8 @@ Example: Terraform Enterprise v202104-1
 <!---
 If you are using Terraform CLI, run `terraform version` to show the version.
 
-If you are using Terraform Cloud or Terraform Enterprise, see the Terraform version being used by a
-workspace in the workspace's Overview tab.
+If you are using a remote workspace in HCP Terraform or Terraform Enterprise, see the Terraform version 
+being used by the workspace in the workspace's Overview tab.
 
 Paste the result between the ``` marks below.
 -->

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,9 @@
 
 blank_issues_enabled: false
 contact_links:
-  - name: Terraform Cloud/Enterprise Troubleshooting and Feature Requests
+  - name: HCP Terraform or Terraform Enterprise Troubleshooting and Feature Requests
     url: https://support.hashicorp.com/hc/en-us/requests/new
-    about: For issues and feature requests concerning the Terraform Cloud/Enterprise platform itself, please submit a HashiCorp support request or email [email protected]
+    about: For issues and feature requests concerning the HCP Terraform and Terraform Enterprise platform itself, please submit a HashiCorp support request or email [email protected]
   - name: Terraform Language or Workflow Questions
     url: https://discuss.hashicorp.com
     about: Please ask Terraform language or workflow related questions through the HashiCorp Discuss forum

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,8 +9,8 @@ labels: feature-request
 Hi there,
 
 Thank you for opening a request! Please note that we try to keep the this issue tracker reserved for
-bug reports and feature requests related to the Terraform Cloud/Enterprise provider. If you know
-your request relates to the Terraform Cloud/Enterprise platform itself, please contact
+bug reports and feature requests related to the HCP Terraform and Terraform Enterprise provider. If you know
+your request relates to the HCP Terraform and Terraform Enterprise platform itself, please contact
 [email protected]. For general usage questions, please post to our community forum:
 https://discuss.hashicorp.com.
 -->

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

@@ -7,7 +7,7 @@ runs:
   using: composite
   steps:
     - name: Setup Go Environment
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
         go-version-file: "go.mod"
         cache: true
@@ -24,7 +24,7 @@ runs:
       run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/0b5709648c8ba9780e821faf16c5c2bb3262ce3e/install.sh | sh -s -- -b $(go env GOPATH)/bin $GOLANGCILINT_VERSION
       shell: bash
       env:
-        GOLANGCILINT_VERSION: v1.52.2
+        GOLANGCILINT_VERSION: v1.55.2
 
     - run: make lint
       shell: bash

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

@@ -5,25 +5,25 @@ name: Test
 description: Tests terraform-provider-tfe within a matrix
 inputs:
   admin_configuration_token:
-    description: TFC Admin API Configuration role token
+    description: HCP Terraform Admin API Configuration role token
     required: true
   admin_provision_licenses_token:
-    description: TFC Admin API Provision Licenses role token
+    description: HCP Terraform Admin API Provision Licenses role token
     required: true
   admin_security_maintenance_token:
-    description: TFC Admin API Security Maintenance role token
+    description: HCP Terraform Admin API Security Maintenance role token
     required: true
   admin_site_admin_token:
-    description: TFC Admin API Site Admin role token
+    description: HCP Terraform Admin API Site Admin role token
     required: true
   admin_subscription_token:
-    description: TFC Admin API Subscription role token
+    description: HCP Terraform Admin API Subscription role token
     required: true
   admin_support_token:
-    description: TFC Admin API Support role token
+    description: HCP Terraform Admin API Support role token
     required: true
   admin_version_maintenance_token:
-    description: TFC Admin API Version Maintenance role token
+    description: HCP Terraform Admin API Version Maintenance role token
     required: true
   matrix_index:
     description: Index of the matrix strategy runner
@@ -32,23 +32,27 @@ inputs:
     description: Total number of matrix strategy runners
     required: true
   hostname:
-    description: Hostname of the Terraform Cloud instance to test against
+    description: Hostname of the HCP Terraform or Terraform Enterprise instance to test against
     required: true
   token:
-    description: Terraform Cloud token
+    description: HCP Terraform or Terraform Enterprise token
     required: true
   testing-github-token:
     description: The GitHub token used for testing scenarios
     required: false
   enterprise:
     description: Test enterprise features (`hostname` must be running in ON_PREM mode)
     required: false
+  list_tests:
+    description: Accepts regex rules to either include or exclude specific tests from running in either CI or nightly workflows.
+    required: false
+    default: "."
 
 runs:
   using: composite
   steps:
     - name: Set up Go
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
         go-version-file: go.mod
         cache: true
@@ -65,7 +69,7 @@ runs:
 
     - name: Download artifact
       id: download-artifact
-      uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
+      uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
       with:
         workflow_conclusion: success
         name: junit-test-summary
@@ -79,6 +83,8 @@ runs:
         index: ${{ inputs.matrix_index }}
         total: ${{ inputs.matrix_total }}
         junit-summary: ./ci-summary-provider.xml
+        # When tests are split and run concurrently, lists_tests arg in ci.yml will skip the TestAccTFESAMLSettings_omnibus test suite
+        list: ${{ inputs.list_tests }}
 
     - name: Run Tests
       shell: bash
@@ -94,13 +100,13 @@ runs:
         TFE_ADMIN_VERSION_MAINTENANCE_TOKEN: ${{ inputs.admin_version_maintenance_token }}
         TFE_USER1: tfe-provider-user1
         TFE_USER2: tfe-provider-user2
-        TF_ACC: 1
+        TF_ACC: "1"
         ENABLE_TFE: "${{ inputs.enterprise }}"
-        TFC_RUN_TASK_URL: "https://httpstat.us/200"
+        RUN_TASKS_URL: "http://testing-mocks.tfe:22180/runtasks/pass"
         GITHUB_POLICY_SET_IDENTIFIER: "hashicorp/test-policy-set"
         GITHUB_REGISTRY_MODULE_IDENTIFIER: "hashicorp/terraform-random-module"
-        GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-1"
-        GITHUB_WORKSPACE_BRANCH: "test"
+        GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-module"
+        GITHUB_WORKSPACE_BRANCH: "main"
         GITHUB_TOKEN: "${{ inputs.testing-github-token }}"
         MOD_PROVIDER: github.com/hashicorp/terraform-provider-tfe
         MOD_TFE: github.com/hashicorp/terraform-provider-tfe/internal/provider

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

@@ -12,5 +12,7 @@ jobs:
     with:
       project: TF
       issue-extra-fields: |
-        { "customfield_10091": ["TF-CLI"] }
+        { "customfield_10091": ["TF-CLI"],
+          "customfield_10008": "${{ contains(github.event.issue.labels.*.name, 'bug') && 'TF-7331' || 'TF-3484' }}"
+        }
     secrets: inherit

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: ./.github/actions/lint-provider-tfe
 
   tests:
@@ -29,13 +29,13 @@ jobs:
     steps:
       - name: Fetch Outputs
         id: tflocal
-        uses: hashicorp-forge/terraform-cloud-action/outputs@4adbe7eea886138ac10a4c09e63c5c568aaa6672 # main
+        uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
         with:
           token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
           organization: hashicorp-v2
           workspace: tflocal-terraform-provider-tfe
 
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - uses: ./.github/actions/test-provider-tfe
         with:
@@ -51,18 +51,23 @@ jobs:
           admin_subscription_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.subscription }}
           admin_support_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.support }}
           admin_version_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.version-maintenance }}
+          # Run terminal cmd 'go help testflag' to learn more about -list flag
+          # action.yml uses https://github.com/hashicorp-forge/go-test-split-action/blob/main/action.yml to split acceptance tests
+          # which runs against all tests using the list arg
+          # lists_tests regex is used to skip the TestAccTFESAMLSettings_omnibus test suite for CI tests only
+          list_tests: "[^(TestAccTFESAMLSettings_omnibus)]"
 
   tests-combine-summaries:
     name: Combine Test Reports
     needs: [ tests ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Download artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
 
       - name: Install junit-report-merger
         run: npm install -g junit-report-merger
@@ -71,7 +76,7 @@ jobs:
         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"
 
       - name: Upload test artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: junit-test-summary
           path: ./ci-summary-provider.xml

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

@@ -17,7 +17,7 @@ jobs:
     outputs:
       version: ${{ steps.remove-leading-v.outputs.version }}
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - uses: actions-ecosystem/action-get-latest-tag@b7c32daec3395a9616f88548363a42652b22d435 # v1.6.0
         id: get-latest-tag
@@ -33,9 +33,9 @@ jobs:
   buildBinary:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Set up Go
-        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
           cache: true
@@ -51,7 +51,7 @@ jobs:
           go build -o terraform-provider-tfe
 
       - name: Upload test artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: terraform-provider-tfe
           path: terraform-provider-tfe
@@ -68,28 +68,28 @@ jobs:
       CHECKPOINT_DISABLE: "1"
     timeout-minutes: 120
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Brandon Croft"
       - name: Get yarn cache directory path
         id: global-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: global-cache
         with:
           path: ${{ steps.global-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-integration-yarn-${{ hashFiles('**/yarn.lock') }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
-          node-version: "18.x"
+          node-version: "20.x"
 
       - name: Install cdktf-registry-docs
         run: npm install -g [email protected]
 
       - name: Download artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
           name: terraform-provider-tfe
 
@@ -102,7 +102,7 @@ jobs:
           TF_PLUGIN_CACHE_DIR: ${{ steps.global-cache-dir-path.outputs.dir }}/terraform-plugins
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
         with:
           commit-message: "cdktf: update documentation"
           title: "release: ${{ github.event.inputs.version }}"
@@ -111,7 +111,7 @@ jobs:
 
             This PR is meant to automate certain preparations for release and instruct maintainers on the manual release tasks. Push any changes you make to this branch and merge it just before creating a release.
 
-            1. Ensure both main and nightly CI actions passed. These test the release version against TFC and TFE, respectively.
+            1. Ensure both main and nightly CI actions passed. These test the release version against HCP Terraform and Terraform Enterprise, respectively.
             2. Review the CHANGELOG and ensure and ensure [everything that's changed since the last release](https://github.com/hashicorp/terraform-provider-tfe/compare/v${{ needs.releasedVersion.outputs.version }}...main) is described. If anything is missing, inaccurate, or unclear, now is the time to fix it! Check the CHANGELOG organization: pull breaking changes to the top and make sure the most important features are at the top of the FEATURES list. Check the version header in the changelog. It must be: `## v${{ github.event.inputs.version }}`
             3. Bump the static versions given as an example in the `website/docs/index.html.markdown` docs
             4. Bump the static versions given in the README installation section.

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

@@ -34,8 +34,8 @@ jobs:
               "labels": ${{ toJSON(github.event.issue.labels.*.name) }}
             }
         run: |
-          echo "extra=$(echo '${{ env.EXTRA_FIELDS }}' '${{ inputs.issue-extra-fields }}' | jq -rcs '.[0] * .[1]')" >> $GITHUB_OUTPUT       
-          
+          echo "extra=$(echo '${{ env.EXTRA_FIELDS }}' '${{ inputs.issue-extra-fields }}' | jq -rcs '.[0] * .[1]')" >> $GITHUB_OUTPUT
+
 
       # Creates a new issue, only if this is a new PR or GH Issue, and only if an existing issue is not in the branch name
       - name: Create Issue

.github/workflows/mkdocs.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout main
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26