fix(dynamodb): Resolve KMSMasterKeyArn for comparison

Signed-off-by: Maximilian Blatt (external expert on behalf of DB Netz) <maximilian.blatt-extern@deutschebahn.com>
crossplane-contrib · Oct 13, 2023 · 7cbb96b · 7cbb96b
1 parent 1abd520
commit 7cbb96b
Show file tree

Hide file tree

Showing 9 changed files with 3,083 additions and 67 deletions.
diff --git a/apis/generate.go b/apis/generate.go
@@ -29,17 +29,10 @@ limitations under the License.
 // Generate crossplane-runtime methodsets (resource.Claim, etc)
 //go:generate go run -tags generate github.com/crossplane/crossplane-tools/cmd/angryjet generate-methodsets --header-file=../hack/boilerplate.go.txt ./...
 
-// TODO(muvaf): Remove the last mockgen usage in Addon resource and move to
-// current convention with tests.
-//go:generate go run github.com/golang/mock/mockgen  --build_flags=--mod=mod -package eksiface -copyright_file ../hack/boilerplate.go.txt -destination ../pkg/clients/eks/fake/eksiface/fake.go github.com/aws/aws-sdk-go/service/eks/eksiface EKSAPI
-
 package apis
 
 import (
 	_ "github.com/aws-controllers-k8s/code-generator/cmd/ack-generate" //nolint:typecheck
-
-	_ "github.com/golang/mock/mockgen"                  //nolint:typecheck
-	_ "sigs.k8s.io/controller-tools/cmd/controller-gen" //nolint:typecheck
-
-	_ "github.com/crossplane/crossplane-tools/cmd/angryjet" //nolint:typecheck
+	_ "github.com/crossplane/crossplane-tools/cmd/angryjet"            //nolint:typecheck
+	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"                //nolint:typecheck
 )
diff --git a/...ents/mock/cognitoidentityprovider/mock.go → ...toidentityprovider/zz_resolver_service.go b/...ents/mock/cognitoidentityprovider/mock.go → ...toidentityprovider/zz_resolver_service.go
diff --git a/pkg/clients/eks/fake/eksiface/fake.go → pkg/clients/mock/eksiface/zz_eks_api.go b/pkg/clients/eks/fake/eksiface/fake.go → pkg/clients/mock/eksiface/zz_eks_api.go
diff --git a/pkg/clients/mock/generate.go b/pkg/clients/mock/generate.go
@@ -1,4 +1,5 @@
 //go:build generate
+// +build generate
 
 /*
 Copyright 2021 The Crossplane Authors.
@@ -16,9 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//go:generate go run -tags generate github.com/golang/mock/mockgen -package kube -destination ./kube/mock.go sigs.k8s.io/controller-runtime/pkg/client Client
-
-//go:generate go run -tags generate github.com/golang/mock/mockgen -package cognitoidentityprovider -destination ./cognitoidentityprovider/mock.go github.com/crossplane-contrib/provider-aws/pkg/clients/cognitoidentityprovider ResolverService
+//go:generate go run -tags generate github.com/golang/mock/mockgen --build_flags=--mod=mod -copyright_file ../../../hack/boilerplate.go.txt -package eksiface  -destination ./eksiface/zz_eks_api.go github.com/aws/aws-sdk-go/service/eks/eksiface EKSAPI
+//go:generate go run -tags generate github.com/golang/mock/mockgen --build_flags=--mod=mod -copyright_file ../../../hack/boilerplate.go.txt -package kmsiface -destination ./kmsiface/zz_kms_api.go github.com/aws/aws-sdk-go/service/kms/kmsiface KMSAPI
+//go:generate go run -tags generate github.com/golang/mock/mockgen --build_flags=--mod=mod -copyright_file ../../../hack/boilerplate.go.txt -package kube -destination ./kube/zz_client.go sigs.k8s.io/controller-runtime/pkg/client Client
+//go:generate go run -tags generate github.com/golang/mock/mockgen --build_flags=--mod=mod -copyright_file ../../../hack/boilerplate.go.txt -package cognitoidentityprovider -destination ./cognitoidentityprovider/zz_resolver_service.go github.com/crossplane-contrib/provider-aws/pkg/clients/cognitoidentityprovider ResolverService
 
 package mock