From d8b9113132c935f8108b916ac125c05ca27b0ef6 Mon Sep 17 00:00:00 2001 From: jremy Date: Mon, 9 Sep 2024 11:22:07 +0200 Subject: [PATCH 1/2] fix(rdb): migrate endpoint to endpoints --- internal/services/rdb/instance.go | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/internal/services/rdb/instance.go b/internal/services/rdb/instance.go index 2bef889fd..96bd8c895 100644 --- a/internal/services/rdb/instance.go +++ b/internal/services/rdb/instance.go @@ -459,10 +459,24 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte _ = d.Set("backup_same_region", res.BackupSameRegion) _ = d.Set("tags", types.FlattenSliceString(res.Tags)) - // Deprecated attribute, might be deleted later - if res.Endpoint != nil { //nolint:staticcheck - _ = d.Set("endpoint_ip", types.FlattenIPPtr(res.Endpoint.IP)) //nolint:staticcheck - _ = d.Set("endpoint_port", int(res.Endpoint.Port)) //nolint:staticcheck + var loadBalancerEndpoint *rdb.Endpoint + + for _, endpoint := range res.Endpoints { + if endpoint.LoadBalancer != nil { + loadBalancerEndpoint = endpoint + break + } + } + + if loadBalancerEndpoint != nil { + if loadBalancerEndpoint.IP != nil { + _ = d.Set("endpoint_ip", types.FlattenIPPtr(loadBalancerEndpoint.IP)) + } else if loadBalancerEndpoint.Hostname != nil { + _ = d.Set("endpoint_ip", *loadBalancerEndpoint.Hostname) + } else { + _ = d.Set("endpoint_ip", "") + } + _ = d.Set("endpoint_port", int(loadBalancerEndpoint.Port)) } else { _ = d.Set("endpoint_ip", "") _ = d.Set("endpoint_port", 0) From 059c208492ada120cd75c28fbfff11f60d8ca617 Mon Sep 17 00:00:00 2001 From: jremy Date: Mon, 9 Sep 2024 11:36:35 +0200 Subject: [PATCH 2/2] fix tflint --- internal/services/rdb/instance.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/services/rdb/instance.go b/internal/services/rdb/instance.go index 96bd8c895..bb9dc91da 100644 --- a/internal/services/rdb/instance.go +++ b/internal/services/rdb/instance.go @@ -469,11 +469,12 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte } if loadBalancerEndpoint != nil { - if loadBalancerEndpoint.IP != nil { + switch { + case loadBalancerEndpoint.IP != nil: _ = d.Set("endpoint_ip", types.FlattenIPPtr(loadBalancerEndpoint.IP)) - } else if loadBalancerEndpoint.Hostname != nil { - _ = d.Set("endpoint_ip", *loadBalancerEndpoint.Hostname) - } else { + case loadBalancerEndpoint.Hostname != nil: + _ = d.Set("endpoint_ip", loadBalancerEndpoint.Hostname) + default: _ = d.Set("endpoint_ip", "") } _ = d.Set("endpoint_port", int(loadBalancerEndpoint.Port))