Skip to content

Commit

Permalink
feat: Merge commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
skyzyx committed Nov 10, 2024
2 parents efa2803 + 81ab1e2 commit 1f9e3ac
Show file tree
Hide file tree
Showing 49 changed files with 1,650 additions and 737 deletions.
1 change: 1 addition & 0 deletions .ecrc
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"^Cargo\\.lock$",
"^composer\\.lock$",
"^package-lock\\.json$",
"^poetry\\.lock$",
"^yarn\\.lock$",
"cliff\\.toml$",
"go\\.mod$",
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ jobs:
- "1.7"
- "1.8"
- "1.9"
- "1.10"

steps:
- name: Harden Runner
Expand Down Expand Up @@ -154,6 +155,7 @@ jobs:
- "1.6"
- "1.7"
- "1.8"
- "1.9"

steps:
- name: Harden Runner
Expand Down
22 changes: 18 additions & 4 deletions .lefthook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ pre-commit:
# git diff-index --check "$(git hash-object -t tree /dev/null)"
# stage_fixed: true

gofmt:
tags: "always,go,formatting"
glob: "**/*.go"
run: >-
gofmt -w -s -r 'interface{} -> any' -r 'a[b:len(a)] -> a[b:]' {staged_files}
stage_fixed: true

gofumpt:
tags: "always,go,formatting"
glob: "**/*.go"
run: >-
gofumpt -w -e {staged_files}
stage_fixed: true

markdownlint:
tags: "always,docs,formatting"
glob: "**/*.md"
Expand All @@ -52,13 +66,13 @@ pre-commit:
trivy-vuln:
tags: "always,secrets"
run: >-
trivy fs --config trivy-vuln.yaml --ignorefile .trivyignore.yaml .
trivy fs --config trivy-vuln.yaml --ignorefile .trivyignore .
stage_fixed: false

trivy-license:
tags: "always,secrets"
run: >-
trivy fs --config trivy-license.yaml --ignorefile .trivyignore.yaml .
trivy fs --config trivy-license.yaml --ignorefile .trivyignore .
stage_fixed: false

trufflehog:
Expand All @@ -84,11 +98,11 @@ pre-commit:

# File MUST always end with a trailing linebreak.
"end_of_file.py":
runner: python3.10
runner: poetry run

# Remove trailing whitespace from lines.
"remove_trailing_whitespace.py":
runner: python3.10
runner: poetry run

commit-msg:
commands:
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
* [`68b82e9`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/68b82e916e88db7af9d0b85f89574edbec7aab33): **deps**: Bump `trufflesecurity/trufflehog` from 3.83.3 to 3.83.4 ([#378](https://github.com/northwood-labs/terraform-provider-corefunc/issues/378)) ([@dependabot](https://github.com/dependabot))
* [`9ddd2ab`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/9ddd2ab1bc3bd71747e29cc0875c9e8f0511588c): **deps**: Bump `trufflesecurity/trufflehog` from 3.83.4 to 3.83.5 ([#379](https://github.com/northwood-labs/terraform-provider-corefunc/issues/379)) ([@dependabot](https://github.com/dependabot))
* [`244218f`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/244218f988273e6c737483c025318bbd30c01f01): **deps**: Bump `goreleaser/goreleaser-action` from 6.0.0 to 6.1.0 ([#380](https://github.com/northwood-labs/terraform-provider-corefunc/issues/380)) ([@dependabot](https://github.com/dependabot))
* [`59a5fb4`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/59a5fb4dcbad4afaca9c75b7f6252c5cf79d0c24): Updated all Go dependencies. ([@skyzyx](https://github.com/skyzyx))

### :soap: Linting

Expand All @@ -162,6 +163,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
* [`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))
* [`006e51b`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/006e51bf9c3ba126a5db0c5e1193f02bba8fbd2d): Fix outbound to releases.hashicorp.com. ([@skyzyx](https://github.com/skyzyx))
* [`189d0e2`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/189d0e25ac956d3764cf44d20a8b440f3a1aec48): Add OpenTofu 1.9 pre and Terraform 1.10 pre. ([@skyzyx](https://github.com/skyzyx))
* [`b349147`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/b3491470016aaf196440b73d4422a8f006459413): Fix a few more test fixtures. ([@skyzyx](https://github.com/skyzyx))

### :tractor: Refactor

Expand All @@ -171,6 +175,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
### <!-- 0 -->:rocket: Features

* [`7b53158`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/7b53158fb532000cf34eb763b9fdc7f6973581e1): Improvements to the Makefile. ([@skyzyx](https://github.com/skyzyx))
* [`a91d530`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/a91d530d2f58049f2e3fdcd7335924109221d484): Implemented the `URLDecode()` function. ([@skyzyx](https://github.com/skyzyx))
* [`7a00fc0`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/7a00fc0e5f5b33cab2f160087388a1b52b2f4b85): Implemented `CIDRContains()` function. ([@skyzyx](https://github.com/skyzyx))

### <!-- 1 -->:bug: Bug Fixes

Expand All @@ -180,6 +186,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), adheres t
* [`8685550`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/8685550272c3e1a84e98e932d7dcb438dc1bb6db): Minor updates to linter settings. ([@skyzyx](https://github.com/skyzyx))
* [`268f4db`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/268f4dbb56400a75a906cab589c9d21c04bf145a): Resolve workflow issues where git-cliff ends up in the repo. ([@skyzyx](https://github.com/skyzyx))
* [`ceb144f`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/ceb144f3fcdaee9caee4c8a52af74a995cb03578): Certain outbound API calls in workflows are blocked. ([@skyzyx](https://github.com/skyzyx))
* [`444efd1`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/444efd1cf06d97b047fa3b3ec1fde35d0486e06f): Deprecate the label truncation functionality. ([@skyzyx](https://github.com/skyzyx))
* [`f18a595`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/f18a595b8d2ab92e972aa1863b3ac7934bf00518): Deprecate the label truncation functionality (again). ([@skyzyx](https://github.com/skyzyx))
* [`edbf6d9`](https://github.com/northwood-labs/terraform-provider-corefunc/commit/edbf6d9a3df6a75055f3dd81b80f4d22c482c785): Smooth out some rough edges in the dev flow. ([@skyzyx](https://github.com/skyzyx))

## 1.4.0 — 2024-03-20

Expand Down Expand Up @@ -750,4 +759,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-11-08.</p>
<p>Generated on 2024-11-10.</p>
17 changes: 8 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BINARY_NAME=terraform-provider-corefunc
#-------------------------------------------------------------------------------
# Global stuff.

HOMEBREW_PACKAGES=bash bats-core coreutils editorconfig-checker findutils git git-cliff git-lfs go grep jq librsvg nodejs pre-commit [email protected] shellcheck tfschema trivy trufflesecurity/trufflehog/trufflehog
HOMEBREW_PACKAGES=bash bats-core coreutils editorconfig-checker findutils git git-cliff git-lfs go grep jq librsvg nodejs poetry pre-commit [email protected] shellcheck tfschema trivy trufflesecurity/trufflehog/trufflehog
NEXT_VERSION ?= $(shell git cliff --bump --unreleased --context | jq -r .[0].version)

#-------------------------------------------------------------------------------
Expand All @@ -25,6 +25,7 @@ install-tools-go:
@ $(HEADER) "=====> Installing Go packages..."
$(GO) install github.com/antham/gommit@latest
$(GO) install github.com/charmbracelet/gum@latest
$(GO) install github.com/evilmartians/lefthook@latest
$(GO) install github.com/google/osv-scanner/cmd/osv-scanner@v1
$(GO) install github.com/goph/licensei/cmd/licensei@latest
$(GO) install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@latest
Expand All @@ -42,6 +43,7 @@ install-tools-go:
$(GO) install golang.org/x/tools/cmd/godoc@latest
$(GO) install golang.org/x/vuln/cmd/govulncheck@latest
$(GO) install gotest.tools/gotestsum@latest
$(GO) install mvdan.cc/gofumpt@latest

.PHONY: install-tools-mac
## install-tools-mac: [tools]* Install/upgrade the required tools for macOS, including Go packages.
Expand Down Expand Up @@ -142,12 +144,8 @@ docs-provider: clean-ds
find docs/ -type f -name "*.md" | xargs -I% sed -i 's|<!-- variadic argument generated by tfplugindocs -->||g' "%"

@ echo " "
# Will probably fail.
- pre-commit run --all-files markdownlint

@ echo " "
# Will probably succeed. If not, there's a bigger issue.
pre-commit run --all-files markdownlint
# If this fails, there's a bigger issue.
lefthook run pre-commit --commands markdownlint

.PHONY: docs-cli
## docs-cli: [docs] Preview the Go library documentation on the CLI.
Expand Down Expand Up @@ -230,9 +228,10 @@ list-tests:

.PHONY: bats
## bats: [test] Tests the output of the provider using tfschema and BATS.
bats: build
bats: build clean
@ $(HEADER) "=====> Running BATS/tfschema tests..."
cd ./bats && terraform init && bats *
@ # cd ./bats && terraform init && bats *.bats.sh
cd ./bats && bats *.bats.sh

.PHONY: acc
## acc: [test] Runs Terraform provider acceptance tests. Set NAME= (without 'TestAcc') to run a specific test by name.
Expand Down
Binary file modified acc-coverage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1f9e3ac

Please sign in to comment.