fix: Reflect correct action in message

Author: dlipovetsky

pkg/webhook/preflight/nutanix/storagecontainer.go

@@ -55,34 +55,36 @@ func (c *storageContainerCheck) Run(ctx context.Context) preflight.CheckResult {
 
 	// Get cluster identifier based on whether failure domain is configured
 	var clusterIdentifier *capxv1.NutanixResourceIdentifier
-	var err error
 
 	if c.failureDomainName != "" {
-		// Get cluster identifier from failure domain
-		clusterIdentifier, err = c.getClusterIdentifierFromFailureDomain(ctx)
+		// Use cluster identifier from failure domain
+		fdObj := &capxv1.NutanixFailureDomain{}
+		fdKey := ctrlclient.ObjectKey{Name: c.failureDomainName, Namespace: c.namespace}
+		err := c.kclient.Get(ctx, fdKey, fdObj)
 		if err != nil {
 			result.Allowed = false
 			if errors.IsNotFound(err) {
 				result.Causes = append(result.Causes, preflight.Cause{
 					Message: fmt.Sprintf(
-						"NutanixFailureDomain %q referenced in cluster was not found in the management cluster. Please create it and retry.", //nolint:lll // Message is long.
+						"NutanixFailureDomain %q was not found in the management cluster. Please create it and retry.", //nolint:lll // Message is long.
 						c.failureDomainName,
 					),
-					Field: c.field,
+					Field: c.field + ".failureDomain",
 				})
 			} else {
 				result.InternalError = true
 				result.Causes = append(result.Causes, preflight.Cause{
 					Message: fmt.Sprintf(
-						"Failed to get cluster identifier from NutanixFailureDomain %q: %v This is usually a temporary error. Please retry.", //nolint:lll // Message is long.
+						"Failed to get NutanixFailureDomain %q: %s. This is usually a temporary error. Please retry.", //nolint:lll // Message is long.
 						c.failureDomainName,
 						err,
 					),
-					Field: c.field,
+					Field: c.field + ".failureDomain",
 				})
 			}
 			return result
 		}
+		clusterIdentifier = &fdObj.Spec.PrismElementCluster
 	} else {
 		// Use cluster identifier from machine spec
 		clusterIdentifier = c.machineSpec.Cluster
@@ -192,19 +194,6 @@ func (c *storageContainerCheck) Run(ctx context.Context) preflight.CheckResult {
 	return result
 }
 
-// getClusterIdentifierFromFailureDomain fetches the failure domain and returns the cluster identifier.
-func (c *storageContainerCheck) getClusterIdentifierFromFailureDomain(
-	ctx context.Context,
-) (*capxv1.NutanixResourceIdentifier, error) {
-	fdObj := &capxv1.NutanixFailureDomain{}
-	fdKey := ctrlclient.ObjectKey{Name: c.failureDomainName, Namespace: c.namespace}
-	if err := c.kclient.Get(ctx, fdKey, fdObj); err != nil {
-		return nil, err
-	}
-
-	return &fdObj.Spec.PrismElementCluster, nil
-}
-
 func newStorageContainerChecks(cd *checkDependencies) []preflight.Check {
 	checks := []preflight.Check{}
 

pkg/webhook/preflight/nutanix/storagecontainer_test.go

@@ -398,6 +398,7 @@ func TestStorageContainerCheck(t *testing.T) {
 		expectedAllowed      bool
 		expectedError        bool
 		expectedCauseMessage string
+		expectedField        string
 		failureDomainName    string
 		kclient              ctrlclient.Client
 		namespace            string
@@ -414,7 +415,7 @@ func TestStorageContainerCheck(t *testing.T) {
 			nclient:              nil,
 			expectedAllowed:      false,
 			expectedError:        false,
-			expectedCauseMessage: "Nutanix CSI Provider configuration is missing storage class configurations",
+			expectedCauseMessage: "Nutanix CSI Provider configuration is missing storage class configurations. Review the Cluster.", //nolint:lll // The message is long.
 		},
 		{
 			name: "storage class config without parameters",
@@ -1154,7 +1155,8 @@ func TestStorageContainerCheck(t *testing.T) {
 			namespace:            "test-ns",
 			expectedAllowed:      false,
 			expectedError:        false,
-			expectedCauseMessage: "NutanixFailureDomain \"non-existent-fd\" referenced in cluster was not found in the management cluster. Please create it and retry.", //nolint:lll // The message is long.
+			expectedCauseMessage: "NutanixFailureDomain \"non-existent-fd\" was not found in the management cluster. Please create it and retry.", //nolint:lll // The message is long.
+			expectedField:        field + ".failureDomain",
 		},
 		{
 			name: "error getting failure domain",
@@ -1183,7 +1185,8 @@ func TestStorageContainerCheck(t *testing.T) {
 			namespace:            "test-ns",
 			expectedAllowed:      false,
 			expectedError:        true,
-			expectedCauseMessage: "Failed to get cluster identifier from NutanixFailureDomain \"fd-with-error\": kube API error This is usually a temporary error. Please retry.", //nolint:lll // The message is long.
+			expectedCauseMessage: "Failed to get NutanixFailureDomain \"fd-with-error\": kube API error. This is usually a temporary error. Please retry.", //nolint:lll // The message is long.
+			expectedField:        field + ".failureDomain",
 		},
 	}
 
@@ -1208,12 +1211,16 @@ func TestStorageContainerCheck(t *testing.T) {
 			assert.Equal(t, tc.expectedAllowed, result.Allowed)
 			assert.Equal(t, tc.expectedError, result.InternalError)
 
-			if tc.expectedCauseMessage != "" {
+			if !tc.expectedAllowed {
 				require.NotEmpty(t, result.Causes)
-				assert.Contains(t, result.Causes[0].Message, tc.expectedCauseMessage)
-				assert.Equal(t, field, result.Causes[0].Field)
-			} else {
-				assert.Empty(t, result.Causes)
+
+				if tc.expectedCauseMessage != "" {
+					assert.Equal(t, tc.expectedCauseMessage, result.Causes[0].Message)
+				}
+
+				if tc.expectedField != "" {
+					assert.Equal(t, tc.expectedField, result.Causes[0].Field)
+				}
 			}
 		})
 	}