Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apigateway: Migrate to AWS SDK v2 #36445

Merged
merged 93 commits into from
Apr 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
b9dfeaf
apigateway: Migrate to AWS SDK v2
mattburgess Mar 18, 2024
7c63059
Merge branch 'main' into HEAD
ewbankkit Apr 1, 2024
61c6dbe
r/aws_api_gateway_account: Reduce visibility.
ewbankkit Apr 1, 2024
6cc840b
r/aws_api_gateway_account: Serialize acceptance tests.
ewbankkit Apr 1, 2024
94a3b43
r/aws_api_gateway_api_key: Reduce visibility.
ewbankkit Apr 1, 2024
343f749
d/aws_api_gateway_api_key: Reduce visibility.
ewbankkit Apr 1, 2024
d760095
r/aws_api_gateway_authorizer: Reduce visibility.
ewbankkit Apr 2, 2024
9db8914
d/aws_api_gateway_authorizer: Reduce visibility.
ewbankkit Apr 2, 2024
583236d
d/aws_api_gateway_authorizers: Reduce visibility.
ewbankkit Apr 2, 2024
5d760e6
r/aws_api_gateway_base_path_mapping: Reduce visibility.
ewbankkit Apr 2, 2024
096ed25
r/aws_api_gateway_client_certificate: Reduce visibility.
ewbankkit Apr 2, 2024
4819247
r/aws_api_gateway_deployment: Reduce visibility.
ewbankkit Apr 2, 2024
c409806
r/aws_api_gateway_documentation_part: Reduce visibility.
ewbankkit Apr 2, 2024
65dc80b
r/aws_api_gateway_documentation_version: Reduce visibility.
ewbankkit Apr 2, 2024
f4dd226
r/aws_api_gateway_domain_name: Reduce visibility.
ewbankkit Apr 2, 2024
a437fcd
d/aws_api_gateway_export: Reduce visibility.
ewbankkit Apr 2, 2024
89ea554
r/aws_cloudwatch_dashboard: Correct sweeper.
ewbankkit Apr 2, 2024
13b9e34
Use 'flex.ExpandBoolValueMap'.
ewbankkit Apr 2, 2024
a1984b2
r/aws_api_gateway_rest_api: Reduce visibility.
ewbankkit Apr 2, 2024
7b9f520
r/aws_api_gateway_gateway_response: Reduce visibility.
ewbankkit Apr 2, 2024
39a8ebe
r/aws_api_gateway_integration_response: Reduce visibility.
ewbankkit Apr 2, 2024
f866f8f
r/aws_api_gateway_integration: Reduce visibility.
ewbankkit Apr 2, 2024
6511a4e
r/aws_api_gateway_method_response: Reduce visibility.
ewbankkit Apr 2, 2024
6da867c
r/aws_api_gateway_method_settings: Reduce visibility.
ewbankkit Apr 2, 2024
ed675a6
r/aws_api_gateway_method: Reduce visibility.
ewbankkit Apr 2, 2024
8437d90
r/aws_api_gateway_model: Reduce visibility.
ewbankkit Apr 2, 2024
8208edb
r/aws_api_gateway_request_validator: Reduce visibility.
ewbankkit Apr 3, 2024
864fd50
r/aws_api_gateway_resource: Reduce visibility.
ewbankkit Apr 3, 2024
72b3362
d/aws_api_gateway_resource: Reduce visibility.
ewbankkit Apr 3, 2024
af777d7
d/aws_api_gateway_rest_api: Reduce visibility.
ewbankkit Apr 3, 2024
841a15c
Add 'domainNameARN'.
ewbankkit Apr 3, 2024
74cac62
r/aws_api_gateway_rest_api_policy: Reduce visibility.
ewbankkit Apr 3, 2024
8667fab
d/aws_api_gateway_sdk: Reduce visibility.
ewbankkit Apr 3, 2024
7bbf9bb
r/aws_api_gateway_vpc_link: Reduce visibility.
ewbankkit Apr 3, 2024
e8cd6c7
d/aws_api_gateway_vpc_link: Reduce visibility.
ewbankkit Apr 3, 2024
8fa5ff1
r/aws_api_gateway_stage: Reduce visibility.
ewbankkit Apr 3, 2024
33eecc5
d/aws_api_gateway_domain_name: 'tags' is Computed-only.
ewbankkit Apr 3, 2024
7214732
Fix acceptance test compilation errors.
ewbankkit Apr 3, 2024
bc0d057
r/aws_api_gateway_usage_plan_key: Reduce visibility.
ewbankkit Apr 3, 2024
f622c51
r/aws_api_gateway_usage_plan: Reduce visibility.
ewbankkit Apr 3, 2024
d4287d4
'DefaultAuthorizerTTL' -> 'defaultAuthorizerTTL'.
ewbankkit Apr 3, 2024
940797d
apigateway: Tidy up sweepers.
ewbankkit Apr 3, 2024
618c578
r/aws_api_gateway_vpc_link: Tidy up acceptance tests.
ewbankkit Apr 3, 2024
d3f8f3a
d/aws_api_gateway_vpc_link: Tidy up acceptance tests.
ewbankkit Apr 3, 2024
65edb99
Acceptance test output:
ewbankkit Apr 3, 2024
d987c73
r/aws_api_gateway_authorizer: Tweak CustomizeDiff.
ewbankkit Apr 4, 2024
b0ed9bd
Handle 'NotFoundException' on resource Delete.
ewbankkit Apr 4, 2024
1261762
Use 'acctest.ConfigCompose'.
ewbankkit Apr 4, 2024
1b8ecb6
Add 'TestAccAPIGateway_serial'.
ewbankkit Apr 4, 2024
ddc048d
r/aws_api_gateway_method_settings: Serialize acceptance tests.
ewbankkit Apr 4, 2024
d632f6e
r/aws_api_gateway_method_settings: Setup account-level CloudWatch Log…
ewbankkit Apr 4, 2024
65d8138
Fix golangci-lint 'gomnd'.
ewbankkit Apr 4, 2024
de1112f
Fix golangci-lint 'unparam'.
ewbankkit Apr 4, 2024
90839b9
r/aws_api_gateway_integration: Correctly set 'connection_type'.
ewbankkit Apr 4, 2024
9bd45bc
r/aws_api_gateway_usage_plan: Fix 'burst_limit' diff.
ewbankkit Apr 4, 2024
9ca32f3
r/aws_api_gateway_rest_api_policy: Handle 'NotFoundException' on reso…
ewbankkit Apr 4, 2024
f352fe5
r/aws_api_gateway_authorizer: Retry deletion on 'ConflictException'.
ewbankkit Apr 4, 2024
73cc4f0
Add 'ImportStateVerifyIgnore' to fix acceptance tests.
ewbankkit Apr 4, 2024
70dcc49
r/aws_api_gateway_authorizer: Handle 'ConflictException' on resource …
ewbankkit Apr 4, 2024
6d3815d
r/aws_api_gateway_documentation_part: Add 'documentation_part_id' att…
ewbankkit Apr 4, 2024
e2f0a15
apigateway: Handle certain 'ConflictException's centrally.
ewbankkit Apr 4, 2024
dcd2b1b
r/aws_wafregional_byte_match_set: Reduce visibility.
ewbankkit Apr 5, 2024
1a2bff5
r/aws_wafregional_geo_match_set: Reduce visibility.
ewbankkit Apr 5, 2024
8b660a2
r/aws_wafregional_ipset: Reduce visibility.
ewbankkit Apr 5, 2024
01bcb84
d/aws_wafregional_ipset: Reduce visibility.
ewbankkit Apr 5, 2024
57e8153
r/aws_wafregional_rate_based_rule: Reduce visibility.
ewbankkit Apr 5, 2024
97c2bd3
d/aws_wafregional_rate_based_rule: Reduce visibility.
ewbankkit Apr 5, 2024
da23c70
r/aws_wafregional_regex_match_set: Reduce visibility.
ewbankkit Apr 5, 2024
8967973
r/aws_wafregional_regex_pattern_set: Reduce visibility.
ewbankkit Apr 5, 2024
a281e97
d/aws_wafregional_rule: Reduce visibility.
ewbankkit Apr 5, 2024
54032c6
r/aws_wafregional_rule_group: Reduce visibility.
ewbankkit Apr 5, 2024
069df59
r/aws_wafregional_rule: Reduce visibility.
ewbankkit Apr 5, 2024
2f4ee40
r/aws_wafregional_size_constraint_set: Reduce visibility.
ewbankkit Apr 5, 2024
eca49b7
r/aws_wafregional_sql_injection_match_set: Reduce visibility.
ewbankkit Apr 5, 2024
40f1956
d/aws_wafregional_subscribed_rule_group: Reduce visibility.
ewbankkit Apr 5, 2024
5c94345
r/aws_wafregional_web_acl_association: Reduce visibility.
ewbankkit Apr 5, 2024
6aacdae
r/aws_wafregional_web_acl: Reduce visibility.
ewbankkit Apr 5, 2024
bc0cf88
d/aws_wafregional_web_acl: Reduce visibility.
ewbankkit Apr 5, 2024
389d8f1
r/aws_wafregional_xss_match_set: Reduce visibility.
ewbankkit Apr 5, 2024
6edb76a
Make 'aws_wafregional_web_acl_association' more like 'aws_wafv2_web_a…
ewbankkit Apr 5, 2024
b3dea15
r/aws_wafregional_web_acl_association: Add configurable timeouts.
ewbankkit Apr 5, 2024
e8a6b2f
wafregional: Handle 'WAFNonexistentContainerException' and 'WAFNonexi…
ewbankkit Apr 5, 2024
3b07656
Acceptance test output:
ewbankkit Apr 5, 2024
4ad8b9b
r/aws_wafregional_regex_pattern_set: Add sweeper.
ewbankkit Apr 5, 2024
6d46b6d
r/aws_wafregional_regex_match_set: Tidy up sweeper.
ewbankkit Apr 5, 2024
551060f
wafregional: Handle 'WAFNonexistentContainerException' and 'WAFNonexi…
ewbankkit Apr 5, 2024
389c32f
Acceptance test output:
ewbankkit Apr 5, 2024
14b88aa
Fix 'TestAccAPIGatewayAPIKey_value'.
ewbankkit Apr 5, 2024
f47d4cb
r/aws_api_gateway_base_path_mapping: Fix acceptance testAccCheckBaseP…
ewbankkit Apr 5, 2024
dff07be
r/aws_api_gateway_stage: Serialize acceptance tests to fix 'BadReques…
ewbankkit Apr 5, 2024
dd74aba
Acceptance test output:
ewbankkit Apr 5, 2024
3e84bb0
Fix semgrep 'dgryski.semgrep-go.oddifsequence.odd-sequence-ifs'.
ewbankkit Apr 5, 2024
0af4208
Fix golangci-lint 'unparam'.
ewbankkit Apr 5, 2024
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
Prev Previous commit
Next Next commit
r/aws_wafregional_xss_match_set: Reduce visibility.
  • Loading branch information
ewbankkit committed Apr 5, 2024

Verified

This commit was signed with the committer’s verified signature.
mrgrain Momo Kornher
commit 389d8f12d605119d920cc012c033b2347cf6b980
1 change: 1 addition & 0 deletions internal/service/wafregional/exports_test.go
Original file line number Diff line number Diff line change
@@ -17,4 +17,5 @@ var (
ResourceSQLInjectionMatchSet = resourceSQLInjectionMatchSet
ResourceWebACL = resourceWebACL
ResourceWebACLAssociation = resourceWebACLAssociation
ResourceXSSMatchSet = resourceXSSMatchSet
)
3 changes: 2 additions & 1 deletion internal/service/wafregional/service_package_gen.go

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

12 changes: 9 additions & 3 deletions internal/service/wafregional/xss_match_set.go
Original file line number Diff line number Diff line change
@@ -20,13 +20,14 @@ import (
tfwaf "github.com/hashicorp/terraform-provider-aws/internal/service/waf"
)

// @SDKResource("aws_wafregional_xss_match_set")
func ResourceXSSMatchSet() *schema.Resource {
// @SDKResource("aws_wafregional_xss_match_set", name="XSS Match Set")
func resourceXSSMatchSet() *schema.Resource {
return &schema.Resource{
CreateWithoutTimeout: resourceXSSMatchSetCreate,
ReadWithoutTimeout: resourceXSSMatchSetRead,
UpdateWithoutTimeout: resourceXSSMatchSetUpdate,
DeleteWithoutTimeout: resourceXSSMatchSetDelete,

Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
@@ -176,8 +177,13 @@ func resourceXSSMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta

return conn.DeleteXssMatchSetWithContext(ctx, req)
})

if tfawserr.ErrCodeEquals(err, wafregional.ErrCodeWAFNonexistentItemException) {
return diags
}

if err != nil {
return sdkdiag.AppendErrorf(diags, "deleting regional WAF XSS Match Set: %s", err)
return sdkdiag.AppendErrorf(diags, "deleting WAF Regional XSS Match Set (%s): %s", d.Id(), err)
}

return diags