From 0bf2ff6dfec29957413fee22d4cb0852c5527c8e Mon Sep 17 00:00:00 2001 From: Neha Bhat Date: Fri, 28 Jun 2024 10:39:37 -0400 Subject: [PATCH 1/2] Update CA resource customSetDefaults --- apis/v1alpha1/ack-generate-metadata.yaml | 2 +- .../certificate_authority/custom_delta.go | 33 ++++++++----------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 7686e41..fd51a74 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,5 +1,5 @@ ack_generate_info: - build_date: "2024-05-02T20:44:28Z" + build_date: "2024-06-26T15:57:25Z" build_hash: 14cef51778d471698018b6c38b604181a6948248 go_version: go1.22.0 version: v0.34.0 diff --git a/pkg/resource/certificate_authority/custom_delta.go b/pkg/resource/certificate_authority/custom_delta.go index decef94..043fa80 100644 --- a/pkg/resource/certificate_authority/custom_delta.go +++ b/pkg/resource/certificate_authority/custom_delta.go @@ -16,37 +16,30 @@ package certificate_authority import ( svcapitypes "github.com/aws-controllers-k8s/acmpca-controller/apis/v1alpha1" ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" - "github.com/aws/aws-sdk-go/aws" ) func customSetDefaults( - a *resource, - b *resource, + desired *resource, + latest *resource, ) { - // Default value of UsageMode is GENERAL_PURPOSE - defaultUsageMode := aws.String("GENERAL_PURPOSE") - - if ackcompare.IsNil(a.ko.Spec.UsageMode) && ackcompare.IsNotNil(b.ko.Spec.UsageMode) { - a.ko.Spec.UsageMode = defaultUsageMode + if ackcompare.IsNil(desired.ko.Spec.UsageMode) && ackcompare.IsNotNil(latest.ko.Spec.UsageMode) { + desired.ko.Spec.UsageMode = latest.ko.Spec.UsageMode } - // Default value of KeyStorageSecurityStandard is FIPS_140_2_LEVEL_3_OR_HIGHER - defaultKeyStorageSecurityStandard := aws.String("FIPS_140_2_LEVEL_3_OR_HIGHER") - - if ackcompare.IsNil(a.ko.Spec.KeyStorageSecurityStandard) && ackcompare.IsNotNil(b.ko.Spec.KeyStorageSecurityStandard) { - a.ko.Spec.KeyStorageSecurityStandard = defaultKeyStorageSecurityStandard + if ackcompare.IsNil(desired.ko.Spec.KeyStorageSecurityStandard) && ackcompare.IsNotNil(latest.ko.Spec.KeyStorageSecurityStandard) { + desired.ko.Spec.KeyStorageSecurityStandard = latest.ko.Spec.KeyStorageSecurityStandard } - if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration) { - a.ko.Spec.RevocationConfiguration = &svcapitypes.RevocationConfiguration{} + if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration) { + desired.ko.Spec.RevocationConfiguration = &svcapitypes.RevocationConfiguration{} } - if ackcompare.IsNotNil(a.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration) { - if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration.CRLConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration.CRLConfiguration) { - a.ko.Spec.RevocationConfiguration.CRLConfiguration = b.ko.Spec.RevocationConfiguration.CRLConfiguration + if ackcompare.IsNotNil(desired.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration) { + if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration.CRLConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration.CRLConfiguration) { + desired.ko.Spec.RevocationConfiguration.CRLConfiguration = latest.ko.Spec.RevocationConfiguration.CRLConfiguration } - if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration.OCSPConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration.OCSPConfiguration) { - a.ko.Spec.RevocationConfiguration.OCSPConfiguration = b.ko.Spec.RevocationConfiguration.OCSPConfiguration + if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration.OCSPConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration.OCSPConfiguration) { + desired.ko.Spec.RevocationConfiguration.OCSPConfiguration = latest.ko.Spec.RevocationConfiguration.OCSPConfiguration } } } From 110bf5a5aa77882c21d45152264fe7467e623c31 Mon Sep 17 00:00:00 2001 From: Neha Bhat Date: Tue, 2 Jul 2024 16:13:06 -0400 Subject: [PATCH 2/2] Rename desired and latest in customSetDefaults --- .../certificate_authority/custom_delta.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/resource/certificate_authority/custom_delta.go b/pkg/resource/certificate_authority/custom_delta.go index 043fa80..79a1972 100644 --- a/pkg/resource/certificate_authority/custom_delta.go +++ b/pkg/resource/certificate_authority/custom_delta.go @@ -19,27 +19,27 @@ import ( ) func customSetDefaults( - desired *resource, - latest *resource, + a *resource, + b *resource, ) { - if ackcompare.IsNil(desired.ko.Spec.UsageMode) && ackcompare.IsNotNil(latest.ko.Spec.UsageMode) { - desired.ko.Spec.UsageMode = latest.ko.Spec.UsageMode + if ackcompare.IsNil(a.ko.Spec.UsageMode) && ackcompare.IsNotNil(b.ko.Spec.UsageMode) { + a.ko.Spec.UsageMode = b.ko.Spec.UsageMode } - if ackcompare.IsNil(desired.ko.Spec.KeyStorageSecurityStandard) && ackcompare.IsNotNil(latest.ko.Spec.KeyStorageSecurityStandard) { - desired.ko.Spec.KeyStorageSecurityStandard = latest.ko.Spec.KeyStorageSecurityStandard + if ackcompare.IsNil(a.ko.Spec.KeyStorageSecurityStandard) && ackcompare.IsNotNil(b.ko.Spec.KeyStorageSecurityStandard) { + a.ko.Spec.KeyStorageSecurityStandard = b.ko.Spec.KeyStorageSecurityStandard } - if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration) { - desired.ko.Spec.RevocationConfiguration = &svcapitypes.RevocationConfiguration{} + if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration) { + a.ko.Spec.RevocationConfiguration = &svcapitypes.RevocationConfiguration{} } - if ackcompare.IsNotNil(desired.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration) { - if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration.CRLConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration.CRLConfiguration) { - desired.ko.Spec.RevocationConfiguration.CRLConfiguration = latest.ko.Spec.RevocationConfiguration.CRLConfiguration + if ackcompare.IsNotNil(a.ko.Spec.RevocationConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration) { + if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration.CRLConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration.CRLConfiguration) { + a.ko.Spec.RevocationConfiguration.CRLConfiguration = b.ko.Spec.RevocationConfiguration.CRLConfiguration } - if ackcompare.IsNil(desired.ko.Spec.RevocationConfiguration.OCSPConfiguration) && ackcompare.IsNotNil(latest.ko.Spec.RevocationConfiguration.OCSPConfiguration) { - desired.ko.Spec.RevocationConfiguration.OCSPConfiguration = latest.ko.Spec.RevocationConfiguration.OCSPConfiguration + if ackcompare.IsNil(a.ko.Spec.RevocationConfiguration.OCSPConfiguration) && ackcompare.IsNotNil(b.ko.Spec.RevocationConfiguration.OCSPConfiguration) { + a.ko.Spec.RevocationConfiguration.OCSPConfiguration = b.ko.Spec.RevocationConfiguration.OCSPConfiguration } } }