Skip to content

Commit d1e62c5

Browse files
ewbankkitewbankkit
committed
Merge branch 'main' into td-acctest.ProviderFactories-to-acctest.ProtoV5ProviderFactories
2 parents 7ef941b + 507bdd3 commit d1e62c5

File tree

2,838 files changed

+32912
-14249
lines changed

Some content is hidden

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

2,838 files changed

+32912
-14249
lines changed

‎.actrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Needed for testing our workflows
2-
-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-18.04
2+
-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-18.04

‎.changelog/15011.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_security_group: Additional plan-time validation for `name` and `name_prefix`
3+
```

‎.changelog/20179.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
``release-note:new-resource
2+
aws_fis_experiment_template
3+
```

‎.changelog/23060.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:bug
2+
resource/aws_iam_role: Fix diffs in `assume_role_policy` when there are no semantic changes
3+
```
4+
5+
```release-note:bug
6+
resource/aws_iam_role: Fix problem with exclusive management of inline and managed policies when empty (i.e., remove out-of-band policies)
7+
```

‎.changelog/24340.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_security_group_rule: Add configurable Create timeout
3+
```

‎.changelog/24777.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-data-source
2+
aws_connect_user_hierarchy_group
3+
```

‎.changelog/24832.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_connect_user
3+
```

‎.changelog/24849.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_connect_vocabulary
3+
```

‎.changelog/24864.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
```release-note:bug
2+
resource/aws_connect_hours_of_operation: Fix tags not being updated
3+
```
4+
5+
```release-note:bug
6+
resource/aws_connect_queue: Fix tags not being updated
7+
```
8+
9+
```release-note:bug
10+
resource/aws_connect_quick_connect: Fix tags not being updated
11+
```
12+
13+
```release-note:bug
14+
resource/aws_connect_routing_profile: Fix tags not being updated
15+
```
16+
17+
```release-note:bug
18+
resource/aws_connect_security_profile: Fix tags not being updated
19+
```
20+
21+
```release-note:bug
22+
resource/aws_connect_user_hierarchy_group: Fix tags not being updated
23+
```

‎.changelog/25131.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_guardduty_organization_configuration: Add `kubernetes` attribute to the `datasources` configuration block
3+
```

‎.changelog/25432.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/aws_ce_cost_category: Add `tags` argument and `tags_all` attribute to support resource tagging
3+
```
4+
5+
```release-note:enhancement
6+
data-source/aws_ce_cost_category: Add `tags` attribute
7+
```

‎.changelog/25718.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_rds_cluster: Prevent failure of AWS RDS Cluster creation when it is in `rebooting` state.
3+
```

‎.changelog/25729.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_rds_cluster_instance: Allow `performance_insights_retention_period` values that are multiples of `31`
3+
```

‎.changelog/25762.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_location_geofence_collection
3+
```

‎.changelog/25779.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_rolesanywhere_trust_anchor
3+
```

‎.changelog/25781.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-data-source
2+
aws_s3_account_public_access_block
3+
```

‎.changelog/25789.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
data-source/aws_networkmanager_core_network_policy_document: Fix bug where bool values in `segments` blocks weren't being included in json payloads
3+
```

‎.changelog/25790.txt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```release-note:enhancement
2+
resource/aws_imagebuilder_image_recipe: Add `throughput` argument to the `block_device_mapping` configuration block
3+
```
4+
5+
```release-note:enhancement
6+
data-source/aws_imagebuilder_image_recipe: Add `throughput` attribute to the `block_device_mapping` configuration block
7+
```
8+
9+
```release-note:enhancement
10+
resource/aws_imagebuilder_container_recipe: Add `throughput` argument to the `block_device_mapping` configuration block
11+
```
12+
13+
```release-note:enhancement
14+
data-source/aws_imagebuilder_container_recipe: Add `throughput` attribute to the `block_device_mapping` configuration block
15+
```

‎.changelog/25793.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_route_table: Retry resource Create for EC2 eventual consistency
3+
```

‎.changelog/25796.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_db_instance_automated_backups_replication: Add support for custom timeouts (create and delete)
3+
```

‎.changelog/25819.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_appmesh_gateway_route: Add `http2_route.action.rewrite`, `http2_route.match.hostname`, `http_route.action.rewrite` and `http_route.match.hostname` arguments
3+
```

‎.changelog/25822.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
data/aws_outposts_asset: Add `rack_elevation` attribute
3+
```

‎.changelog/25841.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_fsx_openzfs_file_system: Allow in-place update of `storage_capacity`, `throughput_capacity`, and `disk_iops_configuration`.
3+
```

‎.changelog/25844.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-data-source
2+
aws_location_geofence_collection
3+
```

‎.changelog/25850.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_rolesanywhere_profile
3+
```

‎.changelog/25863.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_transcribe_vocabulary
3+
```

‎.changelog/25866.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_dynamodb_table: Add `replica.*.propagate_tags` argument to allow propagating tags to replicas
3+
```

‎.changelog/25889.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_redshiftserverless_namespace
3+
```

‎.changelog/25913.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_flow_log: Add `transit_gateway_id` and `transit_gateway_attachment_id` arguments
3+
```

‎.changelog/25918.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_transcribe_vocabulary_filter
3+
```

‎.changelog/25922.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_storagegateway_gateway: Only manage `average_download_rate_limit_in_bits_per_sec` and `average_upload_rate_limit_in_bits_per_sec` when gateway type supports rate limits
3+
```

‎.changelog/25929.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/aws_datasync_task: Add `includes` argument
3+
```

‎.changelog/25941.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_ce_anomaly_subscription:Fix crash upon adding or removing monitor ARNs to `monitor_arn_list`.
3+
```

‎.ci/.golangci.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
issues:
2+
max-per-linter: 0
3+
max-same-issues: 0
4+
5+
linters:
6+
disable-all: true
7+
enable:
8+
- gofmt
9+
10+
run:
11+
timeout: 10m
12+
go: 1.18
13+
skip-dirs:
14+
- .ci/providerlint/vendor

‎.golangci.yml ‎.ci/.golangci2.yml

+4-30
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
issues:
2-
exclude-rules:
3-
# Exclude issues bypassing staticcheck.conf
4-
- linters:
5-
- staticcheck
6-
text: "SA1019:"
7-
8-
- linters:
9-
- unparam
10-
text: "always receives"
11-
122
max-per-linter: 0
133
max-same-issues: 0
144

@@ -18,21 +8,9 @@ linters:
188
- deadcode
199
- errcheck
2010
- exportloopref
21-
- gofmt
2211
- gomnd
2312
- gosimple
2413
- ineffassign
25-
- makezero
26-
- misspell
27-
- nakedret
28-
- nilerr
29-
- nolintlint
30-
- staticcheck
31-
- structcheck
32-
- unconvert
33-
- unparam
34-
- varcheck
35-
- vet
3614

3715
linters-settings:
3816
errcheck:
@@ -60,13 +38,9 @@ linters-settings:
6038
- strconv.ParseFloat
6139
- strconv.ParseInt
6240
- strings.SplitN
63-
nolintlint:
64-
allow-leading-space: false
65-
require-explanation: true
66-
require-specific: true
67-
allow-no-explanation:
68-
- unparam
69-
- gomnd
7041

7142
run:
72-
timeout: 35m
43+
timeout: 75m
44+
go: 1.18
45+
skip-dirs:
46+
- .ci/providerlint/vendor

‎.ci/.golangci3.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
issues:
2+
exclude-rules:
3+
# Exclude issues bypassing staticcheck.conf
4+
- linters:
5+
- staticcheck
6+
text: "SA1019:"
7+
8+
max-per-linter: 0
9+
max-same-issues: 0
10+
11+
linters:
12+
disable-all: true
13+
enable:
14+
- makezero
15+
- misspell
16+
- nakedret
17+
- nilerr
18+
- nolintlint
19+
- staticcheck
20+
21+
linters-settings:
22+
nolintlint:
23+
allow-unused: true # Because of the disabled rules with Go 1.18
24+
allow-leading-space: false
25+
require-explanation: true
26+
require-specific: true
27+
allow-no-explanation:
28+
- unparam
29+
- gomnd
30+
staticcheck:
31+
checks: ["all", "-SA1019"]
32+
run:
33+
timeout: 75m
34+
go: 1.18
35+
skip-dirs:
36+
- .ci/providerlint/vendor

‎.ci/.golangci4.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
issues:
2+
exclude-rules:
3+
- linters:
4+
- unparam
5+
text: "always receives"
6+
7+
max-per-linter: 0
8+
max-same-issues: 0
9+
10+
linters:
11+
disable-all: true
12+
enable:
13+
- structcheck
14+
- stylecheck
15+
- unconvert
16+
- unparam
17+
- varcheck
18+
- vet
19+
20+
linters-settings:
21+
stylecheck:
22+
checks: ["all", "-ST1005", "-ST1003"]
23+
initialisms: ["ACL", "ACM", "ACMPCA", "ACMPCA", "AMI", "API", "APIGateway", "AppConfig", "AppMesh", "AppSync", "ARN", "ASG", "ASN", "AutoScaling", "BGP", "BYOIP", "CIDR", "CloudFormation", "CloudFront", "CloudWatch", "CMK", "CNAME", "CoIP", "CPU", "CSS", "CSV", "DAX", "DB", "DHCP", "DKIM", "DLM", "DMS", "DNS", "DNSSEC", "DocDB", "DocDB", "DynamoDB", "DynamoDB", "EBS", "EC2", "ECMP", "ECR", "ECS", "EFS", "EIP", "EKS", "ElastiCache", "Elasticsearch", "ELB", "EMR", "FIFO", "FMS", "FQDNS", "FSx", "FSx", "GameLift", "GCM", "GP2", "GP3", "GraphQL", "GRPC", "GuardDuty", "HAProxy", "HSM", "HTTP", "HTTPS", "HVM", "IAM", "IoT", "IP", "IPAM", "IPSet", "iSCSI", "JDBC", "JSON", "KMS", "MFA", "MSK", "MWAA", "MySQL", "NFS", "OAuth", "OIDC", "OpsWorks", "PHP", "PITR", "POSIX", "PreCheck", "QLDB", "RabbitMQ", "RDS", "RFC", "SageMaker", "SASL", "SFN", "SMB", "SMS", "SMTP", "SNS", "SQL", "SQS", "SSH", "SSL", "SSM", "SSO", "STS", "SWF", "TCP", "TLS", "TTL", "URI", "URL", "VGW", "VoIP", "VPC", "VPN", "WAF", "WAFV2", "WorkGroup", "WorkLink", "WorkSpaces", "XRay", "XSS", "YAML"]
24+
25+
run:
26+
timeout: 75m
27+
go: 1.18
28+
skip-dirs:
29+
- .ci/providerlint/vendor

‎.goreleaser.yml ‎.ci/.goreleaser.yml

File renamed without changes.

‎.markdownlinkcheck.json ‎.ci/.markdownlinkcheck.json

File renamed without changes.

‎.markdownlint.yml ‎.ci/.markdownlint.yml

File renamed without changes.

‎.semgrep-caps-aws-ec2.yml ‎.ci/.semgrep-caps-aws-ec2.yml

File renamed without changes.

‎.semgrep-configs.yml ‎.ci/.semgrep-configs.yml

File renamed without changes.

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

+45
Original file line numberDiff line numberDiff line change
@@ -2940,3 +2940,48 @@ rules:
29402940
patterns:
29412941
- pattern-regex: "(?i)ConfigService"
29422942
severity: WARNING
2943+
- id: configservice-in-var-name
2944+
languages:
2945+
- go
2946+
message: Do not use "ConfigService" in var name inside configservice package
2947+
paths:
2948+
include:
2949+
- internal/service/configservice
2950+
patterns:
2951+
- pattern: var $NAME = ...
2952+
- metavariable-pattern:
2953+
metavariable: $NAME
2954+
patterns:
2955+
- pattern-regex: "(?i)ConfigService"
2956+
severity: WARNING
2957+
- id: connect-in-func-name
2958+
languages:
2959+
- go
2960+
message: Do not use "Connect" in func name inside connect package
2961+
paths:
2962+
include:
2963+
- internal/service/connect
2964+
patterns:
2965+
- pattern: func $NAME( ... ) { ... }
2966+
- metavariable-pattern:
2967+
metavariable: $NAME
2968+
patterns:
2969+
- pattern-regex: "(?i)Connect"
2970+
- pattern-not-regex: .*uickConnect.*
2971+
- pattern-not-regex: ^TestAcc.*
2972+
severity: WARNING
2973+
- id: connect-in-test-name
2974+
languages:
2975+
- go
2976+
message: Include "Connect" in test name
2977+
paths:
2978+
include:
2979+
- internal/service/connect/*_test.go
2980+
patterns:
2981+
- pattern: func $NAME( ... ) { ... }
2982+
- metavariable-pattern:
2983+
metavariable: $NAME
2984+
patterns:
2985+
- pattern-not-regex: "^TestAccConnect"
2986+
- pattern-regex: ^TestAcc.*
2987+
severity: WARNING

0 commit comments

Comments
 (0)