From 7113eff1597554c246bb2b6efc2bf319a05b1304 Mon Sep 17 00:00:00 2001 From: Neha Bhat Date: Fri, 28 Jun 2024 10:54:48 -0400 Subject: [PATCH 1/2] Update CAActivation resource customSetDefaults --- apis/v1alpha1/ack-generate-metadata.yaml | 2 +- .../certificate_authority_activation/custom_delta.go | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 7686e41..dba193a 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-28T14:43:20Z" build_hash: 14cef51778d471698018b6c38b604181a6948248 go_version: go1.22.0 version: v0.34.0 diff --git a/pkg/resource/certificate_authority_activation/custom_delta.go b/pkg/resource/certificate_authority_activation/custom_delta.go index c7d126c..b84448e 100644 --- a/pkg/resource/certificate_authority_activation/custom_delta.go +++ b/pkg/resource/certificate_authority_activation/custom_delta.go @@ -15,17 +15,13 @@ package certificate_authority_activation import ( 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 Staus is ACTIVE - defaultStatus := aws.String("ACTIVE") - - if ackcompare.IsNil(a.ko.Spec.Status) && ackcompare.IsNotNil(b.ko.Spec.Status) { - a.ko.Spec.Status = defaultStatus + if ackcompare.IsNil(desired.ko.Spec.Status) && ackcompare.IsNotNil(latest.ko.Spec.Status) { + desired.ko.Spec.Status = latest.ko.Spec.Status } } From 4db4ef95a93a92cdf6ff5e00bdcc70860b991172 Mon Sep 17 00:00:00 2001 From: Neha Bhat Date: Tue, 2 Jul 2024 16:14:07 -0400 Subject: [PATCH 2/2] Rename desired and latest in customSetDefaults --- .../certificate_authority_activation/custom_delta.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/resource/certificate_authority_activation/custom_delta.go b/pkg/resource/certificate_authority_activation/custom_delta.go index b84448e..44cbf23 100644 --- a/pkg/resource/certificate_authority_activation/custom_delta.go +++ b/pkg/resource/certificate_authority_activation/custom_delta.go @@ -18,10 +18,10 @@ import ( ) func customSetDefaults( - desired *resource, - latest *resource, + a *resource, + b *resource, ) { - if ackcompare.IsNil(desired.ko.Spec.Status) && ackcompare.IsNotNil(latest.ko.Spec.Status) { - desired.ko.Spec.Status = latest.ko.Spec.Status + if ackcompare.IsNil(a.ko.Spec.Status) && ackcompare.IsNotNil(b.ko.Spec.Status) { + a.ko.Spec.Status = b.ko.Spec.Status } }