From 9755099cbbebeccee358505bcb41859fc52085d8 Mon Sep 17 00:00:00 2001 From: Bevan Arps Date: Wed, 18 Sep 2024 13:38:51 +1200 Subject: [PATCH 1/3] Code gardening --- .../flexible_servers_configuration_extensions.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go index 830fa22726a..5b97d503462 100644 --- a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go +++ b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go @@ -32,7 +32,8 @@ func (extension *FlexibleServersConfigurationExtension) Import( // API version in the generator.) if config, ok := rsrc.(*api.FlexibleServersConfiguration); ok { // Skip system defaults - if config.Spec.Source != nil && *config.Spec.Source == "system-default" { + if config.Spec.Source != nil && + *config.Spec.Source == "system-default" { return extensions.ImportSkipped("system-defaults don't need to be imported"), nil } } From 554ed96beffea37f04aab6c552c7124951e56d09 Mon Sep 17 00:00:00 2001 From: Bevan Arps Date: Wed, 18 Sep 2024 13:39:10 +1200 Subject: [PATCH 2/3] Filter out readonly configuration --- .../flexible_servers_configuration_extensions.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go index 5b97d503462..ac870237cd9 100644 --- a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go +++ b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go @@ -36,6 +36,12 @@ func (extension *FlexibleServersConfigurationExtension) Import( *config.Spec.Source == "system-default" { return extensions.ImportSkipped("system-defaults don't need to be imported"), nil } + + // Skip readonly configuration + if config.Status.IsReadOnly != nil && + *config.Status.IsReadOnly { + return extensions.ImportSkipped("readonly configuration can't be set"), nil + } } return result, nil From a128401a7298a34dfe8517e955178fb67c7e6efb Mon Sep 17 00:00:00 2001 From: Bevan Arps Date: Wed, 18 Sep 2024 13:39:24 +1200 Subject: [PATCH 3/3] Filter out default values --- .../flexible_servers_configuration_extensions.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go index ac870237cd9..91b194e182a 100644 --- a/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go +++ b/v2/api/dbforpostgresql/customizations/flexible_servers_configuration_extensions.go @@ -42,6 +42,13 @@ func (extension *FlexibleServersConfigurationExtension) Import( *config.Status.IsReadOnly { return extensions.ImportSkipped("readonly configuration can't be set"), nil } + + // Skip default values + if config.Status.DefaultValue != nil && + config.Status.Value != nil && + *config.Status.DefaultValue == *config.Status.Value { + return extensions.ImportSkipped("default value is the same as the current value"), nil + } } return result, nil