Uninstall progress (#283)

* wip

* wip

* wip

* wip

* CR-9588

* wip

* wip

* bump

* codegen

* codegen

* wip

* CR-9650 uninstall ignore not found

* wip

* wip

* change token verification message to start with capital letter

* bump

Author: roi-codefresh

Makefile

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

cmd/commands/runtime.go

@@ -53,6 +53,7 @@ import (
 	apstore "github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	argocdv1alpha1cs "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	aev1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventsource/v1alpha1"
 
 	"github.com/Masterminds/semver/v3"
@@ -743,7 +744,7 @@ func createGitSources(ctx context.Context, opts *RuntimeInstallOptions) error {
 	mpCloneOpts.Parse()
 
 	createGitSrcMessgae := fmt.Sprintf("Creating %s", store.Get().MarketplaceGitSourceName)
-	
+
 	err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
 		InsCloneOpts:        opts.InsCloneOpts,
 		GsCloneOpts:         mpCloneOpts,
@@ -796,7 +797,7 @@ func removeGitIntegrations(ctx context.Context, opts *RuntimeUninstallOptions) e
 	for _, intg := range integrations {
 		if err = RunGitIntegrationRemoveCommand(ctx, appProxyClient, intg.Name); err != nil {
 			command := util.Doc(fmt.Sprintf("\t<BIN> integration git remove %s", intg.Name))
-	
+
 			return fmt.Errorf(`%w. You can try to remove it manually by running: %s`, err, command)
 		}
 	}
@@ -1264,9 +1265,13 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 			createAnalyticsReporter(ctx, reporter.UninstallFlow)
 
 			err := runtimeUninstallCommandPreRunHandler(cmd, args, &uninstallationOpts)
-			handleCliStep(reporter.UninstallPhasePreCheckFinish, "Finished pre installation checks", err, false)
+			handleCliStep(reporter.UninstallPhasePreCheckFinish, "Finished pre run checks", err, false)
 			if err != nil {
-				return fmt.Errorf("pre installation error: %w", err)
+				if errors.Is(err, promptui.ErrInterrupt) {
+					return fmt.Errorf("uninstallation canceled by user")
+				}
+
+				return fmt.Errorf("pre run error: %w", err)
 			}
 
 			finalParameters = map[string]string{
@@ -1339,6 +1344,13 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		return err
 	}
 
+	subCtx, cancel := context.WithCancel(ctx)
+	go func() {
+		if err := printApplicationsState(subCtx, opts.RuntimeName, opts.KubeFactory); err != nil {
+			log.G(ctx).WithError(err).Debug("failed to print uninstallation progress")
+		}
+	}()
+
 	err = apcmd.RunRepoUninstall(ctx, &apcmd.RepoUninstallOptions{
 		Namespace:    opts.RuntimeName,
 		Timeout:      opts.Timeout,
@@ -1347,6 +1359,7 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		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
 	}
@@ -1372,6 +1385,115 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 	return nil
 }
 
+func printApplicationsState(ctx context.Context, runtime string, f kube.Factory) error {
+	apps := map[string]*argocdv1alpha1.Application{}
+	lock := sync.Mutex{}
+
+	rc, err := f.ToRESTConfig()
+	if err != nil {
+		return err
+	}
+
+	cs, err := argocdv1alpha1cs.NewForConfig(rc)
+	if err != nil {
+		return err
+	}
+
+	appIf := cs.ArgoprojV1alpha1().Applications(runtime)
+	componentsLabelSelector := fmt.Sprintf("%s=%s", store.Get().LabelKeyCFType, store.Get().CFComponentType)
+
+	curApps, err := appIf.List(ctx, metav1.ListOptions{LabelSelector: componentsLabelSelector})
+	if err != nil {
+		return err
+	}
+
+	if len(curApps.Items) == 0 {
+		// all apps already deleted nothing to wait for
+		return nil
+	}
+
+	for i, a := range curApps.Items {
+		apps[a.Name] = &curApps.Items[i]
+	}
+
+	// refresh components state
+	go func() {
+		t := time.NewTicker(time.Second)
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-t.C:
+			}
+
+			curApps, err := appIf.List(ctx, metav1.ListOptions{LabelSelector: componentsLabelSelector})
+			if err != nil {
+				log.G(ctx).WithError(err).Debug("failed to refresh components state")
+				continue
+			}
+
+			newApps := make(map[string]*argocdv1alpha1.Application, len(curApps.Items))
+			for i, a := range curApps.Items {
+				newApps[a.Name] = &curApps.Items[i]
+			}
+
+			lock.Lock()
+			// update existing
+			for i, a := range curApps.Items {
+				apps[a.Name] = &curApps.Items[i]
+			}
+
+			// clear deleted apps
+			for name := range apps {
+				if _, ok := newApps[name]; !ok {
+					delete(apps, name)
+				}
+			}
+			lock.Unlock()
+		}
+	}()
+
+	checkers := make([]checklist.Checker, len(curApps.Items))
+	for i, a := range curApps.Items {
+		name := a.Name
+		checkers[i] = func(ctx context.Context) (checklist.ListItemState, checklist.ListItemInfo) {
+			lock.Lock()
+			defer lock.Unlock()
+			return getApplicationChecklistState(name, apps[name], runtime)
+		}
+	}
+
+	cl := checklist.NewCheckList(
+		os.Stdout,
+		checklist.ListItemInfo{"COMPONENT", "STATUS"},
+		checkers,
+		&checklist.CheckListOptions{
+			WaitAllReady: true,
+		},
+	)
+
+	if err := cl.Start(ctx); err != nil && ctx.Err() == nil {
+		return err
+	}
+
+	return nil
+}
+
+func getApplicationChecklistState(name string, a *argocdv1alpha1.Application, runtime string) (checklist.ListItemState, checklist.ListItemInfo) {
+	state := checklist.Waiting
+	name = strings.TrimPrefix(name, fmt.Sprintf("%s-", runtime))
+	status := "N/A"
+
+	if a == nil {
+		status = "Deleted"
+		state = checklist.Ready
+	} else if string(a.Status.Health.Status) != "" {
+		status = string(a.Status.Health.Status)
+	}
+
+	return state, []string{name, status}
+}
+
 func deleteRuntimeFromPlatform(ctx context.Context, opts *RuntimeUninstallOptions) error {
 	log.G(ctx).Infof("Deleting runtime \"%s\" from the platform", opts.RuntimeName)
 	_, err := cfConfig.NewClient().V2().Runtime().Delete(ctx, opts.RuntimeName)
@@ -1414,9 +1536,12 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 			createAnalyticsReporter(ctx, reporter.UpgradeFlow)
 
 			err := runtimeUpgradeCommandPreRunHandler(cmd, args, &opts)
-			handleCliStep(reporter.UpgradePhasePreCheckFinish, "Finished pre installation checks", err, false)
+			handleCliStep(reporter.UpgradePhasePreCheckFinish, "Finished pre run checks", err, false)
 			if err != nil {
-				return fmt.Errorf("Pre installation error: %w", err)
+				if errors.Is(err, promptui.ErrInterrupt) {
+					return fmt.Errorf("upgrade canceled by user")
+				}
+				return fmt.Errorf("Pre run error: %w", err)
 			}
 
 			finalParameters = map[string]string{

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.260/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.261/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.260/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.261/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/argo-cd/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
 images:
   - name: quay.io/codefresh/argocd
     newName: quay.io/codefresh/argocd
-    newTag: v2.1.10-cap-CR-9018
+    newTag: v2.1.10-cap-CR-9134
 
 # will be effective on argo-cd 2.1
 configMapGenerator:

manifests/runtime.yaml

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

pkg/git/git.go

@@ -26,24 +26,22 @@ import (
 type TokenTypes string
 
 const (
-	RuntimeToken TokenTypes = "runtime token"
+	RuntimeToken  TokenTypes = "runtime token"
 	PersonalToken TokenTypes = "personal token"
 )
 
 var (
-	requiredGitHubRuntimeScopes = []string{ "repo", "admin:repo_hook" }
-	requiredGitHubGitSourceScopes = []string{ "repo" }
-	
-	typeToGitHubScopes = map[TokenTypes][]string {
-		RuntimeToken: requiredGitHubRuntimeScopes,
+	requiredGitHubRuntimeScopes   = []string{"repo", "admin:repo_hook"}
+	requiredGitHubGitSourceScopes = []string{"repo"}
+
+	typeToGitHubScopes = map[TokenTypes][]string{
+		RuntimeToken:  requiredGitHubRuntimeScopes,
 		PersonalToken: requiredGitHubGitSourceScopes,
 	}
 )
 
-
-
 func VerifyToken(ctx context.Context, provider string, token string, tokenType TokenTypes) error {
-	providerToVerifier := map[string]func(context.Context, string, TokenTypes)error {
+	providerToVerifier := map[string]func(context.Context, string, TokenTypes) error{
 		"github": verifyGitHubTokenScope,
 	}
 
@@ -57,7 +55,7 @@ func VerifyToken(ctx context.Context, provider string, token string, tokenType T
 
 func verifyGitHubTokenScope(ctx context.Context, token string, tokenType TokenTypes) error {
 	errMessage := fmt.Sprintf("the provided %s is missing one or more of the required scopes: %s", tokenType, strings.Join(typeToGitHubScopes[tokenType], ", "))
-	
+
 	req, err := http.NewRequestWithContext(ctx, "HEAD", "https://api.github.com/", nil)
 	if err != nil {
 		return err
@@ -92,7 +90,7 @@ func verifyGitHubTokenScope(ctx context.Context, token string, tokenType TokenTy
 		}
 	}
 
-	log.G(ctx).Infof("%s verified", tokenType)
+	log.G(ctx).Infof("Verified %s", tokenType)
 
 	return nil
 }