CR-11767 uninstalling isc when uninstalling runtime (#424)

* isc uninstall

* bump

* get isc repo from`me` query

* usersV2

* get current

* bump go-sdk

* bump

* bump

Author: rotem-codefresh

Makefile

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

cmd/commands/common.go

@@ -637,3 +637,12 @@ 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)
+	if err != nil {
+		return "", fmt.Errorf("failed to get shared config repo. Error: %w", err)
+	}
+
+	return *user.ActiveAccount.SharedConfigRepo, nil
+}

cmd/commands/runtime.go

@@ -113,6 +113,7 @@ type (
 		RuntimeName      string
 		Timeout          time.Duration
 		CloneOpts        *git.CloneOptions
+		IscCloneOpts     *git.CloneOptions
 		KubeFactory      kube.Factory
 		SkipChecks       bool
 		Force            bool
@@ -455,6 +456,12 @@ func runtimeUninstallCommandPreRunHandler(cmd *cobra.Command, args []string, opt
 		return err
 	}
 
+	opts.IscCloneOpts.Repo, err = getIscRepo(cmd.Context())
+	handleCliStep(reporter.UninstallStepPreCheckGetIscRepo, "Getting internal shared config repo", err, true, false)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -1509,6 +1516,11 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 
 			createAnalyticsReporter(ctx, reporter.UninstallFlow, opts.DisableTelemetry)
 
+			opts.IscCloneOpts = &git.CloneOptions{
+				FS:               fs.Create(memfs.New()),
+				CreateIfNotExist: false,
+			}
+
 			err := runtimeUninstallCommandPreRunHandler(cmd, args, &opts)
 			handleCliStep(reporter.UninstallPhasePreCheckFinish, "Finished pre run checks", err, true, false)
 			if err != nil {
@@ -1532,7 +1544,12 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 			}
 
 			opts.Timeout = store.Get().WaitTimeout
+
+			inferProviderFromRepo(opts.IscCloneOpts)
+			opts.IscCloneOpts.Auth = opts.CloneOpts.Auth
+			opts.IscCloneOpts.Progress = opts.CloneOpts.Progress
 			opts.CloneOpts.Parse()
+			opts.IscCloneOpts.Parse()
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {
@@ -1607,6 +1624,12 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		return err
 	}
 
+	err = removeRuntimeIsc(ctx, opts)
+	handleCliStep(reporter.UninstallStepRemoveRuntimeIsc, "Removing runtime ISC", err, false, true)
+	if err != nil {
+		return fmt.Errorf("failed to remove runtime isc: %w", err)
+	}
+
 	err = deleteRuntimeFromPlatform(ctx, opts)
 	handleCliStep(reporter.UninstallStepDeleteRuntimeFromPlatform, "Deleting runtime from platform", err, false, true)
 	if err != nil {
@@ -1732,6 +1755,32 @@ func getApplicationChecklistState(name string, a *argocdv1alpha1.Application, ru
 	return state, []string{name, status}
 }
 
+func removeRuntimeIsc(ctx context.Context, opts *RuntimeUninstallOptions) error {
+	if opts.IscCloneOpts.Repo == "" {
+		return nil
+	}
+
+	log.G(ctx).Info("removing runtime isc")
+
+	r, fs, err := opts.IscCloneOpts.GetRepo(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to clone isc repo. error: %w", err)
+	}
+
+	err = billyUtils.RemoveAll(fs, fs.Join(store.Get().IscRuntimesDir, opts.RuntimeName))
+	if err != nil {
+		return fmt.Errorf("failed to remove runtime dir '%s' from shared config repo. error: %w", opts.RuntimeName, err)
+	}
+
+	pushMsg := fmt.Sprintf("Removing runtime dir '%s'", opts.RuntimeName)
+	err = apu.PushWithMessage(ctx, r, pushMsg)
+	if err != nil {
+		return fmt.Errorf("failed to push to git while removing runtime '%s' dir: %w", opts.RuntimeName, err)
+	}
+
+	return nil
+}
+
 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)

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.381/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.382/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.381/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.382/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.43.10
+	github.com/codefresh-io/go-sdk v0.43.11
 	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.43.10 h1:SJbc1kOrgvesllkdMZsMFYWOmrFMIyi0d10jslIOIus=
-github.com/codefresh-io/go-sdk v0.43.10/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.43.11 h1:2TMUHE68ZTJS2qWOC7a8+1pdOfH8+b+2g749deMiKX0=
+github.com/codefresh-io/go-sdk v0.43.11/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.381
+  version: 0.0.382
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/reporter/reporter.go

@@ -102,11 +102,13 @@ const (
 	UninstallStepPreCheckRuntimeNameValidation CliStep = "uninstall.pre-check.step.runtime-name-validation"
 	UninstallStepPreCheckEnsureRuntimeRepo     CliStep = "uninstall.pre-check.step.ensure-runtime-repo"
 	UninstallStepPreCheckEnsureGitToken        CliStep = "uninstall.pre-check.step.ensure-git-token"
+	UninstallStepPreCheckGetIscRepo            CliStep = "uninstall.pre-check.step.get-isc-repo"
 	UninstallPhasePreCheckFinish               CliStep = "uninstall.pre-check.phase.finish"
 	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"
 	UninstallStepDeleteRuntimeFromPlatform     CliStep = "uninstall.run.step.delete-runtime-from-platform"
 	UninstallPhaseFinish                       CliStep = "uninstall.run.phase.finish"
 

pkg/store/store.go

@@ -144,6 +144,7 @@ type Store struct {
 	InstallationFlow                    string
 	GsCreateFlow                        string
 	InCluster                           string
+	IscRuntimesDir                      string
 }
 
 // Get returns the global store
@@ -243,6 +244,7 @@ func init() {
 	s.InstallationFlow = "install-runtime"
 	s.GsCreateFlow = "git-source-create"
 	s.InCluster = "https://kubernetes.default.svc"
+	s.IscRuntimesDir = "runtimes"
 
 	initVersion()
 }