fix cannot uninstall managed runtime without isc (#457)

* fix cannot uninstall managed runtime without isc

* fix kube context validation on force

* bump

* fix-message

* fix api-url formatting

* wip

* increase cyclo

Author: roi-codefresh

.golangci.yaml

@@ -34,4 +34,4 @@ linters-settings:
 
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 18
+    min-complexity: 20

Makefile

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

cmd/commands/cluster.go

@@ -101,7 +101,7 @@ func newClusterAddCommand() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			
+
 			setClusterName(&opts)
 			err = validateClusterName(opts.clusterName)
 
@@ -296,7 +296,7 @@ func newClusterListCommand() *cobra.Command {
 func runClusterList(ctx context.Context, runtimeName string) error {
 	clusters, err := cfConfig.NewClient().V2().Cluster().List(ctx, runtimeName)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to list clusters: %w", err)
 	}
 
 	if len(clusters) == 0 {

cmd/commands/common.go

@@ -210,7 +210,7 @@ func getRuntimeNameFromUserSelect(ctx context.Context, allowManaged bool) (strin
 				continue
 			}
 			rtDisplay = fmt.Sprintf("%s (hosted)", rtDisplay)
-		} 
+		}
 		runtimeNames = append(runtimeNames, rtDisplay)
 	}
 
@@ -677,7 +677,7 @@ func ensureRuntimeOnKubeContext(ctx context.Context, kubeconfig string, runtimeN
 	}
 
 	if *runtimeClusterServer != kubeContextServer {
-		return fmt.Errorf("runtime '%s' does not exist on context '%s'. make sure you are providing the right kube context", runtimeName, kubeContextName)
+		return fmt.Errorf("runtime '%s' does not exist on context '%s'. Make sure you are providing the right kube context or use --force to bypass this check", runtimeName, kubeContextName)
 	}
 
 	return nil

cmd/commands/integrations.go

@@ -193,6 +193,7 @@ func NewGitIntegrationAddCommand(client *sdk.AppProxyAPI) *cobra.Command {
 	var (
 		opts              model.AddGitIntegrationArgs
 		provider          string
+		apiURL            string
 		accountAdminsOnly bool
 	)
 
@@ -207,6 +208,8 @@ func NewGitIntegrationAddCommand(client *sdk.AppProxyAPI) *cobra.Command {
 				opts.Name = &args[0]
 			}
 
+			opts.APIURL = &apiURL
+
 			if opts.Provider, err = parseGitProvider(provider); err != nil {
 				return err
 			}
@@ -221,7 +224,7 @@ func NewGitIntegrationAddCommand(client *sdk.AppProxyAPI) *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&provider, "provider", "github", "One of github|gitlab")
-	cmd.Flags().StringVar(&opts.APIURL, "api-url", "", "Git provider API Url")
+	cmd.Flags().StringVar(&apiURL, "api-url", "", "Git provider API Url")
 	cmd.Flags().BoolVar(&accountAdminsOnly, "account-admins-only", false,
 		"If true, this integration would only be visible to account admins (default: false)")
 
@@ -244,6 +247,7 @@ func RunGitIntegrationAddCommand(ctx context.Context, client sdk.AppProxyAPI, op
 func NewGitIntegrationEditCommand(client *sdk.AppProxyAPI) *cobra.Command {
 	var (
 		opts              model.EditGitIntegrationArgs
+		apiURL            string
 		accountAdminsOnly bool
 	)
 
@@ -256,6 +260,8 @@ func NewGitIntegrationEditCommand(client *sdk.AppProxyAPI) *cobra.Command {
 				opts.Name = &args[0]
 			}
 
+			opts.APIURL = &apiURL
+
 			opts.SharingPolicy = model.SharingPolicyAllUsersInAccount
 			if accountAdminsOnly {
 				opts.SharingPolicy = model.SharingPolicyAccountAdmins
@@ -265,7 +271,7 @@ func NewGitIntegrationEditCommand(client *sdk.AppProxyAPI) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&opts.APIURL, "api-url", "", "Git provider API Url")
+	cmd.Flags().StringVar(&apiURL, "api-url", "", "Git provider API Url")
 	cmd.Flags().BoolVar(&accountAdminsOnly, "account-admins-only", false,
 		"If true, this integration would only be visible to account admins (default: false)")
 

cmd/commands/runtime.go

@@ -122,7 +122,9 @@ type (
 		FastExit         bool
 		DisableTelemetry bool
 		Managed          bool
-		kubeContext      string
+
+		kubeContext            string
+		skipAutopilotUninstall bool
 	}
 
 	RuntimeUpgradeOptions struct {
@@ -188,8 +190,10 @@ func NewRuntimeCommand() *cobra.Command {
 
 func NewRuntimeInstallCommand() *cobra.Command {
 	var (
+		gitIntegrationApiURL       = ""
 		gitIntegrationCreationOpts = apmodel.AddGitIntegrationArgs{
 			SharingPolicy: apmodel.SharingPolicyAllUsersInAccount,
+			APIURL:        &gitIntegrationApiURL,
 		}
 		installationOpts = RuntimeInstallOptions{
 			GitIntegrationCreationOpts:     &gitIntegrationCreationOpts,
@@ -269,7 +273,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	cmd.Flags().BoolVar(&installationOpts.SkipClusterChecks, "skip-cluster-checks", false, "Skips the cluster's checks")
 	cmd.Flags().BoolVar(&installationOpts.DisableRollback, "disable-rollback", false, "If true, will not perform installation rollback after a failed installation")
 	cmd.Flags().DurationVar(&store.Get().WaitTimeout, "wait-timeout", store.Get().WaitTimeout, "How long to wait for the runtime components to be ready")
-	cmd.Flags().StringVar(&gitIntegrationCreationOpts.APIURL, "provider-api-url", "", "Git provider API url")
+	cmd.Flags().StringVar(&gitIntegrationApiURL, "provider-api-url", "", "Git provider API url")
 	cmd.Flags().BoolVar(&store.Get().SkipIngress, "skip-ingress", false, "Skips the creation of ingress resources")
 	cmd.Flags().BoolVar(&store.Get().BypassIngressClassCheck, "bypass-ingress-class-check", false, "Disables the ingress class check during pre-installation")
 	cmd.Flags().BoolVar(&installationOpts.DisableTelemetry, "disable-telemetry", false, "If true, will disable the analytics reporting for the installation process")
@@ -458,6 +462,12 @@ func runtimeUninstallCommandPreRunHandler(cmd *cobra.Command, args []string, opt
 	if !opts.Managed {
 		kubeconfig := cmd.Flag("kubeconfig").Value.String()
 		err = ensureRuntimeOnKubeContext(cmd.Context(), kubeconfig, opts.RuntimeName, opts.kubeContext)
+
+		if err != nil && opts.Force {
+			log.G(cmd.Context()).Warn("Failed to verify runtime is installed on the selected kubernetes context, installation repository will not be cleaned")
+			err = nil
+			opts.skipAutopilotUninstall = true // will not touch the cluster and repo
+		}
 	}
 	handleCliStep(reporter.UninstallStepPreCheckEnsureRuntimeOnKubeContext, "Ensuring runtime is on the kube context", err, true, false)
 	if err != nil {
@@ -845,19 +855,24 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		handleCliStep(reporter.InstallStepCreateDefaultGitIntegration, "-skipped-", err, false, true)
 		handleCliStep(reporter.InstallStepRegisterToDefaultGitIntegration, "-skipped-", err, false, true)
 
+		var apiURL string
+		if opts.GitIntegrationCreationOpts.APIURL != nil {
+			apiURL = fmt.Sprintf("--api-url %s", *opts.GitIntegrationCreationOpts.APIURL)
+		}
+
 		skipIngressInfoMsg := util.Doc(fmt.Sprintf(`
 To complete the installation: 
 1. Configure your cluster's routing service with path to '/%s' and \"%s\"
 2. Create and register Git integration using the commands:
 
-<BIN> integration git add default --runtime %s --api-url %s
+<BIN> integration git add default --runtime %s %s
 
 <BIN> integration git register default --runtime %s --token <AUTHENTICATION_TOKEN>
 `,
 			store.Get().AppProxyIngressPath,
 			util.GenerateIngressEventSourcePath(opts.RuntimeName),
 			opts.RuntimeName,
-			opts.GitIntegrationCreationOpts.APIURL,
+			apiURL,
 			opts.RuntimeName))
 		summaryArr = append(summaryArr, summaryLog{skipIngressInfoMsg, Info})
 	} else {
@@ -1064,11 +1079,16 @@ func removeGitIntegrations(ctx context.Context, opts *RuntimeUninstallOptions) e
 
 func addDefaultGitIntegration(ctx context.Context, appProxyClient codefresh.AppProxyAPI, runtime string, opts *apmodel.AddGitIntegrationArgs) error {
 	if err := RunGitIntegrationAddCommand(ctx, appProxyClient, opts); err != nil {
+		var apiURL string
+		if opts.APIURL != nil {
+			apiURL = fmt.Sprintf("--api-url %s", *opts.APIURL)
+		}
+
 		commandAdd := util.Doc(fmt.Sprintf(
-			"\t<BIN> integration git add default --runtime %s --provider %s --api-url %s",
+			"\t<BIN> integration git add default --runtime %s --provider %s %s",
 			runtime,
 			strings.ToLower(opts.Provider.String()),
-			opts.APIURL,
+			apiURL,
 		))
 
 		commandRegister := util.Doc(fmt.Sprintf(
@@ -1637,51 +1657,47 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		return fmt.Errorf("failed to remove runtime isc: %w", err)
 	}
 
-	subCtx, cancel := context.WithCancel(ctx)
-	go func() {
-		if err := printApplicationsState(subCtx, opts.RuntimeName, opts.KubeFactory, opts.Managed); err != nil {
-			log.G(ctx).WithError(err).Debug("failed to print uninstallation progress")
+	if !opts.skipAutopilotUninstall {
+		subCtx, cancel := context.WithCancel(ctx)
+		go func() {
+			if err := printApplicationsState(subCtx, opts.RuntimeName, opts.KubeFactory, opts.Managed); err != nil {
+				log.G(ctx).WithError(err).Debug("failed to print uninstallation progress")
+			}
+		}()
+
+		if !opts.Managed {
+			err = apcmd.RunRepoUninstall(ctx, &apcmd.RepoUninstallOptions{
+				Namespace:       opts.RuntimeName,
+				KubeContextName: opts.kubeContext,
+				Timeout:         opts.Timeout,
+				CloneOptions:    opts.CloneOpts,
+				KubeFactory:     opts.KubeFactory,
+				Force:           opts.Force,
+				FastExit:        opts.FastExit,
+			})
+		}
+		cancel() // to tell the progress to stop displaying even if it's not finished
+		if opts.Force {
+			err = nil
 		}
-	}()
-
-	if !opts.Managed {
-		err = apcmd.RunRepoUninstall(ctx, &apcmd.RepoUninstallOptions{
-			Namespace:       opts.RuntimeName,
-			KubeContextName: opts.kubeContext,
-			Timeout:         opts.Timeout,
-			CloneOptions:    opts.CloneOpts,
-			KubeFactory:     opts.KubeFactory,
-			Force:           opts.Force,
-			FastExit:        opts.FastExit,
-		})
-	}
-	cancel() // to tell the progress to stop displaying even if it's not finished
-	if opts.Force {
-		err = nil
 	}
-	handleCliStep(reporter.UninstallStepUninstallRepo, "Uninstalling repo", err, false, !opts.Managed)
+	handleCliStep(reporter.UninstallStepUninstallRepo, "Uninstalling repo", err, false, !opts.Managed && !opts.skipAutopilotUninstall)
 	if err != nil {
 		summaryArr = append(summaryArr, summaryLog{"you can attempt to uninstall again with the \"--force\" flag", Info})
 		return err
 	}
 
-	if !opts.Managed {
+	log.G(ctx).Infof("Deleting runtime '%s' from platform", opts.RuntimeName)
+	if opts.Managed {
+		_, err = cfConfig.NewClient().V2().Runtime().DeleteManaged(ctx, opts.RuntimeName)
+	} else {
 		err = deleteRuntimeFromPlatform(ctx, opts)
 	}
 	handleCliStep(reporter.UninstallStepDeleteRuntimeFromPlatform, "Deleting runtime from platform", err, false, !opts.Managed)
 	if err != nil {
 		return fmt.Errorf("failed to delete runtime from the platform: %w", err)
 	}
 
-	if opts.Managed {
-		log.G(ctx).Infof("Deleting runtime '%s' from platform", opts.RuntimeName)
-		_, err = cfConfig.NewClient().V2().Runtime().DeleteManaged(ctx, opts.RuntimeName)
-	}
-	handleCliStep(reporter.UninstallStepDeleteManagedRuntimeFromPlatform, "Deleting hosted runtime from platform", err, false, opts.Managed)
-	if err != nil {
-		return fmt.Errorf("failed to delete hosted runtime from the platform: %w", err)
-	}
-
 	if cfConfig.GetCurrentContext().DefaultRuntime == opts.RuntimeName {
 		cfConfig.GetCurrentContext().DefaultRuntime = ""
 	}
@@ -1806,14 +1822,24 @@ func getApplicationChecklistState(name string, a *argocdv1alpha1.Application, ru
 }
 
 func removeRuntimeIsc(ctx context.Context, runtimeName string) error {
+	me, err := cfConfig.NewClient().V2().UsersV2().GetCurrent(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get current user information: %w", err)
+	}
+
+	if me.ActiveAccount.SharedConfigRepo == nil || *me.ActiveAccount.SharedConfigRepo == "" {
+		log.G(ctx).Info("Skipped removing runtime from ISC repo. ISC repo not defined")
+		return nil
+	}
+
 	appProxyClient, err := cfConfig.NewClient().AppProxy(ctx, runtimeName, store.Get().InsecureIngressHost)
 	if err != nil {
 		return fmt.Errorf("failed to build app-proxy client while removing runtime isc: %w", err)
 	}
 
 	_, err = appProxyClient.AppProxyIsc().RemoveRuntimeFromIscRepo(ctx)
 	if err == nil {
-		log.G(ctx).Info("Removed runtime from isc repo")
+		log.G(ctx).Info("Removed runtime from ISC repo")
 	}
 
 	return err
@@ -2611,7 +2637,7 @@ func ensureGitIntegrationOpts(opts *RuntimeInstallOptions) error {
 		opts.GitIntegrationCreationOpts.Provider = apmodel.GitProviders(strings.ToUpper(opts.InsCloneOpts.Provider))
 	}
 
-	if opts.GitIntegrationCreationOpts.APIURL == "" {
+	if opts.GitIntegrationCreationOpts.APIURL == nil || *opts.GitIntegrationCreationOpts.APIURL == "" {
 		if opts.GitIntegrationCreationOpts.APIURL, err = inferAPIURLForGitProvider(opts.GitIntegrationCreationOpts.Provider); err != nil {
 			return err
 		}
@@ -2637,17 +2663,20 @@ func inferProviderFromCloneURL(cloneURL string) (apmodel.GitProviders, error) {
 	return apmodel.GitProviders(""), fmt.Errorf("failed to infer git provider from clone url: %s, %s", cloneURL, suggest)
 }
 
-func inferAPIURLForGitProvider(provider apmodel.GitProviders) (string, error) {
+func inferAPIURLForGitProvider(provider apmodel.GitProviders) (*string, error) {
 	const suggest = "you can specify a git provider explicitly with --provider-api-url"
+	var res string
 
 	switch provider {
 	case apmodel.GitProvidersGithub:
-		return "https://api.github.com", nil
+		res = "https://api.github.com"
+		return &res, nil
 	case apmodel.GitProvidersGitlab:
-		return "https://gitlab.com/api/v4", nil
+		res = "https://gitlab.com/api/v4"
+		return &res, nil
 	}
 
-	return "", fmt.Errorf("cannot infer api-url for git provider %s, %s", provider, suggest)
+	return nil, fmt.Errorf("cannot infer api-url for git provider %s, %s", provider, suggest)
 }
 
 // display the user the old vs. the new configurations that will be changed upon recovery

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.404/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.405/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.404/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.405/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
 	github.com/argoproj/argo-workflows/v3 v3.3.1
 	github.com/briandowns/spinner v1.18.1
-	github.com/codefresh-io/go-sdk v0.44.1
+	github.com/codefresh-io/go-sdk v0.44.2
 	github.com/fatih/color v1.13.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1

go.sum

@@ -254,8 +254,8 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codefresh-io/go-sdk v0.44.1 h1:wpiGh2MBF45I1OV/oE4fGm0/K6S6vP7ttkGJ0sf/CXg=
-github.com/codefresh-io/go-sdk v0.44.1/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.44.2 h1:1hc9putocn8FTTlDxgeFaFid9aPHxLDpSfop7Egwods=
+github.com/codefresh-io/go-sdk v0.44.2/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE=
 github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.404
+  version: 0.0.405
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events