Merge tag 'v2.18.0' into upstream-v2.18.0

Author: stack72

.changelog/983.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+helper/resource: Ensured errors are always logged.
+```

.changelog/993.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+helper/resource: Added `TF_ACC_LOG`, `TF_LOG_CORE`, and `TF_LOG_PROVIDER` environment variable handling for Terraform versions 0.15 and later
+```

.changelog/996.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+helper/schema: Added sdk.proto logger request duration and response diagnostics logging
+```

.github/workflows/add-content-to-project.yml

@@ -30,7 +30,7 @@ jobs:
           custom_field_values: '[{\"name\":\"Priority\",\"type\":\"single_select\",\"value\":\"Triage Next\"}]'
       - name: "Set Pull Request to 'Priority = Triage Next'"
         uses: leonsteinhaeuser/project-beta-automations@v1.2.1
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request_target'
         with:
           gh_token: ${{ secrets.TF_DEVEX_PROJECT_GITHUB_TOKEN }}
           organization: "hashicorp"

.github/workflows/ci-github-actions.yml

@@ -14,11 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: go-version
-        # Reference: https://github.com/actions/setup-go/issues/23
-        run: echo "::set-output name=version::$(cat ./.go-version)"
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ steps.go-version.outputs.version }}
+          go-version-file: 'go.mod'
       - run: go install github.com/rhysd/actionlint/cmd/actionlint@latest
       - run: actionlint

.github/workflows/ci-go.yml

@@ -6,7 +6,6 @@ on:
     paths:
       - .github/workflows/ci-go.yml
       - .golangci.yml
-      - .go-version
       - go.mod
       - '**.go'
 
@@ -18,12 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: go-version
-        # Reference: https://github.com/actions/setup-go/issues/23
-        run: echo "::set-output name=version::$(cat ./.go-version)"
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ steps.go-version.outputs.version }}
+          go-version-file: 'go.mod'
       - run: go mod download
       - uses: golangci/golangci-lint-action@v3.2.0
   terraform-provider-corner:
@@ -37,13 +33,9 @@ jobs:
         with:
           path: terraform-provider-corner
           repository: hashicorp/terraform-provider-corner
-      - id: go-version
-        # Reference: https://github.com/actions/setup-go/issues/23
-        run: echo "::set-output name=version::$(cat ./.go-version)"
-        working-directory: .
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ steps.go-version.outputs.version }}
+          go-version-file: 'go.mod'
       - run: go mod edit -replace=github.com/hashicorp/terraform-plugin-sdk/v2=../
       - run: go mod tidy
       - run: go test -v ./...

.github/workflows/ci-goreleaser.yml

@@ -14,12 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: go-version
-        # Reference: https://github.com/actions/setup-go/issues/23
-        run: echo "::set-output name=version::$(cat ./.go-version)"
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ steps.go-version.outputs.version }}
+          go-version-file: 'go.mod'
       - uses: goreleaser/goreleaser-action@v3
         with:
           args: check

.github/workflows/release.yml

@@ -19,12 +19,9 @@ jobs:
         with:
           # Required for release notes
           fetch-depth: 0
-      - id: go-version
-        # Reference: https://github.com/actions/setup-go/issues/23
-        run: echo "::set-output name=version::$(cat ./.go-version)"
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ steps.go-version.outputs.version }}
+          go-version-file: 'go.mod'
       - name: Generate Release Notes
         # Fetch CHANGELOG.md contents up to Git tag prior to this release, skipping top two lines
         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 > /tmp/release-notes.txt

.go-version

@@ -1,3 +1,14 @@
+# 2.18.0 (July 5, 2022)
+
+ENHANCEMENTS:
+
+* helper/resource: Added `TF_ACC_LOG`, `TF_LOG_CORE`, and `TF_LOG_PROVIDER` environment variable handling for Terraform versions 0.15 and later ([#993](https://github.com/hashicorp/terraform-plugin-sdk/issues/993))
+* helper/schema: Added sdk.proto logger request duration and response diagnostics logging ([#996](https://github.com/hashicorp/terraform-plugin-sdk/issues/996))
+
+BUG FIXES:
+
+* helper/resource: Ensured errors are always logged. ([#983](https://github.com/hashicorp/terraform-plugin-sdk/issues/983))
+
 # 2.17.0 (May 31, 2022)
 
 NOTES: