Merge branch 'main' into dependabot/github_actions/actions/checkout-4…

….1.7

.github/workflows/dependabot-auto-merge.yml

@@ -25,12 +25,12 @@ jobs:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: |
-          gh pr merge --auto --merge "${PR_URL}"
+          gh pr merge --auto --squash "${PR_URL}"
 
       - name: Auto-merge Dependabot PRs for semver-patch updates
         if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: |
-          gh pr merge --auto --merge "${PR_URL}"
+          gh pr merge --auto --squash "${PR_URL}"

.github/workflows/pr-dep-review.yml

@@ -23,6 +23,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
+            api.securityscorecards.dev:443
             github.com:443
             objects.githubusercontent.com:443
             proxy.golang.org:443

.github/workflows/release.yml

@@ -63,7 +63,7 @@ jobs:
           git checkout refs/tags/${{ github.event.inputs.version }}
 
       - name: GoReleaser Action
-        uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0
+        uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.github/workflows/terratest.yml

@@ -44,13 +44,13 @@ jobs:
       - name: Install Terraform
         uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v3.1.1
         with:
-          terraform_version: 1.7
+          terraform_version: 1.9
           terraform_wrapper: false
 
       - name: Install OpenTofu
         uses: opentofu/setup-opentofu@ae80d4ecaab946d8f5ff18397fbf6d0686c6d46a # v1.0.3
         with:
-          tofu_version: 1.6
+          tofu_version: 1.8
           tofu_wrapper: false
 
       - name: Run Terratest

.github/workflows/test.yml

@@ -101,6 +101,7 @@ jobs:
           - "1.6"
           - "1.7"
           - "1.8"
+          - "1.9"
 
     steps:
       - name: Harden Runner
@@ -151,7 +152,8 @@ jobs:
       matrix:
         opentofu_version:
           - "1.6"
-          - "1.7.0-rc1"
+          - "1.7"
+          - "1.8"
 
     steps:
       - name: Harden Runner

.github/workflows/trufflehog.yml

@@ -42,7 +42,7 @@ jobs:
           fetch-depth: 0
 
       - name: Check secrets with TruffleHog OSS
-        uses: trufflesecurity/trufflehog@433a57adaf8fedce312630ef593f5142227c5855 # v3.78.1
+        uses: trufflesecurity/trufflehog@fe5624c70923355128868cffd647b6e2cfe11443 # v3.81.9
         with:
           path: ./
           head: HEAD

.pre-commit-config.yaml

@@ -29,12 +29,12 @@ repos:
           - --allow-multiple-documents
       - id: destroyed-symlinks
       # - id: detect-private-key
-      # - id: end-of-file-fixer
+      - id: end-of-file-fixer
       - id: fix-byte-order-marker
       - id: mixed-line-ending
         args:
           - --fix=lf
-      # - id: trailing-whitespace
+      - id: trailing-whitespace
 
   # ----------------------------------------------------------------------------
   # goplicate-start:golang

CHANGELOG.md

@@ -64,19 +64,34 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
 * [`9a863b3`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/9a863b362320a4986e52b68559f97cbb98fcbbbc): **deps**: Bump `trufflesecurity/trufflehog` from 3.76.3 to 3.78.1 ([#272](https://github.com/northwood-labs/terraform-provider-corefunc/issues/272)) ([@dependabot](https://github.com/dependabot))
 * [`6500e54`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/6500e54c1fde6e0b3dc3db17dd301c425cef351d): **deps**: Bump `github/codeql-action` from 3.25.6 to 3.25.10 ([#274](https://github.com/northwood-labs/terraform-provider-corefunc/issues/274)) ([@dependabot](https://github.com/dependabot))
 * [`02df9f9`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/02df9f9802809967b2ce5772ca8ef3f84a1c7255): **deps**: Bump `github.com/spf13/cobra` from 1.8.0 to 1.8.1 ([#275](https://github.com/northwood-labs/terraform-provider-corefunc/issues/275)) ([@dependabot](https://github.com/dependabot))
+* [`ea6f3e2`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/ea6f3e2b4aec1788cae68539b600ed3ad4980b8c): **deps**: Bump `goreleaser/goreleaser-action` from 5.1.0 to 6.0.0 ([#276](https://github.com/northwood-labs/terraform-provider-corefunc/issues/276)) ([@dependabot](https://github.com/dependabot))
+* [`f7afbda`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/f7afbda0763eaed2b83449bd9057291b90cfe349): **deps**: Bump `github.com/hashicorp/go-getter` from 1.7.4 to 1.7.5 in /terratest/data-sources in the go_modules group ([#281](https://github.com/northwood-labs/terraform-provider-corefunc/issues/281)) ([@dependabot](https://github.com/dependabot))
+* [`cebd47c`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/cebd47cba0209626c2ab033eef27805addf7d2d2): **deps**: Bump `google.golang.org/grpc` from 1.64.0 to 1.64.1 in the go_modules group ([#286](https://github.com/northwood-labs/terraform-provider-corefunc/issues/286)) ([@dependabot](https://github.com/dependabot))
+* [`31e38a6`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/31e38a6018c44cbf1cb9f5e7743a420e1ab1ad53): **deps**: Bump `github.com/gruntwork-io/terratest` from 0.46.15 to 0.46.16 in /terratest/functions ([#285](https://github.com/northwood-labs/terraform-provider-corefunc/issues/285)) ([@dependabot](https://github.com/dependabot))
+* [`2955341`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/295534111dcfd95104e09a9072f58c0d0585cbdc): **deps**: Bump `github.com/hashicorp/terraform-plugin-testing` ([#304](https://github.com/northwood-labs/terraform-provider-corefunc/issues/304)) ([@dependabot](https://github.com/dependabot))
+* [`bb56052`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/bb56052fb892f6f33dd74d3935831d8b5f7218e8): **deps**: Bump `github.com/gruntwork-io/terratest` ([#292](https://github.com/northwood-labs/terraform-provider-corefunc/issues/292)) ([@dependabot](https://github.com/dependabot))
+* [`810f770`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/810f770a11bc6891160f1b45ce929d13f1836acf): **deps**: Bump `github.com/hashicorp/terraform-plugin-framework` ([#301](https://github.com/northwood-labs/terraform-provider-corefunc/issues/301)) ([@dependabot](https://github.com/dependabot))
+* [`b5b1872`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/b5b1872f04df5a3cd56753414cfd6ba645db5f76): **deps**: Bump `trufflesecurity/trufflehog` from 3.78.1 to 3.81.9 ([#306](https://github.com/northwood-labs/terraform-provider-corefunc/issues/306)) ([@dependabot](https://github.com/dependabot))
 
 ### :test_tube: Testing
 
 * [`5a0053c`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/5a0053cf786bd53687ba6a7afa168cd2e4cdb279): Update Terrform 1.8-beta1 to 1.8. ([@skyzyx](https://github.com/skyzyx))
 * [`8c97573`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/8c975730916f48bfaa43eee25981c4841fa42211): Update OpenTofu to 1.7.0-rc1. ([@skyzyx](https://github.com/skyzyx))
 * [`55ec24f`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/55ec24f9135f51e2872dcf97023dad563ff341ba): Allow network calls for some jobs. ([@skyzyx](https://github.com/skyzyx))
 * [`3a6bc87`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/3a6bc8756768bb5fdd687746f9756b628d04a8f9): Add automation to auto-merge Dependabot PRs. ([@skyzyx](https://github.com/skyzyx))
+* [`f529a51`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/f529a512bb345a67e52033367102c76006f0f830): Switch auto-merging to use squash commits. ([@skyzyx](https://github.com/skyzyx))
+* [`9b7d2bd`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/9b7d2bdfde32bbe57a40ee613e40ad44359a2196): Add api.securityscorecards.dev to allowlist. ([@skyzyx](https://github.com/skyzyx))
 
 ### :tractor: Refactor
 
 * [`5a94f66`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/5a94f667f3559f520152340558f61e26d40e1715): Begin adopting Lefthook as a replacement for pre-commit. ([@skyzyx](https://github.com/skyzyx))
 * [`6ca38dc`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/6ca38dc2e8e8276900c9752adec9b0641f98f87d): Implement more Lefthook functionality. ([@skyzyx](https://github.com/skyzyx))
 
+### <!-- 1 -->:bug: Bug Fixes
+
+* [`629a490`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/629a4904e33654c7a8fc7478f84267d2485b1e03): Re-enable some pre-commit hooks. ([@skyzyx](https://github.com/skyzyx))
+* [`54b6a79`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/54b6a79c75ec3761e020f8bd0e652a47ec17a53d): Updated the versions of Terraform/OpenTofu to test against. ([@skyzyx](https://github.com/skyzyx))
+
 ## 1.4.0 — 2024-03-20
 
 [Compare: v1.3.1 → v1.4.0](https://github.com/northwood-labs/terraform-provider-corefunc/compare/v1.3.1...v1.4.0)
@@ -646,4 +661,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
 * [`eb9f7ae`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/eb9f7aecfdaa7bda9087b9b58229d3943571a863): Update the GoReleaser configuration. ([@skyzyx](https://github.com/skyzyx))
 * [`a01b12e`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/a01b12e6870b821f561624bca79407e4c87c73cf): Trying to get the build to work. ([@skyzyx](https://github.com/skyzyx))
 
-<p>Generated on 2024-06-18.</p>
+<p>Generated on 2024-08-28.</p>

go.mod

@@ -13,11 +13,11 @@ require (
 	github.com/gtramontina/ooze v0.2.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/terraform-plugin-docs v0.19.4
-	github.com/hashicorp/terraform-plugin-framework v1.9.0
+	github.com/hashicorp/terraform-plugin-framework v1.11.0
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-go v0.23.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-testing v1.8.0
+	github.com/hashicorp/terraform-plugin-testing v1.10.0
 	github.com/lithammer/dedent v1.1.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nlnwa/whatwg-url v0.4.1
@@ -54,9 +54,10 @@ require (
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.6.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/hc-install v0.7.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
+	github.com/hashicorp/hc-install v0.8.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.21.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-exec v0.21.0 // indirect
 	github.com/hashicorp/terraform-json v0.22.1 // indirect
@@ -89,19 +90,19 @@ require (
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yuin/goldmark v1.7.1 // indirect
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
-	github.com/zclconf/go-cty v1.14.4 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
 	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
-	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/grpc v1.64.1 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect