Fix unit test

Signed-off-by: Parthvi <parthvi.vala@suse.com>
rancher · Jun 11, 2024 · b288774 · b288774
1 parent c2c3f14
commit b288774
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/controller/eks-cluster-config-handler.go b/controller/eks-cluster-config-handler.go
@@ -336,7 +336,7 @@ func validateUpdate(config *eksv1.EKSClusterConfig) error {
 		if _, ok := nodeGroupNames[aws.ToString(ng.NodegroupName)]; !ok {
 			nodeGroupNames[aws.ToString(ng.NodegroupName)] = struct{}{}
 		} else {
-			errs = append(errs, fmt.Sprintf("node group name %s must be unique within the [%s (%s)] cluster to avoid duplication", aws.ToString(ng.NodegroupName), config.Spec.DisplayName, config.Name))
+			errs = append(errs, fmt.Sprintf("node group name %q must be unique within the [%s (id: %s)] cluster to avoid duplication", aws.ToString(ng.NodegroupName), config.Spec.DisplayName, config.Name))
 		}
 
 		if ng.Version == nil {

diff --git a/controller/eks-cluster-config-handler_test.go b/controller/eks-cluster-config-handler_test.go
@@ -16,9 +16,10 @@ import (
 	eksv1 "github.com/rancher/eks-operator/pkg/apis/eks.cattle.io/v1"
 	"github.com/rancher/eks-operator/pkg/eks"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/rancher/eks-operator/pkg/eks/services/mock_services"
 	"github.com/rancher/eks-operator/pkg/test"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var _ = Describe("importCluster", func() {
@@ -205,6 +206,6 @@ var _ = Describe("updateCluster", func() {
 		eksConfig.Status.Phase = "active"
 		eksConfig.Spec.NodeGroups = append(eksConfig.Spec.NodeGroups, eksConfig.Spec.NodeGroups...)
 		_, err := handler.OnEksConfigChanged("", eksConfig)
-		Expect(err).To(MatchError("node group names must be unique within the [test] cluster to avoid duplication"))
+		Expect(err).To(MatchError("node group name \"ng1\" must be unique within the [test (id: test)] cluster to avoid duplication"))
 	})
 })