From b18226014aa1924d0979fb3dbc64f61b717d846d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Fri, 17 Jan 2025 12:35:43 +0300 Subject: [PATCH 1/2] Disable lateinit for enabledCloudwatchLogsExports in rds Cluster MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- apis/rds/v1beta1/zz_cluster_terraformed.go | 1 + apis/rds/v1beta2/zz_cluster_terraformed.go | 1 + config/rds/config.go | 3 +++ 3 files changed, 5 insertions(+) diff --git a/apis/rds/v1beta1/zz_cluster_terraformed.go b/apis/rds/v1beta1/zz_cluster_terraformed.go index 61c13c70b4..8ebf18c410 100755 --- a/apis/rds/v1beta1/zz_cluster_terraformed.go +++ b/apis/rds/v1beta1/zz_cluster_terraformed.go @@ -118,6 +118,7 @@ func (tr *Cluster) LateInitialize(attrs []byte) (bool, error) { return false, errors.Wrap(err, "failed to unmarshal Terraform state parameters for late-initialization") } opts := []resource.GenericLateInitializerOption{resource.WithZeroValueJSONOmitEmptyFilter(resource.CNameWildcard)} + opts = append(opts, resource.WithNameFilter("EnabledCloudwatchLogsExports")) li := resource.NewGenericLateInitializer(opts...) return li.LateInitialize(&tr.Spec.ForProvider, params) diff --git a/apis/rds/v1beta2/zz_cluster_terraformed.go b/apis/rds/v1beta2/zz_cluster_terraformed.go index 8485fe41da..9d1679ebe1 100755 --- a/apis/rds/v1beta2/zz_cluster_terraformed.go +++ b/apis/rds/v1beta2/zz_cluster_terraformed.go @@ -118,6 +118,7 @@ func (tr *Cluster) LateInitialize(attrs []byte) (bool, error) { return false, errors.Wrap(err, "failed to unmarshal Terraform state parameters for late-initialization") } opts := []resource.GenericLateInitializerOption{resource.WithZeroValueJSONOmitEmptyFilter(resource.CNameWildcard)} + opts = append(opts, resource.WithNameFilter("EnabledCloudwatchLogsExports")) li := resource.NewGenericLateInitializer(opts...) return li.LateInitialize(&tr.Spec.ForProvider, params) diff --git a/config/rds/config.go b/config/rds/config.go index a80dee99d5..4ecee736cd 100644 --- a/config/rds/config.go +++ b/config/rds/config.go @@ -100,6 +100,9 @@ func Configure(p *config.Provider) { //nolint:gocyclo } return diff, nil } + r.LateInitializer = config.LateInitializer{ + IgnoredFields: []string{"enabled_cloudwatch_logs_exports"}, + } }) p.AddResourceConfigurator("aws_rds_cluster_instance", func(r *config.Resource) { From 24ab56625ec3f5fabf4ea826e3e5fccbb291c5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Fri, 24 Jan 2025 20:09:04 +0300 Subject: [PATCH 2/2] Use DBParameterGroupFamily aurora-postgresql16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- examples/rds/v1beta2/cluster.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rds/v1beta2/cluster.yaml b/examples/rds/v1beta2/cluster.yaml index 292a893fb4..8e5724125f 100644 --- a/examples/rds/v1beta2/cluster.yaml +++ b/examples/rds/v1beta2/cluster.yaml @@ -42,7 +42,7 @@ metadata: spec: forProvider: description: RDS custom cluster parameter group - family: aurora-postgresql15 + family: aurora-postgresql16 parameter: - applyMethod: immediate name: application_name @@ -62,7 +62,7 @@ metadata: spec: forProvider: description: example - family: aurora-postgresql15 + family: aurora-postgresql16 parameter: - applyMethod: immediate name: application_name