Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d23fbe6
Add docs for new resource
YakDriver Jul 25, 2025
1426ad0
Add new resource
YakDriver Jul 25, 2025
4ffa6b8
Add tests for new resource
YakDriver Jul 25, 2025
a23a38b
Updates for new resource
YakDriver Jul 25, 2025
8ba5f5a
Add changelog entry
YakDriver Jul 25, 2025
0b4c046
Update for region, fix description
YakDriver Jul 25, 2025
19cc2c4
Fix test and various issues
YakDriver Jul 25, 2025
40f7e10
Fix semgrep issues
YakDriver Jul 28, 2025
b09262f
Fix testing lints
YakDriver Jul 28, 2025
da4fa88
Update the documentation with warnings
YakDriver Jul 28, 2025
1e27141
Ignore hardcode linting because unit test
YakDriver Jul 28, 2025
2701eee
Minor fixes
YakDriver Jul 29, 2025
b6db05c
Update test exports
YakDriver Jul 29, 2025
87cae95
Begin work on adding ruleActionOverride
YakDriver Jul 29, 2025
ca1ea0a
Get rule_action_override working
YakDriver Jul 29, 2025
ceed2a8
Fix rule_action_override
YakDriver Jul 29, 2025
11f5d37
Add tests for updates
YakDriver Jul 29, 2025
b7c5f0a
Linty fixes
YakDriver Jul 29, 2025
281e2e3
Add rule_action_override to docs
YakDriver Jul 29, 2025
14546b9
Use autoflex more
YakDriver Jul 29, 2025
f877c11
Use autoflex to flatten
YakDriver Jul 29, 2025
6c61168
Add quick-fixes target
YakDriver Jul 29, 2025
0ee55d0
Use constants
YakDriver Jul 29, 2025
7e309d9
Move rule_action_override to a var
YakDriver Jul 30, 2025
aa4fa40
Refactor to rule_group_reference block
YakDriver Jul 30, 2025
3bfc785
Add managed_rule_group initially
YakDriver Jul 30, 2025
2d61bd7
Test for managed rule groups
YakDriver Jul 30, 2025
68fe6f9
Update docs for managed rule groups
YakDriver Jul 30, 2025
e6bdf73
Use aws func instead of hasprefix
YakDriver Jul 30, 2025
3638a9b
Update docs
YakDriver Jul 30, 2025
4333bc5
Update import sections
YakDriver Jul 30, 2025
fc17aa2
Add warnings, tweaks to docs
YakDriver Jul 30, 2025
44d66f6
Update how IDs are handled
YakDriver Aug 6, 2025
f851141
Test new ID regime
YakDriver Aug 6, 2025
9a35f3e
Update docs
YakDriver Aug 6, 2025
212dc82
Lillint
YakDriver Aug 6, 2025
95ea8da
Merge remote-tracking branch 'origin/main' into f-wafv2-acl-rules
YakDriver Aug 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/43561.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_wafv2_web_acl_rule_group_association
```
44 changes: 24 additions & 20 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ fix-constants: semgrep-constants fmt ## Use Semgrep to fix constants

fix-imports: ## Fixing source code imports with goimports
@echo "make: Fixing source code imports with goimports..."
@find internal -name "*.go" -type f -exec goimports -w {} \;
@find ./$(PKG_NAME) -name "*.go" -type f -exec goimports -w {} \;

fmt: ## Fix Go source formatting
@echo "make: Fixing source code with gofmt..."
Expand Down Expand Up @@ -383,6 +383,9 @@ provider-lint: ## [CI] ProviderLint Checks / providerlint
-XS002=false \
$(SVC_DIR)/... ./internal/provider/...

quick-fix: fmt testacc-lint-fix fix-imports modern-fix semgrep-fix ## Some quick fixes
@echo "make: Quick fixes..."

provider-markdown-lint: ## [CI] Provider Check / markdown-lint
@echo "make: Provider Check / markdown-lint..."
@docker run --rm \
Expand Down Expand Up @@ -627,7 +630,7 @@ t: prereq-go fmt-check ## Run acceptance tests (similar to testacc)

test: prereq-go fmt-check ## Run unit tests
@echo "make: Running unit tests..."
$(GO_VER) test -count $(TEST_COUNT) $(TEST) $(TESTARGS) -timeout=15m -vet=off
$(GO_VER) test $(TEST) -v -count $(TEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(RUNARGS) $(TESTARGS) -timeout 15m -vet=off

test-compile: prereq-go ## Test package compilation
@if [ "$(TEST)" = "./..." ]; then \
Expand Down Expand Up @@ -885,99 +888,100 @@ yamllint: ## [CI] YAML Linting / yamllint
acctest-lint \
build \
changelog-misspell \
ci-quick \
ci \
ci-quick \
clean \
clean-go \
clean-make-tests \
clean-tidy \
clean \
copyright \
default \
deps-check \
docs \
docs-check \
docs-link-check \
docs-lint-fix \
docs-lint \
docs-lint-fix \
docs-markdown-lint \
docs-misspell \
docs \
examples-tflint \
fix-constants \
fix-imports \
fmt-check \
fmt \
fmt-check \
fumpt \
gen-check \
gen \
gen-check \
generate-changelog \
gh-workflows-lint \
go-build \
go-misspell \
golangci-lint \
golangci-lint1 \
golangci-lint2 \
golangci-lint3 \
golangci-lint4 \
golangci-lint5 \
golangci-lint \
help \
import-lint \
install \
lint-fix \
lint \
lint-fix \
misspell \
modern-check \
modern-fix \
pr-target-check \
prereq-go \
provider-lint \
provider-markdown-lint \
quick-fix \
sane \
sanity \
semgrep \
semgrep-all \
semgrep-code-quality \
semgrep-constants \
semgrep-docker \
semgrep-fix \
semgrep-naming-cae \
semgrep-naming \
semgrep-naming-cae \
semgrep-service-naming \
semgrep-validate \
semgrep-vcr \
semgrep \
skaff-check-compile \
skaff \
skaff-check-compile \
smoke \
sweep \
sweeper \
sweeper-check \
sweeper-linked \
sweeper-unlinked \
sweeper \
t \
test-compile \
test \
testacc-lint-fix \
test-compile \
testacc \
testacc-lint \
testacc-lint-fix \
testacc-short \
testacc-tflint \
testacc-tflint-dir \
testacc-tflint-embedded \
testacc \
tflint-init \
tfproviderdocs \
tfsdk2fw \
tools \
ts \
update \
vcr-enable \
website \
website-link-check \
website-link-check-ghrc \
website-link-check-markdown \
website-link-check-md \
website-link-check \
website-lint-fix \
website-lint \
website-lint-fix \
website-markdown-lint \
website-misspell \
website-terrafmt \
website-tflint \
website \
yamllint
2 changes: 2 additions & 0 deletions internal/service/wafv2/exports_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var (
ResourceWebACLAssociation = resourceWebACLAssociation
ResourceWebACLLoggingConfiguration = resourceWebACLLoggingConfiguration
ResourceAPIKey = newAPIKeyResource
ResourceWebACLRuleGroupAssociation = newResourceWebACLRuleGroupAssociation

FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey
FindIPSetByThreePartKey = findIPSetByThreePartKey
Expand All @@ -22,4 +23,5 @@ var (
FindWebACLByThreePartKey = findWebACLByThreePartKey
ListRuleGroupsPages = listRuleGroupsPages
ListWebACLsPages = listWebACLsPages
ParseWebACLARN = parseWebACLARN
)
6 changes: 6 additions & 0 deletions internal/service/wafv2/service_package_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading