Add validations and unit tests

pkg/api/v1alpha1/nutanixdatacenterconfig_types.go

@@ -185,19 +185,19 @@ func (in *NutanixDatacenterConfig) Validate() error {
 	return nil
 }
 
-func createValidateNutanixResourceFunc(msgPrefix, entityName, mfstName string) (func (*NutanixResourceIdentifier) error) {
-	return func (ntnxRId *NutanixResourceIdentifier) error {
+func createValidateNutanixResourceFunc(msgPrefix, entityName, mfstName string) func(*NutanixResourceIdentifier) error {
+	return func(ntnxRId *NutanixResourceIdentifier) error {
 		if ntnxRId.Type != NutanixIdentifierName && ntnxRId.Type != NutanixIdentifierUUID {
 			return fmt.Errorf("%s: invalid identifier type for %s: %s", msgPrefix, entityName, ntnxRId.Type)
 		}
-	
+
 		if ntnxRId.Type == NutanixIdentifierName && (ntnxRId.Name == nil || *ntnxRId.Name == "") {
 			return fmt.Errorf("%s: missing %s name: %s", msgPrefix, entityName, mfstName)
 		} else if ntnxRId.Type == NutanixIdentifierUUID && (ntnxRId.UUID == nil || *ntnxRId.UUID == "") {
 			return fmt.Errorf("%s: missing %s UUID: %s", msgPrefix, entityName, mfstName)
 		}
-	
-		return nil	
+
+		return nil
 	}
 }
 

pkg/api/v1alpha1/testdata/nutanix/datacenterconfig-invalid-failuredomains.yaml

@@ -0,0 +1,30 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    name: eksa-unit-test
+    kind: Secret
+  failureDomains:
+  - name: "pe1"
+    cluster:
+      type: name
+      name: "prism-cluster-1"
+    subnets:
+    - name: "prism-subnet-1"
+      type: "name"
+    - uuid: ""
+      type: "uuid"
+  - name: "pe2"
+    cluster:
+      type: "uuid"
+      uuid: "468b7b36-d15b-406a-90f7-46d1560c4f4e"
+    subnets:
+    - name: "prism-subnet-1"
+      type: "name"
+    - uuid: "3e716c09-0613-46f3-b46a-beb89aa02295"
+      type: "uuid"

pkg/api/v1alpha1/testdata/nutanix/datacenterconfig-valid-failuredomains.yaml

@@ -0,0 +1,30 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    name: eksa-unit-test
+    kind: Secret
+  failureDomains:
+  - name: "pe1"
+    cluster:
+      type: name
+      name: "prism-cluster-1"
+    subnets:
+    - name: "prism-subnet-1"
+      type: "name"
+    - uuid: "3e716c09-0613-46f3-b46a-beb89aa02295"
+      type: "uuid"
+  - name: "pe2"
+    cluster:
+      type: "uuid"
+      uuid: "468b7b36-d15b-406a-90f7-46d1560c4f4e"
+    subnets:
+    - name: "prism-subnet-1"
+      type: "name"
+    - uuid: "3e716c09-0613-46f3-b46a-beb89aa02295"
+      type: "uuid"

pkg/providers/nutanix/provider.go

@@ -226,7 +226,17 @@ func (p *Provider) SetupAndValidateDeleteCluster(ctx context.Context, cluster *t
 }
 
 // SetupAndValidateUpgradeCluster - Performs necessary setup and validations for upgrade cluster operation.
-func (p *Provider) SetupAndValidateUpgradeCluster(ctx context.Context, _ *types.Cluster, clusterSpec *cluster.Spec, _ *cluster.Spec) error {
+func (p *Provider) SetupAndValidateUpgradeCluster(ctx context.Context, cluster *types.Cluster, clusterSpec *cluster.Spec, _ *cluster.Spec) error {
+	// Get current Nutanix Datacenter Config
+	curDc, err := p.kubectlClient.GetEksaNutanixDatacenterConfig(ctx, p.datacenterConfig.Name, cluster.KubeconfigFile, clusterSpec.Cluster.Namespace)
+	if err != nil {
+		return fmt.Errorf("failed setup and validations: %v", err)
+	}
+
+	if len(curDc.Spec.FailureDomains) != len(p.datacenterConfig.Spec.FailureDomains) {
+		return fmt.Errorf("failed setup and validations: failure domains upgrade doesn't supported in current release")
+	}
+
 	if err := p.SetupAndValidateUpgradeManagementComponents(ctx, clusterSpec); err != nil {
 		return err
 	}
@@ -419,7 +429,6 @@ func needsNewEtcdTemplate(oldSpec, newSpec *cluster.Spec, oldNmc, newNmc *v1alph
 	if oldSpec.Bundles.Spec.Number != newSpec.Bundles.Spec.Number {
 		return true
 	}
-
 	return AnyImmutableFieldChanged(oldNmc, newNmc)
 }
 

pkg/providers/nutanix/provider_test.go

@@ -530,7 +530,20 @@ func TestNutanixProviderSetupAndValidateDeleteCluster(t *testing.T) {
 }
 
 func TestNutanixProviderSetupAndValidateUpgradeCluster(t *testing.T) {
-	provider := testDefaultNutanixProvider(t)
+	ctrl := gomock.NewController(t)
+	executable := mockexecutables.NewMockExecutable(ctrl)
+	executable.EXPECT().ExecuteWithStdin(gomock.Any(), gomock.Any(), gomock.Any()).Return(bytes.Buffer{}, nil).AnyTimes()
+	executable.EXPECT().Execute(gomock.Any(), "get",
+		"--ignore-not-found", "-o", "json", "--kubeconfig", "testdata/kubeconfig.yaml", "nutanixdatacenterconfigs.anywhere.eks.amazonaws.com", "--namespace", "default", "eksa-unit-test").Return(*bytes.NewBufferString(nutanixDatacenterConfigSpecJSON), nil).AnyTimes()
+	kubectl := executables.NewKubectl(executable)
+	mockClient := mocknutanix.NewMockClient(ctrl)
+	mockCertValidator := mockCrypto.NewMockTlsValidator(ctrl)
+	mockTransport := mocknutanix.NewMockRoundTripper(ctrl)
+	mockTransport.EXPECT().RoundTrip(gomock.Any()).Return(&http.Response{}, nil).AnyTimes()
+	mockHTTPClient := &http.Client{Transport: mockTransport}
+	mockWriter := filewritermocks.NewMockFileWriter(ctrl)
+	provider := testNutanixProvider(t, mockClient, kubectl, mockCertValidator, mockHTTPClient, mockWriter)
+
 	tests := []struct {
 		name            string
 		clusterConfFile string
@@ -558,7 +571,8 @@ func TestNutanixProviderSetupAndValidateUpgradeCluster(t *testing.T) {
 
 	for _, tt := range tests {
 		clusterSpec := test.NewFullClusterSpec(t, tt.clusterConfFile)
-		err := provider.SetupAndValidateUpgradeCluster(context.Background(), &types.Cluster{Name: "eksa-unit-test"}, clusterSpec, clusterSpec)
+		cluster := &types.Cluster{Name: "eksa-unit-test", KubeconfigFile: "testdata/kubeconfig.yaml"}
+		err := provider.SetupAndValidateUpgradeCluster(context.Background(), cluster, clusterSpec, clusterSpec)
 		if tt.expectErr {
 			assert.Error(t, err, tt.name)
 			thenErrorExpected(t, tt.expectErrStr, err)

pkg/providers/nutanix/template_test.go

@@ -699,6 +699,9 @@ func TestTemplateBuilderFailureDomains(t *testing.T) {
 		clusterSpec := test.NewFullClusterSpec(t, tc.Input)
 
 		machineCfg := clusterSpec.NutanixMachineConfig(clusterSpec.Cluster.Spec.ControlPlaneConfiguration.MachineGroupRef.Name)
+
+		t.Setenv(constants.EksaNutanixUsernameKey, "admin")
+		t.Setenv(constants.EksaNutanixPasswordKey, "password")
 		creds := GetCredsFromEnv()
 
 		bldr := NewNutanixTemplateBuilder(&clusterSpec.NutanixDatacenter.Spec, &machineCfg.Spec, nil,

pkg/providers/nutanix/testdata/datacenterConfig_with_failure_domains.yaml

@@ -0,0 +1,27 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    kind: Secret
+    name: "nutanix-credentials"
+  insecure: true
+  failureDomains:
+  - name: "pe1"
+    cluster:
+      type: name
+      name: "prism-cluster"
+    subnets:
+    - type: uuid
+      uuid: "2d166190-7759-4dc6-b835-923262d6b497"
+  - name: "pe2"
+    cluster:
+      type: uuid
+      uuid: "4d69ca7d-022f-49d1-a454-74535993bda4"
+    subnets:
+    - type: name
+      name: "prism-subnet"

pkg/providers/nutanix/testdata/datacenterConfig_with_failure_domains_invalid_cluster.yaml

@@ -0,0 +1,27 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    kind: Secret
+    name: "nutanix-credentials"
+  insecure: true
+  failureDomains:
+  - name: "pe1"
+    cluster:
+      type: name
+      name: "prism-cluster"
+    subnets:
+    - type: uuid
+      uuid: "2d166190-7759-4dc6-b835-923262d6b497"
+  - name: "pe2"
+    cluster:
+      type: uuid
+      uuid: "4d69ca7d-022f-49d1-a454-00005993bda4"
+    subnets:
+    - type: name
+      name: "prism-subnet"

pkg/providers/nutanix/testdata/datacenterConfig_with_failure_domains_invalid_name.yaml

@@ -0,0 +1,27 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    kind: Secret
+    name: "nutanix-credentials"
+  insecure: true
+  failureDomains:
+  - name: "FIZZBUZZ!!!!"
+    cluster:
+      type: name
+      name: "prism-cluster"
+    subnets:
+    - type: uuid
+      uuid: "2d166190-7759-4dc6-b835-923262d6b497"
+  - name: "pe2"
+    cluster:
+      type: uuid
+      uuid: "4d69ca7d-022f-49d1-a454-74535993bda4"
+    subnets:
+    - type: name
+      name: "prism-subnet"

pkg/providers/nutanix/testdata/datacenterConfig_with_failure_domains_invalid_subnet.yaml

@@ -0,0 +1,27 @@
+apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: NutanixDatacenterConfig
+metadata:
+  name: eksa-unit-test
+  namespace: default
+spec:
+  endpoint: "prism.nutanix.com"
+  port: 9440
+  credentialRef:
+    kind: Secret
+    name: "nutanix-credentials"
+  insecure: true
+  failureDomains:
+  - name: "pe1"
+    cluster:
+      type: name
+      name: "prism-cluster"
+    subnets:
+    - type: uuid
+      uuid: "2d166190-7759-4dc6-b835-000062d6b497"
+  - name: "pe2"
+    cluster:
+      type: uuid
+      uuid: "4d69ca7d-022f-49d1-a454-74535993bda4"
+    subnets:
+    - type: name
+      name: "prism-subnet"

pkg/providers/nutanix/testdata/expected_results_failure_domains.yaml

@@ -601,3 +601,31 @@ spec:
   - kind: Secret
     name: test-nutanix-ccm-secret
   strategy: Reconcile
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "test-nutanix-ccm-secret"
+  namespace: "eksa-system"
+stringData:
+  nutanix-ccm-secret.yaml: |
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: nutanix-creds
+      namespace: kube-system
+    stringData:
+      credentials: |-
+        [
+          {        
+            "type": "basic_auth",
+            "data": {
+              "prismCentral": {
+                "username": "admin",
+                "password": "password"
+              },
+              "prismElements": null
+            }
+          }
+        ]
+type: addons.cluster.x-k8s.io/resource-set

pkg/providers/nutanix/validator.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -126,6 +127,37 @@ func (v *Validator) ValidateDatacenterConfig(ctx context.Context, client Client,
 		return err
 	}
 
+	if err := v.validateFailureDomains(ctx, client, config); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (v *Validator) validateFailureDomains(ctx context.Context, client Client, config *anywherev1.NutanixDatacenterConfig) error {
+	regexName, err := regexp.Compile("^[a-z0-9]([-a-z0-9]*[a-z0-9])?$")
+	if err != nil {
+		return err
+	}
+
+	for _, fd := range config.Spec.FailureDomains {
+		if res := regexName.MatchString(fd.Name); !res {
+			errorStr := `failure domain name should contains only small letters, digits, and hyphens.
+			It should start with small letter or digit`
+			return fmt.Errorf(errorStr)
+		}
+
+		if err := v.validateClusterConfig(ctx, client, fd.Cluster); err != nil {
+			return err
+		}
+
+		for _, subnet := range fd.Subnets {
+			if err := v.validateSubnetConfig(ctx, client, subnet); err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }