feat: cluster name for root-credentials

konstructio · Aug 4, 2024 · c399806 · c399806
1 parent e7ab4cc
commit c399806
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/cmd/civo/command.go b/cmd/civo/command.go
@@ -152,6 +152,7 @@ func RootCredentials() *cobra.Command {
 	}
 
 	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
+	authCmd.Flags().StringVar(&clusterNameFlag, "cluster-name", "", "cluster name (optional)")
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the argocd password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")

diff --git a/cmd/civo/create.go b/cmd/civo/create.go
@@ -107,23 +107,6 @@ func ValidateProvidedFlags(gitProvider string) error {
 		}
 	}
 
-	// switch gitProvider {
-	// case "github":
-	// 	key, err := internalssh.GetHostKey("github.com")
-	// 	if err != nil {
-	// 		return fmt.Errorf("known_hosts file does not exist - please run `ssh-keyscan github.com >> ~/.ssh/known_hosts` to remedy")
-	// 	} else {
-	// 		log.Info().Msgf("%s %s\n", "github.com", key.Type())
-	// 	}
-	// case "gitlab":
-	// 	key, err := internalssh.GetHostKey("gitlab.com")
-	// 	if err != nil {
-	// 		return fmt.Errorf("known_hosts file does not exist - please run `ssh-keyscan gitlab.com >> ~/.ssh/known_hosts` to remedy")
-	// 	} else {
-	// 		log.Info().Msgf("%s %s\n", "gitlab.com", key.Type())
-	// 	}
-	// }
-
 	progress.CompleteStep("Validate provided flags")
 
 	return nil

diff --git a/internal/common/common.go b/internal/common/common.go
@@ -100,7 +100,17 @@ func versionCheck() (res *CheckResponse, skip bool) {
 }
 
 func GetRootCredentials(cmd *cobra.Command, args []string) error {
-	clusterName := viper.GetString("flags.cluster-name")
+	clusterNameFromViper := viper.GetString("flags.cluster-name")
+
+	clusteNameFromFlag, err := cmd.Flags().GetString("cluster-name")
+	if err != nil {
+		return err
+	}
+
+	clusterName := clusterNameFromViper
+	if clusteNameFromFlag != "" {
+		clusterName = clusteNameFromFlag
+	}
 
 	cluster, err := cluster.GetCluster(clusterName)
 	if err != nil {