FIx unit tests

Signed-off-by: Borja Clemente <bclement@redhat.com>

Author: clebs

api/v1beta1/conversion_test.go

@@ -19,11 +19,11 @@ package v1beta1
 import (
 	"testing"
 
-	fuzz "github.com/google/gofuzz"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"sigs.k8s.io/randfill"
 
 	"sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
@@ -36,8 +36,8 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	}
 }
 
-func AWSMachineFuzzer(obj *AWSMachine, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func AWSMachineFuzzer(obj *AWSMachine, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// AWSMachine.Spec.FailureDomain, AWSMachine.Spec.Subnet.ARN and AWSMachine.Spec.AdditionalSecurityGroups.ARN has been removed in v1beta2, so setting it to nil in order to avoid v1beta1 --> v1beta2 --> v1beta1 round trip errors.
 	if obj.Spec.Subnet != nil {
@@ -52,8 +52,8 @@ func AWSMachineFuzzer(obj *AWSMachine, c fuzz.Continue) {
 	obj.Spec.FailureDomain = nil
 }
 
-func AWSMachineTemplateFuzzer(obj *AWSMachineTemplate, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func AWSMachineTemplateFuzzer(obj *AWSMachineTemplate, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// AWSMachineTemplate.Spec.Template.Spec.FailureDomain, AWSMachineTemplate.Spec.Template.Spec.Subnet.ARN and AWSMachineTemplate.Spec.Template.Spec.AdditionalSecurityGroups.ARN has been removed in v1beta2, so setting it to nil in order to avoid  v1beta1 --> v1beta2 --> v1beta round trip errors.
 	if obj.Spec.Template.Spec.Subnet != nil {

cmd/clusterawsadm/gc/gc.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"strings"
 
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/exec" // import all auth plugins
@@ -45,6 +46,7 @@ func init() {
 	_ = clusterv1.AddToScheme(scheme)
 	_ = infrav1.AddToScheme(scheme)
 	_ = ekscontrolplanev1.AddToScheme(scheme)
+	_ = apiextensionsv1.AddToScheme(scheme)
 }
 
 // CmdProcessor handles the garbage collection commands.

cmd/clusterawsadm/gc/gc_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -288,7 +289,68 @@ func TestConfigureGC(t *testing.T) {
 }
 
 func newFakeClient(scheme *runtime.Scheme, objs ...client.Object) client.Client {
-	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objs...).Build()
+	// Add CRDs to the fake client so external.GetObjectFromContractVersionedRef can find them
+	crds := []client.Object{
+		&apiextensionsv1.CustomResourceDefinition{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io",
+				Labels: map[string]string{
+					"cluster.x-k8s.io/v1beta2": "v1beta2",
+					"cluster.x-k8s.io/v1beta1": "v1beta2",
+				},
+			},
+			Spec: apiextensionsv1.CustomResourceDefinitionSpec{
+				Group: ekscontrolplanev1.GroupVersion.Group,
+				Names: apiextensionsv1.CustomResourceDefinitionNames{
+					Kind:   "AWSManagedControlPlane",
+					Plural: "awsmanagedcontrolplanes",
+				},
+				Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
+					{
+						Name:    "v1beta2",
+						Served:  true,
+						Storage: true,
+						Schema: &apiextensionsv1.CustomResourceValidation{
+							OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
+								Type: "object",
+							},
+						},
+					},
+				},
+			},
+		},
+		&apiextensionsv1.CustomResourceDefinition{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "awsclusters.infrastructure.cluster.x-k8s.io",
+				Labels: map[string]string{
+					"cluster.x-k8s.io/v1beta2": "v1beta2",
+					"cluster.x-k8s.io/v1beta1": "v1beta2",
+				},
+			},
+			Spec: apiextensionsv1.CustomResourceDefinitionSpec{
+				Group: infrav1.GroupVersion.Group,
+				Names: apiextensionsv1.CustomResourceDefinitionNames{
+					Kind:   "AWSCluster",
+					Plural: "awsclusters",
+				},
+				Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
+					{
+						Name:    "v1beta2",
+						Served:  true,
+						Storage: true,
+						Schema: &apiextensionsv1.CustomResourceValidation{
+							OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
+								Type: "object",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	allObjs := append(crds, objs...)
+	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(allObjs...).Build()
 }
 
 func newManagedCluster(name string, excludeInfra bool) []client.Object {

controllers/awscluster_controller_unit_test.go

@@ -68,10 +68,19 @@ func TestAWSClusterReconcilerReconcile(t *testing.T) {
 			expectError: false,
 		},
 		{
-			name:         "Should not Reconcile if cluster is paused",
-			awsCluster:   &infrav1.AWSCluster{ObjectMeta: metav1.ObjectMeta{GenerateName: "aws-test-", Annotations: map[string]string{clusterv1.PausedAnnotation: ""}}},
-			ownerCluster: &clusterv1.Cluster{ObjectMeta: metav1.ObjectMeta{GenerateName: "capi-test-"}},
-			expectError:  false,
+			name:       "Should not Reconcile if cluster is paused",
+			awsCluster: &infrav1.AWSCluster{ObjectMeta: metav1.ObjectMeta{GenerateName: "aws-test-", Annotations: map[string]string{clusterv1.PausedAnnotation: ""}}},
+			ownerCluster: &clusterv1.Cluster{
+				ObjectMeta: metav1.ObjectMeta{GenerateName: "capi-test-"},
+				Spec: clusterv1.ClusterSpec{
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
+						Kind:     "AWSCluster",
+						Name:     "aws-cluster",
+						APIGroup: infrav1.GroupVersion.Group,
+					},
+				},
+			},
+			expectError: false,
 		},
 		{
 			name:        "Should Reconcile successfully if no AWSCluster found",