Merge branch 'main' into dependabot/go_modules/terratest/functions/go…

…_modules-c00bff5f57

.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/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

.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,26 @@ 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))
 
 ### :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))
 
 ### :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 +653,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>

terratest/data-sources/go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.12.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-getter v1.7.4 // indirect
+	github.com/hashicorp/go-getter v1.7.5 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect

terratest/data-sources/go.sum

@@ -362,8 +362,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=
-github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
+github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=
+github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=

trivy-license.yaml

@@ -1,7 +1,6 @@
 ---
 cache:
   backend: fs
-  clear: false
 db:
   download-java-only: false
   download-only: false
@@ -170,11 +169,9 @@ list-all-pkgs: true
 misconfiguration:
   include-non-failures: false
   policy-bundle-repository: ghcr.io/aquasecurity/defsec:0
-  reset-policy-bundle: false
 output: ""
 quiet: true
 report: summary
-reset: false
 scan:
   compliance: ""
   file-patterns: []

trivy-vuln.yaml

@@ -1,15 +1,12 @@
 ---
 cache:
   backend: fs
-  clear: false
 db:
   download-java-only: false
   download-only: false
-  java-repository: ghcr.io/aquasecurity/trivy-java-db
   java-skip-update: false
   light: false
   no-progress: false
-  repository: ghcr.io/aquasecurity/trivy-db
   skip-update: false
 # debug: false
 dependency-tree: true
@@ -22,18 +19,13 @@ insecure: false
 list-all-pkgs: true
 misconfiguration:
   include-non-failures: false
-  policy-bundle-repository: ghcr.io/aquasecurity/defsec:0
-  reset-policy-bundle: false
 output: ""
 quiet: true
 report: summary
-reset: false
 scan:
   compliance: ""
   file-patterns: []
   offline: false
-  rekor-url: https://rekor.sigstore.dev
-  sbom-sources: []
   scanners:
     - vuln
     - config