CR-12478 adjust uninstall to managed (#443)

* adjust to managed

* moved isc removal to earlier stage

* wip

* removed some unnessecery lines

* added type (hybrid/hosted) to runtime list

* small change

* make --repo and --git token required for hybrid runtimes only

* wip

* some logs

* block ugrade for hosted runtimes

* block upgarde for hosted

* CommandFlow type

* upgrade fix

* bump go-sdk

* log fix

* bump version

* remove unused getIscRepo

* bump go-sdk

* bump version

* Update cmd/commands/common.go

Co-authored-by: roi-codefresh <roi.kramer@codefresh.io>

* Update cmd/commands/common.go

Co-authored-by: roi-codefresh <roi.kramer@codefresh.io>

* fix runtime list

* bump app-proxy

* small fix

* allowManaged

Co-authored-by: roi-codefresh <roi.kramer@codefresh.io>

Author: rotem-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.400
+VERSION=v0.0.401
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/cluster.go

@@ -92,7 +92,7 @@ func newClusterAddCommand() *cobra.Command {
 
 			ctx := cmd.Context()
 
-			opts.runtimeName, err = ensureRuntimeName(ctx, args)
+			opts.runtimeName, err = ensureRuntimeName(ctx, args, true)
 			if err != nil {
 				return err
 			}
@@ -238,7 +238,7 @@ func newClusterRemoveCommand() *cobra.Command {
 
 			ctx := cmd.Context()
 
-			opts.runtimeName, err = ensureRuntimeName(ctx, args)
+			opts.runtimeName, err = ensureRuntimeName(ctx, args, true)
 			if err != nil {
 				return err
 			}
@@ -380,7 +380,7 @@ func newClusterCreateArgoRolloutsCommand() *cobra.Command {
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			var err error
 
-			opts.runtimeName, err = ensureRuntimeName(cmd.Context(), args)
+			opts.runtimeName, err = ensureRuntimeName(cmd.Context(), args, true)
 			return err
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {

cmd/commands/common.go

@@ -141,7 +141,7 @@ func ensureRepo(cmd *cobra.Command, runtimeName string, cloneOpts *git.CloneOpti
 	}
 
 	if cloneOpts.Repo == "" {
-		return fmt.Errorf("must enter a valid installation repository URL")
+		return fmt.Errorf("must enter a valid installation repository URL, using --repo")
 	}
 
 	return nil
@@ -166,7 +166,7 @@ func getRepoFromUserInput(cmd *cobra.Command) error {
 	return cmd.Flags().Set("repo", repoInput)
 }
 
-func ensureRuntimeName(ctx context.Context, args []string) (string, error) {
+func ensureRuntimeName(ctx context.Context, args []string, allowManaged bool) (string, error) {
 	var (
 		runtimeName string
 		err         error
@@ -177,7 +177,7 @@ func ensureRuntimeName(ctx context.Context, args []string) (string, error) {
 	}
 
 	if !store.Get().Silent {
-		runtimeName, err = getRuntimeNameFromUserSelect(ctx)
+		runtimeName, err = getRuntimeNameFromUserSelect(ctx, allowManaged)
 		if err != nil {
 			return "", err
 		}
@@ -190,7 +190,7 @@ func ensureRuntimeName(ctx context.Context, args []string) (string, error) {
 	return runtimeName, nil
 }
 
-func getRuntimeNameFromUserSelect(ctx context.Context) (string, error) {
+func getRuntimeNameFromUserSelect(ctx context.Context, allowManaged bool) (string, error) {
 	runtimes, err := cfConfig.NewClient().V2().Runtime().List(ctx)
 	if err != nil {
 		return "", err
@@ -200,10 +200,18 @@ func getRuntimeNameFromUserSelect(ctx context.Context) (string, error) {
 		return "", fmt.Errorf("no runtimes were found")
 	}
 
-	runtimeNames := make([]string, len(runtimes))
+	var runtimeNames []string
 
-	for index, rt := range runtimes {
-		runtimeNames[index] = rt.Metadata.Name
+	for _, rt := range runtimes {
+		rtDisplay := rt.Metadata.Name
+		if rt.Managed {
+			if !allowManaged {
+				// preventing hosted runtimes to prompt
+				continue
+			}
+			rtDisplay = fmt.Sprintf("%s (hosted)", rtDisplay)
+		} 
+		runtimeNames = append(runtimeNames, rtDisplay)
 	}
 
 	templates := &promptui.SelectTemplates{
@@ -219,7 +227,8 @@ func getRuntimeNameFromUserSelect(ctx context.Context) (string, error) {
 	}
 
 	_, result, err := prompt.Run()
-	return result, err
+	resultSplit := strings.Split(result, " ")
+	return resultSplit[0], err
 }
 
 func getRuntimeNameFromUserInput() (string, error) {
@@ -301,6 +310,11 @@ func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions, verify bool
 			return fmt.Errorf(errMessage)
 		}
 	}
+
+	if cloneOpts.Auth.Password == "" {
+		return fmt.Errorf("must provide a git token using --git-token")
+	}
+
 	return nil
 }
 
@@ -635,11 +649,11 @@ func setIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (string,
 	return setIscRepoResponse, nil
 }
 
-func getIscRepo(ctx context.Context) (string, error) {
-	user, err := cfConfig.NewClient().V2().UsersV2().GetCurrent(ctx)
+func isRuntimeManaged(ctx context.Context, runtimeName string) (bool, error) {
+	rt, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
 	if err != nil {
-		return "", fmt.Errorf("failed to get shared config repo. Error: %w", err)
+		return false, fmt.Errorf("failed to get runtime from platform. error: %w", err)
 	}
 
-	return *user.ActiveAccount.SharedConfigRepo, nil
+	return rt.Managed, nil
 }

cmd/commands/integrations.go

@@ -305,7 +305,7 @@ func RunGitIntegrationRemoveCommand(ctx context.Context, client sdk.AppProxyAPI,
 		return fmt.Errorf("failed to remove git integration: %w", err)
 	}
 
-	log.G(ctx).Infof("removed git integration: %s", name)
+	log.G(ctx).Infof("Removed git integration: %s", name)
 
 	return nil
 }