fixed not removing runtime from isc - no git-integrations (#541)

* fixed not removing runtime from isc - no git-integrations

* wip

Author: roi-codefresh

Makefile

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

cmd/commands/runtime.go

@@ -253,6 +253,8 @@ func removeGitIntegrations(ctx context.Context, opts *RuntimeUninstallOptions) e
 		}
 	}
 
+	log.G(ctx).Info("Removed runtime git integrations")
+
 	return nil
 }
 
@@ -496,23 +498,23 @@ func runRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 
 	log.G(ctx).Infof("Uninstalling runtime \"%s\" - this process may take a few minutes...", opts.RuntimeName)
 
-	err = removeGitIntegrations(ctx, opts)
+	err = removeRuntimeIsc(ctx, opts.RuntimeName)
 	if opts.Force {
 		err = nil
 	}
-	handleCliStep(reporter.UninstallStepRemoveGitIntegrations, "Removing git integrations", err, false, true)
+	handleCliStep(reporter.UninstallStepRemoveRuntimeIsc, "Removing runtime ISC", err, false, true)
 	if err != nil {
-		summaryArr = append(summaryArr, summaryLog{"you can attempt to uninstall again with the \"--force\" flag", Info})
-		return err
+		return fmt.Errorf("failed to remove runtime isc: %w", err)
 	}
 
-	err = removeRuntimeIsc(ctx, opts.RuntimeName)
+	err = removeGitIntegrations(ctx, opts)
 	if opts.Force {
 		err = nil
 	}
-	handleCliStep(reporter.UninstallStepRemoveRuntimeIsc, "Removing runtime ISC", err, false, true)
+	handleCliStep(reporter.UninstallStepRemoveGitIntegrations, "Removing git integrations", err, false, true)
 	if err != nil {
-		return fmt.Errorf("failed to remove runtime isc: %w", err)
+		summaryArr = append(summaryArr, summaryLog{"you can attempt to uninstall again with the \"--force\" flag", Info})
+		return err
 	}
 
 	if !opts.skipAutopilotUninstall {
@@ -545,7 +547,7 @@ func runRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		return err
 	}
 
-	log.G(ctx).Infof("Deleting runtime '%s' from platform", opts.RuntimeName)
+	log.G(ctx).Infof("Deleting runtime \"%s\" from platform", opts.RuntimeName)
 	if opts.Managed {
 		_, err = cfConfig.NewClient().V2().Runtime().DeleteManaged(ctx, opts.RuntimeName)
 	} else {

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

manifests/runtime.yaml

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

pkg/reporter/reporter.go

@@ -108,8 +108,8 @@ const (
 	UninstallPhaseStart                             CliStep = "uninstall.run.phase.start"
 	UninstallStepCheckRuntimeExists                 CliStep = "uninstall.run.step.check-runtime-exists"
 	UninstallStepUninstallRepo                      CliStep = "uninstall.run.step.uninstall-repo"
-	UninstallStepRemoveGitIntegrations              CliStep = "uninstall.run.step.remove-git-integrations"
 	UninstallStepRemoveRuntimeIsc                   CliStep = "uninstall.run.step.remove-runtime-isc"
+	UninstallStepRemoveGitIntegrations              CliStep = "uninstall.run.step.remove-git-integrations"
 	UninstallStepDeleteRuntimeFromPlatform          CliStep = "uninstall.run.step.delete-runtime-from-platform"
 	UninstallPhaseFinish                            CliStep = "uninstall.run.phase.finish"