Improve error message when old cluster config file exists

cmd/eksctl-anywhere/cmd/createcluster.go

@@ -136,12 +136,8 @@
 
 	validations.CheckDockerAllocatedMemory(ctx, docker)
 
-	kubeconfigPath := kubeconfig.FromClusterName(clusterConfig.Name)
-	if validations.FileExistsAndIsNotEmpty(kubeconfigPath) {
-		return fmt.Errorf(
-			"old cluster config file exists under %s, please use a different clusterName to proceed",
-			clusterConfig.Name,
-		)
+	if err := kubeconfig.ValidateKubeconfigPath(clusterConfig.Name); err != nil {
+		return err
 	}
 
 	clusterSpec, err := newClusterSpec(cc.clusterOptions)

docs/content/en/docs/troubleshooting/troubleshooting.md

@@ -142,13 +142,13 @@ Error: loading config file "cluster.yaml": error unmarshaling JSON: while decodi
 ```
 Use `eksctl anywhere create cluster -f cluster.yaml` instead of `eksctl create cluster -f cluster.yaml` to create an EKS Anywhere cluster.
 
-### Error: old cluster config file exists under my-cluster, please use a different clusterName to proceed
+### Error: old cluster config file already exists under the "my-cluster" folder, please use a different cluster name or remove the existing "my-cluster" folder to proceed
 
 ```
-Error: old cluster config file exists under my-cluster, please use a different clusterName to proceed
+Error: old cluster config file already exists under the "my-cluster" folder, please use a different cluster name or remove the existing "my-cluster" folder to proceed
 ```
 The `my-cluster` directory already exists in the current directory.
-Either use a different cluster name or move the directory.
+Either use a different cluster name or remove the existing directory.
 
 ### At least one WorkerNodeGroupConfiguration must not have NoExecute and/or NoSchedule taints
 

pkg/kubeconfig/kubeconfig.go

@@ -119,6 +119,7 @@
 	return nil
 }
 
+// ValidateKubeconfigPath validates that the cluster config file of the clusterName under the parentFolders does not exist.
 func ValidateKubeconfigPath(clusterName string, parentFolders ...string) error {
 	kubeconfigPath := FromClusterName(clusterName)
 	for _, folder := range parentFolders {
@@ -127,8 +128,8 @@
 	info, err := os.Stat(kubeconfigPath)
 	if err == nil && info.Size() > 0 {
 		return fmt.Errorf(
-			"old cluster config file exists under %s, please use a different clusterName to proceed",
-			clusterName,
+			"old cluster config file already exists under the %q folder, please use a different cluster name or remove the existing %q folder to proceed",
+			clusterName, clusterName,
 		)
 	}
 	return nil

pkg/kubeconfig/kubeconfig_test.go

@@ -185,3 +185,9 @@ func TestResolveAndValidateFilename(t *testing.T) {
 		assert.Error(t, err)
 	})
 }
+
+func TestValidateKubeconfigPath(t *testing.T) {
+	t.Run("returns nil when valid", func(t *testing.T) {
+		assert.NoError(t, kubeconfig.ValidateKubeconfigPath("test-cluster"))
+	})
+}