Skip to content

Commit 8a5eaa2

Browse files
Merge remote-tracking branch 'origin/main' into f-iot-authentication-type
2 parents 5a91abe + 6ca0e94 commit 8a5eaa2

31 files changed

+1473
-316
lines changed

.changelog/41846.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_lb_listener: Don't send zero value (`false`, `0` or `""`) for unconfigured listener attributes on Create
3+
```

.changelog/42148.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_msk_serverless_cluster: Add `bootstrap_brokers_sasl_iam` attribute. This functionality requires the `kafka:GetBootstrapBrokers` IAM permission
3+
```

.changelog/42559.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_rds_cluster_parameter_group: Fix `InvalidParameterValue: collation_server '..' is not valid for character_set '...'` errors on Create
3+
```

.changelog/42563.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_docdb_cluster: Add `manage_master_user_password` argument and `master_user_secret` attribute
3+
```

.teamcity/scripts/provider_tests/acceptance_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ TF_ACC=1 go test \
4747
./internal/function/... \
4848
./internal/generate/... \
4949
./internal/io/... \
50+
./internal/iters/... \
5051
./internal/json/... \
5152
./internal/logging/... \
5253
./internal/maps/... \

.teamcity/scripts/provider_tests/unit_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ go test \
1919
./internal/function/... \
2020
./internal/generate/... \
2121
./internal/io/... \
22+
./internal/iters/... \
2223
./internal/json/... \
2324
./internal/logging/... \
2425
./internal/maps/... \

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ ENHANCEMENTS:
2525
* resource/aws_dynamodb_table: Add `point_in_time_recovery.recovery_period_in_days` argument ([#41484](https://github.com/hashicorp/terraform-provider-aws/issues/41484))
2626
* resource/aws_ec2_client_vpn_endpoint: Add `client_route_enforcement_options` argument ([#42424](https://github.com/hashicorp/terraform-provider-aws/issues/42424))
2727
* resource/aws_ecs_account_setting_default: Add support for `defaultLogDriverMode` value in `Name` argument ([#42418](https://github.com/hashicorp/terraform-provider-aws/issues/42418))
28+
* resource/aws_msk_serverless_cluster: Add `bootstrap_brokers_sasl_iam` attribute. This functionality requires the `kafka:GetBootstrapBrokers` IAM permission ([#42148](https://github.com/hashicorp/terraform-provider-aws/issues/42148))
2829
* resource/aws_redshiftserverless_workgroup: Add `track_name` argument ([#42451](https://github.com/hashicorp/terraform-provider-aws/issues/42451))
2930
* resource/aws_rum_app_monitor: Add `domain_list` argument ([#42456](https://github.com/hashicorp/terraform-provider-aws/issues/42456))
3031
* resource/aws_rum_app_monitor: Mark `domain` as Optional ([#42456](https://github.com/hashicorp/terraform-provider-aws/issues/42456))
@@ -44,6 +45,8 @@ BUG FIXES:
4445
* resource/aws_controltower_control: Fix handling `ResourceNotFound` exceptions during delete ([#42494](https://github.com/hashicorp/terraform-provider-aws/issues/42494))
4546
* resource/aws_controltower_control: Fix handling of `parameters` block removal ([#42494](https://github.com/hashicorp/terraform-provider-aws/issues/42494))
4647
* resource/aws_ec2_network_insights_path: Fix failure when `filter_at_source.source_address` is unspecified. ([#42369](https://github.com/hashicorp/terraform-provider-aws/issues/42369))
48+
* resource/aws_lb_listener: Don't send zero value (`false`, `0` or `""`) for unconfigured listener attributes on Create ([#41846](https://github.com/hashicorp/terraform-provider-aws/issues/41846))
49+
* resource/aws_rds_cluster_parameter_group: Fix `InvalidParameterValue: collation_server '..' is not valid for character_set '...'` errors on Create ([#42559](https://github.com/hashicorp/terraform-provider-aws/issues/42559))
4750

4851
## 5.97.0 (May 1, 2025)
4952

internal/iters/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Generic Iterator Functions
2+
3+
Complements Go standard library [`iter` package](https://pkg.go.dev/iter@master).
4+
See https://github.com/golang/go/issues/61898.

internal/iters/concat.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package iters
5+
6+
import (
7+
"iter"
8+
)
9+
10+
// Concat returns an iterator over the concatenation of the sequences.
11+
func Concat[V any](seqs ...iter.Seq[V]) iter.Seq[V] {
12+
return func(yield func(V) bool) {
13+
for _, seq := range seqs {
14+
for e := range seq {
15+
if !yield(e) {
16+
return
17+
}
18+
}
19+
}
20+
}
21+
}

internal/iters/concat_test.go

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package iters
5+
6+
import (
7+
"iter"
8+
"slices"
9+
"testing"
10+
)
11+
12+
func TestConcat(t *testing.T) {
13+
t.Parallel()
14+
15+
type testCase struct {
16+
input []iter.Seq[int]
17+
expected int
18+
}
19+
20+
tests := map[string]testCase{
21+
"nil input": {},
22+
"1 input, 0 elements": {
23+
input: []iter.Seq[int]{slices.Values([]int{})},
24+
},
25+
"1 input, 2 elements": {
26+
input: []iter.Seq[int]{slices.Values([]int{1, 2})},
27+
expected: 2,
28+
},
29+
"3 inputs": {
30+
input: []iter.Seq[int]{slices.Values([]int{1, 2}), slices.Values([]int(nil)), slices.Values([]int{3, 4, 5})},
31+
expected: 5,
32+
},
33+
}
34+
35+
for name, test := range tests {
36+
t.Run(name, func(t *testing.T) {
37+
t.Parallel()
38+
39+
output := Concat(test.input...)
40+
41+
if got, want := len(slices.Collect(output)), test.expected; got != want {
42+
t.Errorf("Length of output = %v, want %v", got, want)
43+
}
44+
})
45+
}
46+
}

0 commit comments

Comments
 (0)