From 38f1684b80c5accbfb69afa9ad8221a21c62872c Mon Sep 17 00:00:00 2001 From: Nic Cope Date: Thu, 26 May 2022 17:42:44 -0700 Subject: [PATCH] Use latest ACK codegen This generates controllers that import types from the crossplane-contrib org per https://github.com/aws-controllers-k8s/code-generator/pull/338 Signed-off-by: Nic Cope --- Makefile | 2 +- package/crds/cloudfront.aws.crossplane.io_distributions.yaml | 2 +- pkg/controller/cognitoidentityprovider/userpool/setup.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b86fd7268..da7708ff02 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) PLATFORMS ?= linux_amd64 linux_arm64 CODE_GENERATOR_REPO ?= https://github.com/aws-controllers-k8s/code-generator.git -CODE_GENERATOR_COMMIT ?= f8c0f4711a91e50335450521e3c49673d135d56d +CODE_GENERATOR_COMMIT ?= 6acf40fe3e3cfd97b799ef7cbf1e89e01c3db8f7 GENERATED_SERVICES ?= $(shell find ./apis -type f -name generator-config.yaml | cut -d/ -f 3 | tr '\n' ' ') # kind-related versions diff --git a/package/crds/cloudfront.aws.crossplane.io_distributions.yaml b/package/crds/cloudfront.aws.crossplane.io_distributions.yaml index 55c37a9446..069af02c2a 100644 --- a/package/crds/cloudfront.aws.crossplane.io_distributions.yaml +++ b/package/crds/cloudfront.aws.crossplane.io_distributions.yaml @@ -948,7 +948,7 @@ spec: aliasICPRecordals: items: properties: - cNAME: + cname: type: string iCPRecordalStatus: type: string diff --git a/pkg/controller/cognitoidentityprovider/userpool/setup.go b/pkg/controller/cognitoidentityprovider/userpool/setup.go index 714b507acf..c9b85cec79 100644 --- a/pkg/controller/cognitoidentityprovider/userpool/setup.go +++ b/pkg/controller/cognitoidentityprovider/userpool/setup.go @@ -288,7 +288,7 @@ func areSmsConfigurationEqual(spec *svcapitypes.SmsConfigurationType, current *s if spec != nil && current != nil { switch { case awsclients.StringValue(spec.ExternalID) != awsclients.StringValue(current.ExternalId), - awsclients.StringValue(spec.SnsCallerARN) != awsclients.StringValue(current.SnsCallerArn): + awsclients.StringValue(spec.SNSCallerARN) != awsclients.StringValue(current.SnsCallerArn): return false } }