Skip to content

Commit 9b971a0

Browse files
authored
Merge branch 'master' into fix/mongodb-regional-id-parsing
2 parents 16547b0 + b5ff068 commit 9b971a0

File tree

5 files changed

+785
-525
lines changed

5 files changed

+785
-525
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/aws/aws-sdk-go-v2/credentials v1.18.10
1010
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1
1111
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4
12-
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.6
12+
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3
1313
github.com/aws/smithy-go v1.23.0
1414
github.com/docker/docker v28.3.3+incompatible
1515
github.com/dustin/go-humanize v1.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1 h1:Hsqo8+dFxSdDvv9B2PgIx1AJAnDpq
101101
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1/go.mod h1:8Q0TAPXD68Z8YqlcIGHs/UNIDHsxErV9H4dl4vJEpgw=
102102
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4 h1:ihddI5wufQQCJiujUgAvWRqZcfDmSKIfXlAuX7T95cg=
103103
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4/go.mod h1:PJtxxMdj747j8DeZENRTTYAz/lx/pADn/U0k7YNNiUY=
104-
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.6 h1:XwpzAaL0nKdSvDS0SRGIQWkqpS8DjcyBRJcatPBFijY=
105-
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.6/go.mod h1:Bar4MrRxeqdn6XIh8JGfiXuFRmyrrsZNTJotxEJmWW0=
104+
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI=
105+
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ=
106106
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg=
107107
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE=
108108
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA=

internal/services/rdb/helpers.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,16 @@ func getIPConfigUpdate(d *schema.ResourceData, ipFieldName string) (ipamConfig *
106106

107107
return ipamConfig, staticConfig
108108
}
109+
110+
// LoadBalancerDiffSuppressFunc suppresses diff when load_balancer is not set
111+
func LoadBalancerDiffSuppressFunc(k, oldValue, newValue string, d *schema.ResourceData) bool {
112+
if !strings.HasPrefix(k, "load_balancer") {
113+
return false
114+
}
115+
116+
if _, exists := d.GetOk("load_balancer"); !exists {
117+
return true
118+
}
119+
120+
return false
121+
}

internal/services/rdb/instance.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,12 @@ func ResourceInstance() *schema.Resource {
260260
Description: "Certificate of the database instance",
261261
},
262262
"load_balancer": {
263-
Type: schema.TypeList,
264-
Optional: true,
265-
Computed: true,
266-
Description: "Load balancer of the database instance",
263+
Type: schema.TypeList,
264+
Optional: true,
265+
Computed: true,
266+
MaxItems: 1,
267+
Description: "Load balancer of the database instance",
268+
DiffSuppressFunc: LoadBalancerDiffSuppressFunc,
267269
Elem: &schema.Resource{
268270
Schema: map[string]*schema.Schema{
269271
// Computed

internal/services/rdb/testdata/instance-endpoints.cassette.yaml

Lines changed: 763 additions & 518 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)