Display correct error message when passing Cluster based resource wit…

…hout ClusterClass as part of cluster create (#3053)

pkg/v1/tkg/constants/clusterclass_mapping.go

@@ -279,7 +279,8 @@ const (
 
 	SPEC = "spec"
 
-	TopologyClassIncorrectValueErrMsg = "input cluster class file, attribute spec.topology.class has no value or incorrect value or not following correct naming convension"
+	TopologyClassIncorrectValueErrMsg                = "input cluster class file, attribute spec.topology.class has no value or incorrect value or not following correct naming convention"
+	ClusterResourceWithoutTopologyNotSupportedErrMsg = "input file contains Cluster resource which doesn't have ClusterClass specified. Passing Cluster resource without ClusterClass specification is not supported"
 )
 
 // InfrastructureSpecificVariableMappingMap has, infra name to variable mapping map, which makes easy to get infra specific mapping map

pkg/v1/tkg/tkgctl/create_cluster_test.go

@@ -359,7 +359,7 @@ var _ = Describe("Unit tests for (AWS)  cluster_aws.yaml as input file for 'tanz
 			// most of cluster.yaml attributes are mapped to legacy variable for more look this - constants.clusterToLegacyVariablesMapAws
 			options.ClusterConfigFile = inputFileAwsEmptyClass
 			_, err := ctl.processWorkloadClusterInputFile(&options, isTKGSCluster)
-			Expect(fmt.Sprint(err)).To(Equal(constants.TopologyClassIncorrectValueErrMsg))
+			Expect(fmt.Sprint(err)).To(Equal(constants.ClusterResourceWithoutTopologyNotSupportedErrMsg))
 		})
 
 		It("When Input file is aws clusterclass.yaml file, but in-correct spec.topology.class name:", func() {

pkg/v1/tkg/tkgctl/helpers.go

@@ -179,6 +179,7 @@ func CheckIfInputFileIsClusterClassBased(clusterConfigFile string) (bool, unstru
 	if err != nil {
 		return isInputFileClusterClassBased, clusterObj, errors.Wrap(err, fmt.Sprintf("Unable to read input file: %v ", clusterConfigFile))
 	}
+
 	yamlObjects, err := utilyaml.ToUnstructured(content)
 	if err != nil {
 		return isInputFileClusterClassBased, clusterObj, errors.Wrap(err, fmt.Sprintf("Input file content is not yaml formatted, file path: %v", clusterConfigFile))
@@ -187,8 +188,13 @@ func CheckIfInputFileIsClusterClassBased(clusterConfigFile string) (bool, unstru
 	for i := range yamlObjects {
 		obj := yamlObjects[i]
 		if obj.GetKind() == constants.KindCluster {
-			isInputFileClusterClassBased = true
 			clusterObj = obj
+			class, exists, _ := unstructured.NestedString((&clusterObj).UnstructuredContent(), "spec", "topology", "class")
+			if exists && class != "" {
+				isInputFileClusterClassBased = true
+			} else {
+				return isInputFileClusterClassBased, clusterObj, errors.New(constants.ClusterResourceWithoutTopologyNotSupportedErrMsg)
+			}
 			break
 		}
 	}

pkg/v1/tkg/tkgctl/helpers_test.go

@@ -11,6 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkg/constants"
+	"github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkg/utils"
 )
 
 var _ = Describe("Cluster Class - IP Family Validation related test cases: ", func() {
@@ -211,3 +212,66 @@ var _ = Describe("Cluster Class - IP Family Validation related test cases: ", fu
 		})
 	})
 })
+
+var _ = Describe("Test cases for CheckIfInputFileIsClusterClassBased", func() {
+	Context("Test cases for CheckIfInputFileIsClusterClassBased", func() {
+		var (
+			configFile          string
+			configFileContent   string
+			isClusterClassBased bool
+			err                 error
+		)
+
+		JustBeforeEach(func() {
+			configFile, err = utils.CreateTempFile("", "")
+			Expect(err).To(BeNil())
+			err = utils.SaveFile(configFile, []byte(configFileContent))
+			Expect(err).To(BeNil())
+			isClusterClassBased, _, err = CheckIfInputFileIsClusterClassBased(configFile)
+		})
+		When("File contains cluster resource with clusterclass defined", func() {
+			BeforeEach(func() {
+				configFileContent = `apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: aws-workload-cluster1
+  namespace: default
+spec:
+  topology:
+    class: tkg-aws-default`
+			})
+			It("should return true and error should be nil", func() {
+				Expect(isClusterClassBased).To(BeTrue())
+				Expect(err).NotTo(HaveOccurred())
+			})
+		})
+		When("File contains cluster resource without clusterclass defined", func() {
+			BeforeEach(func() {
+				configFileContent = `apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: aws-workload-cluster1
+  namespace: default
+spec:
+  clusterNetwork:
+    pods:
+      cidrBlocks: []
+`
+			})
+			It("should return false with error", func() {
+				Expect(isClusterClassBased).To(BeFalse())
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(constants.ClusterResourceWithoutTopologyNotSupportedErrMsg))
+			})
+		})
+		When("File doesn't contain cluster resource", func() {
+			BeforeEach(func() {
+				configFileContent = ``
+			})
+			It("should return false without error", func() {
+				Expect(isClusterClassBased).To(Equal(false))
+				Expect(err).NotTo(HaveOccurred())
+			})
+		})
+	})
+})