fixup! feat: Add additionalCategories field to Nutanix machine details patch

Add additionalCategories to variables test

Author: dlipovetsky

api/v1alpha1/nutanix_node_types.go

@@ -58,7 +58,7 @@ type NutanixMachineDetails struct {
 	// List of categories that need to be added to the machines. Categories must already
 	// exist in Prism Central. One category key can have more than one value.
 	// +optional
-	AdditionalCategories NutanixCategoryIdentifiers `json:"additionalCategories,omitempty"`
+	AdditionalCategories []NutanixCategoryIdentifier `json:"additionalCategories,omitempty"`
 
 	// Defines the boot type of the virtual machine. Only supports UEFI and Legacy
 	BootType NutanixBootType `json:"bootType,omitempty"`
@@ -208,17 +208,3 @@ func (NutanixCategoryIdentifier) VariableSchema() clusterv1.VariableSchema {
 		},
 	}
 }
-
-type NutanixCategoryIdentifiers []NutanixCategoryIdentifier
-
-func (NutanixCategoryIdentifiers) VariableSchema() clusterv1.VariableSchema {
-	resourceSchema := NutanixCategoryIdentifier{}.VariableSchema().OpenAPIV3Schema
-
-	return clusterv1.VariableSchema{
-		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
-			Description: "Nutanix category identifiers",
-			Type:        "array",
-			Items:       &resourceSchema,
-		},
-	}
-}

api/v1alpha1/zz_generated.deepcopy.go

@@ -41,7 +41,7 @@ var (
 				Name: ptr.To("fake-subnet"),
 			},
 		},
-		AdditionalCategories: v1alpha1.NutanixCategoryIdentifiers{
+		AdditionalCategories: []v1alpha1.NutanixCategoryIdentifier{
 			{
 				Key:   "fake-key",
 				Value: "fake-value",

pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go

@@ -45,6 +45,16 @@ func TestVariableValidation(t *testing.T) {
 							MemorySize:     resource.MustParse("8Gi"),
 							SystemDiskSize: resource.MustParse("40Gi"),
 							Subnets:        []v1alpha1.NutanixResourceIdentifier{},
+							AdditionalCategories: []v1alpha1.NutanixCategoryIdentifier{
+								{
+									Key:   "fake-key",
+									Value: "fake-value1",
+								},
+								{
+									Key:   "fake-key",
+									Value: "fake-value2",
+								},
+							},
 						},
 					},
 				},

pkg/handlers/nutanix/mutation/machinedetails/variables_test.go

@@ -258,11 +258,17 @@ func initBootstrapCluster(
 	clusterctl.InitManagementClusterAndWatchControllerLogs(
 		context.TODO(),
 		clusterctl.InitManagementClusterAndWatchControllerLogsInput{
-			ClusterProxy:              bootstrapClusterProxy,
-			ClusterctlConfigPath:      clusterctlConfig,
-			InfrastructureProviders:   config.GetProviderLatestVersionsByContract("*", config.InfrastructureProviders()...),
-			AddonProviders:            config.GetProviderLatestVersionsByContract("*", config.AddonProviders()...),
-			RuntimeExtensionProviders: config.GetProviderLatestVersionsByContract("*", config.RuntimeExtensionProviders()...),
+			ClusterProxy:         bootstrapClusterProxy,
+			ClusterctlConfigPath: clusterctlConfig,
+			InfrastructureProviders: config.GetProviderLatestVersionsByContract(
+				"*",
+				config.InfrastructureProviders()...),
+			AddonProviders: config.GetProviderLatestVersionsByContract(
+				"*",
+				config.AddonProviders()...),
+			RuntimeExtensionProviders: config.GetProviderLatestVersionsByContract(
+				"*",
+				config.RuntimeExtensionProviders()...),
 			LogFolder: filepath.Join(
 				artifactFolder,
 				"clusters",