Skip to content

Commit 334d0ac

Browse files
ewbankkitewbankkit
committed
Merge branch 'main' into dependabot/go_modules/aws-sdk-go-v2-9ef3ce38fb
# Conflicts: # tools/tfsdk2fw/go.sum
2 parents c200710 + 4adef3e commit 334d0ac

File tree

135 files changed

+1381
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1381
-397
lines changed

‎.changelog/43661.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_ec2_managed_prefix_list: Fix `PrefixListVersionMismatch: The prefix list has the incorrect version number` errors when updating entry description
3+
```

‎.changelog/43672.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_lightsail_static_ip: Support resource import
3+
```

‎.changelog/43673.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_inspector2_enabler: Support resource import
3+
```

‎.changelog/43674.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_opensearch_domain_policy: Support resource import
3+
```

‎.ci/.semgrep-service-name0.yml‎

Lines changed: 61 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,6 +1938,67 @@ rules:
19381938
patterns:
19391939
- pattern-regex: "(?i)BedrockAgent"
19401940
severity: WARNING
1941+
- id: bedrockagentcore-in-func-name
1942+
languages:
1943+
- go
1944+
message: Do not use "BedrockAgentCore" in func name inside bedrockagentcore package
1945+
paths:
1946+
include:
1947+
- internal/service/bedrockagentcore
1948+
exclude:
1949+
- internal/service/bedrockagentcore/list_pages_gen.go
1950+
patterns:
1951+
- pattern: func $NAME( ... )
1952+
- metavariable-pattern:
1953+
metavariable: $NAME
1954+
patterns:
1955+
- pattern-regex: "(?i)BedrockAgentCore"
1956+
- focus-metavariable: $NAME
1957+
- pattern-not: func $NAME($T *testing.T)
1958+
severity: WARNING
1959+
- id: bedrockagentcore-in-test-name
1960+
languages:
1961+
- go
1962+
message: Include "BedrockAgentCore" in test name
1963+
paths:
1964+
include:
1965+
- internal/service/bedrockagentcore/*_test.go
1966+
patterns:
1967+
- pattern: func $NAME( ... )
1968+
- metavariable-pattern:
1969+
metavariable: $NAME
1970+
patterns:
1971+
- pattern-not-regex: "^TestAccBedrockAgentCore"
1972+
- pattern-regex: ^TestAcc.*
1973+
severity: WARNING
1974+
- id: bedrockagentcore-in-const-name
1975+
languages:
1976+
- go
1977+
message: Do not use "BedrockAgentCore" in const name inside bedrockagentcore package
1978+
paths:
1979+
include:
1980+
- internal/service/bedrockagentcore
1981+
patterns:
1982+
- pattern: const $NAME = ...
1983+
- metavariable-pattern:
1984+
metavariable: $NAME
1985+
patterns:
1986+
- pattern-regex: "(?i)BedrockAgentCore"
1987+
severity: WARNING
1988+
- id: bedrockagentcore-in-var-name
1989+
languages:
1990+
- go
1991+
message: Do not use "BedrockAgentCore" in var name inside bedrockagentcore package
1992+
paths:
1993+
include:
1994+
- internal/service/bedrockagentcore
1995+
patterns:
1996+
- pattern: var $NAME = ...
1997+
- metavariable-pattern:
1998+
metavariable: $NAME
1999+
patterns:
2000+
- pattern-regex: "(?i)BedrockAgentCore"
2001+
severity: WARNING
19412002
- id: billing-in-func-name
19422003
languages:
19432004
- go
@@ -4357,52 +4418,3 @@ rules:
43574418
patterns:
43584419
- pattern-regex: "(?i)ConfigService"
43594420
severity: WARNING
4360-
- id: connect-in-func-name
4361-
languages:
4362-
- go
4363-
message: Do not use "Connect" in func name inside connect package
4364-
paths:
4365-
include:
4366-
- internal/service/connect
4367-
exclude:
4368-
- internal/service/connect/list_pages_gen.go
4369-
patterns:
4370-
- pattern: func $NAME( ... )
4371-
- metavariable-pattern:
4372-
metavariable: $NAME
4373-
patterns:
4374-
- pattern-regex: "(?i)Connect"
4375-
- pattern-not-regex: .*uickConnect.*
4376-
- focus-metavariable: $NAME
4377-
- pattern-not: func $NAME($T *testing.T)
4378-
severity: WARNING
4379-
- id: connect-in-test-name
4380-
languages:
4381-
- go
4382-
message: Include "Connect" in test name
4383-
paths:
4384-
include:
4385-
- internal/service/connect/*_test.go
4386-
patterns:
4387-
- pattern: func $NAME( ... )
4388-
- metavariable-pattern:
4389-
metavariable: $NAME
4390-
patterns:
4391-
- pattern-not-regex: "^TestAccConnect"
4392-
- pattern-regex: ^TestAcc.*
4393-
severity: WARNING
4394-
- id: connect-in-const-name
4395-
languages:
4396-
- go
4397-
message: Do not use "Connect" in const name inside connect package
4398-
paths:
4399-
include:
4400-
- internal/service/connect
4401-
patterns:
4402-
- pattern: const $NAME = ...
4403-
- metavariable-pattern:
4404-
metavariable: $NAME
4405-
patterns:
4406-
- pattern-regex: "(?i)Connect"
4407-
- pattern-not-regex: .*uickConnect.*
4408-
severity: WARNING

‎.ci/.semgrep-service-name1.yml‎

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,54 @@
11
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
22
rules:
3+
- id: connect-in-func-name
4+
languages:
5+
- go
6+
message: Do not use "Connect" in func name inside connect package
7+
paths:
8+
include:
9+
- internal/service/connect
10+
exclude:
11+
- internal/service/connect/list_pages_gen.go
12+
patterns:
13+
- pattern: func $NAME( ... )
14+
- metavariable-pattern:
15+
metavariable: $NAME
16+
patterns:
17+
- pattern-regex: "(?i)Connect"
18+
- pattern-not-regex: .*uickConnect.*
19+
- focus-metavariable: $NAME
20+
- pattern-not: func $NAME($T *testing.T)
21+
severity: WARNING
22+
- id: connect-in-test-name
23+
languages:
24+
- go
25+
message: Include "Connect" in test name
26+
paths:
27+
include:
28+
- internal/service/connect/*_test.go
29+
patterns:
30+
- pattern: func $NAME( ... )
31+
- metavariable-pattern:
32+
metavariable: $NAME
33+
patterns:
34+
- pattern-not-regex: "^TestAccConnect"
35+
- pattern-regex: ^TestAcc.*
36+
severity: WARNING
37+
- id: connect-in-const-name
38+
languages:
39+
- go
40+
message: Do not use "Connect" in const name inside connect package
41+
paths:
42+
include:
43+
- internal/service/connect
44+
patterns:
45+
- pattern: const $NAME = ...
46+
- metavariable-pattern:
47+
metavariable: $NAME
48+
patterns:
49+
- pattern-regex: "(?i)Connect"
50+
- pattern-not-regex: .*uickConnect.*
51+
severity: WARNING
352
- id: connect-in-var-name
453
languages:
554
- go
@@ -4368,32 +4417,3 @@ rules:
43684417
- focus-metavariable: $NAME
43694418
- pattern-not: func $NAME($T *testing.T)
43704419
severity: WARNING
4371-
- id: iot-in-test-name
4372-
languages:
4373-
- go
4374-
message: Include "IoT" in test name
4375-
paths:
4376-
include:
4377-
- internal/service/iot/*_test.go
4378-
patterns:
4379-
- pattern: func $NAME( ... )
4380-
- metavariable-pattern:
4381-
metavariable: $NAME
4382-
patterns:
4383-
- pattern-not-regex: "^TestAccIoT"
4384-
- pattern-regex: ^TestAcc.*
4385-
severity: WARNING
4386-
- id: iot-in-const-name
4387-
languages:
4388-
- go
4389-
message: Do not use "IoT" in const name inside iot package
4390-
paths:
4391-
include:
4392-
- internal/service/iot
4393-
patterns:
4394-
- pattern: const $NAME = ...
4395-
- metavariable-pattern:
4396-
metavariable: $NAME
4397-
patterns:
4398-
- pattern-regex: "(?i)IoT"
4399-
severity: WARNING

‎.ci/.semgrep-service-name2.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
22
rules:
3+
- id: iot-in-test-name
4+
languages:
5+
- go
6+
message: Include "IoT" in test name
7+
paths:
8+
include:
9+
- internal/service/iot/*_test.go
10+
patterns:
11+
- pattern: func $NAME( ... )
12+
- metavariable-pattern:
13+
metavariable: $NAME
14+
patterns:
15+
- pattern-not-regex: "^TestAccIoT"
16+
- pattern-regex: ^TestAcc.*
17+
severity: WARNING
18+
- id: iot-in-const-name
19+
languages:
20+
- go
21+
message: Do not use "IoT" in const name inside iot package
22+
paths:
23+
include:
24+
- internal/service/iot
25+
patterns:
26+
- pattern: const $NAME = ...
27+
- metavariable-pattern:
28+
metavariable: $NAME
29+
patterns:
30+
- pattern-regex: "(?i)IoT"
31+
severity: WARNING
332
- id: iot-in-var-name
433
languages:
534
- go

‎.ci/.tflint.hcl‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugin "aws" {
22
enabled = true
3-
version = "0.39.0"
3+
version = "0.41.0"
44
source = "github.com/terraform-linters/tflint-ruleset-aws"
55
}
66

@@ -26,11 +26,27 @@ rule "aws_acm_certificate_lifecycle" {
2626
enabled = false
2727
}
2828

29-
rule "aws_accessanalyzer_analyzer_invalid_type" {
29+
# Rule needs to be disabled due to enum value case inconsistencies
30+
rule "aws_dms_s3_endpoint_invalid_compression_type" {
31+
enabled = false
32+
}
33+
34+
# Rule needs to be disabled due to enum value case inconsistencies
35+
rule "aws_dms_s3_endpoint_invalid_date_partition_sequence" {
36+
enabled = false
37+
}
38+
39+
# Rule needs to be disabled due to enum value case inconsistencies
40+
rule "aws_dms_s3_endpoint_invalid_encryption_mode" {
3041
enabled = false
3142
}
3243

3344
# Avoids errant findings related to directory paths in generated configuration files
3445
rule "aws_iam_saml_provider_invalid_saml_metadata_document" {
3546
enabled = false
3647
}
48+
49+
# Rule needs to be disabled due to bad email regex in the linter rule
50+
rule "aws_guardduty_member_invalid_email" {
51+
enabled = false
52+
}

‎.ci/tools/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.5
55
require (
66
github.com/YakDriver/tfproviderdocs v0.22.0
77
github.com/client9/misspell v0.3.4
8-
github.com/golangci/golangci-lint/v2 v2.3.0
8+
github.com/golangci/golangci-lint/v2 v2.3.1
99
github.com/hashicorp/copywrite v0.22.0
1010
github.com/hashicorp/go-changelog v0.0.0-20250127101332-effe3832fb0b
1111
github.com/katbyte/terrafmt v0.5.5
@@ -71,7 +71,7 @@ require (
7171
github.com/bmatcuk/doublestar v1.3.4 // indirect
7272
github.com/bmatcuk/doublestar/v4 v4.8.0 // indirect
7373
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
74-
github.com/bombsimon/wsl/v5 v5.1.0 // indirect
74+
github.com/bombsimon/wsl/v5 v5.1.1 // indirect
7575
github.com/bradleyfalzon/ghinstallation/v2 v2.5.0 // indirect
7676
github.com/breml/bidichk v0.3.3 // indirect
7777
github.com/breml/errchkjson v0.4.1 // indirect
@@ -95,7 +95,7 @@ require (
9595
github.com/curioswitch/go-reassign v0.3.0 // indirect
9696
github.com/cyberphone/json-canonicalization v0.0.0-20220623050100-57a0ce2678a7 // indirect
9797
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
98-
github.com/daixiang0/gci v0.13.6 // indirect
98+
github.com/daixiang0/gci v0.13.7 // indirect
9999
github.com/dave/dst v0.27.3 // indirect
100100
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
101101
github.com/denis-tingaikin/go-header v0.5.0 // indirect
@@ -224,7 +224,7 @@ require (
224224
github.com/lasiar/canonicalheader v1.1.2 // indirect
225225
github.com/ldez/exptostd v0.4.4 // indirect
226226
github.com/ldez/gomoddirectives v0.7.0 // indirect
227-
github.com/ldez/grignotin v0.9.0 // indirect
227+
github.com/ldez/grignotin v0.10.0 // indirect
228228
github.com/ldez/tagliatelle v0.7.1 // indirect
229229
github.com/ldez/usetesting v0.5.0 // indirect
230230
github.com/leonklingele/grouper v1.1.2 // indirect
@@ -293,7 +293,7 @@ require (
293293
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
294294
github.com/sassoftware/relic v7.2.1+incompatible // indirect
295295
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
296-
github.com/securego/gosec/v2 v2.22.6 // indirect
296+
github.com/securego/gosec/v2 v2.22.7 // indirect
297297
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
298298
github.com/shibumi/go-pathspec v1.3.0 // indirect
299299
github.com/shopspring/decimal v1.4.0 // indirect
@@ -305,7 +305,7 @@ require (
305305
github.com/sirupsen/logrus v1.9.3 // indirect
306306
github.com/sivchari/containedctx v1.0.3 // indirect
307307
github.com/skeema/knownhosts v1.3.0 // indirect
308-
github.com/sonatard/noctx v0.3.5 // indirect
308+
github.com/sonatard/noctx v0.4.0 // indirect
309309
github.com/sourcegraph/conc v0.3.0 // indirect
310310
github.com/sourcegraph/go-diff v0.7.0 // indirect
311311
github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d // indirect

0 commit comments

Comments
 (0)