CR-9845 cluster remove (#333)

* cluster remove and small bug fix

* bump version

* few fixes

* small fix

* lint fix

Author: rotem-codefresh

Makefile

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

cmd/commands/cluster.go

@@ -41,6 +41,11 @@ type (
 		dryRun      bool
 		kubeFactory kube.Factory
 	}
+
+	ClusterRemoveOptions struct {
+		server      string
+		runtimeName string
+	}
 )
 
 var minAddClusterSupportedVersion = semver.MustParse("0.0.283")
@@ -59,6 +64,7 @@ func NewClusterCommand() *cobra.Command {
 	}
 
 	cmd.AddCommand(NewClusterAddCommand())
+	cmd.AddCommand(NewClusterRemoveCommand())
 	cmd.AddCommand(NewClusterListCommand())
 
 	return cmd
@@ -187,6 +193,55 @@ func createAddClusterKustomization(ingressUrl, contextName, server, csdpToken, v
 	return k
 }
 
+func NewClusterRemoveCommand() *cobra.Command {
+	var (
+		opts ClusterRemoveOptions
+	)
+
+	cmd := &cobra.Command{
+		Use:     "remove RUNTIME_NAME",
+		Short:   "Removes a cluster from a given runtime",
+		Args:    cobra.MaximumNArgs(1),
+		Example: util.Doc(`<BIN> cluster remove my-runtime --server-url my-server-url`),
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			var err error
+
+			ctx := cmd.Context()
+
+			opts.runtimeName, err = ensureRuntimeName(ctx, args)
+			if err != nil {
+				return err
+			}
+
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runClusterRemove(cmd.Context(), &opts)
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.server, "server-url", "", "The cluster's server url")
+	util.Die(cobra.MarkFlagRequired(cmd.Flags(), "server-url"))
+
+	return cmd
+}
+
+func runClusterRemove(ctx context.Context, opts *ClusterRemoveOptions) error {
+	appProxy, err := cfConfig.NewClient().AppProxy(ctx, opts.runtimeName, store.Get().InsecureIngressHost)
+	if err != nil {
+		return err
+	}
+
+	err = appProxy.AppProxyClusters().RemoveCluster(ctx, opts.server, opts.runtimeName)
+	if err != nil {
+		return fmt.Errorf("failed to remove cluster: %w", err)
+	}
+
+	log.G(ctx).Info("cluster was removed successfully")
+
+	return nil
+}
+
 func NewClusterListCommand() *cobra.Command {
 	var runtimeName string
 	var kubeconfig string

cmd/commands/integrations.go

@@ -134,7 +134,7 @@ func RunGitIntegrationListCommand(ctx context.Context, client sdk.AppProxyAPI, f
 				intg.Name,
 				intg.Provider,
 				intg.APIURL,
-				len(intg.RegisteredUsers),
+				len(intg.Users),
 				intg.SharingPolicy.String(),
 			)
 			if err != nil {

cmd/commands/runtime.go

@@ -605,11 +605,11 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	componentNames := getComponents(rt, opts)
 
-	shouldRollback := opts.DisableRollback
+	disableRollback := opts.DisableRollback
 
 	defer func() {
 		// will rollback if err is not nil and it is safe to do so
-		postInstallationHandler(ctx, opts, err, shouldRollback)
+		postInstallationHandler(ctx, opts, err, &disableRollback)
 	}()
 
 	token, iv, err := createRuntimeOnPlatform(ctx, &model.RuntimeInstallationArgs{
@@ -698,7 +698,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	// if we got to this point the runtime was installed successfully
 	// thus we shall not perform a rollback after this point.
-	shouldRollback = false
+	disableRollback = true
 
 	if store.Get().SkipIngress {
 		handleCliStep(reporter.InstallStepCreateDefaultGitIntegration, "-skipped-", err, false, true)
@@ -2245,8 +2245,8 @@ func inferAPIURLForGitProvider(provider apmodel.GitProviders) (string, error) {
 	return "", fmt.Errorf("cannot infer api-url for git provider %s, %s", provider, suggest)
 }
 
-func postInstallationHandler(ctx context.Context, opts *RuntimeInstallOptions, err error, shouldRollback bool) {
-	if err != nil && shouldRollback {
+func postInstallationHandler(ctx context.Context, opts *RuntimeInstallOptions, err error, disableRollback *bool) {
+	if err != nil && !*disableRollback {
 		summaryArr = append(summaryArr, summaryLog{"----------Uninstalling runtime----------", Info})
 		log.G(ctx).Warnf("installation failed due to error : %s, performing installation rollback", err.Error())
 		err := RunRuntimeUninstall(ctx, &RuntimeUninstallOptions{

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.297/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.298/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.297/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.298/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.37.8
+	github.com/codefresh-io/go-sdk v0.38.0
 	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

@@ -241,8 +241,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.37.8 h1:Y5hH0c2tL7UPGPB6c1+tk5A1YXweexNHWFS2iRQQBwU=
-github.com/codefresh-io/go-sdk v0.37.8/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.38.0 h1:nigzhGKPezfoVhkQrgD1c6KSFzEo0O26VAi/+B82eU8=
+github.com/codefresh-io/go-sdk v0.38.0/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/app-proxy/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.951.0
+    newTag: 1.971.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

manifests/runtime.yaml

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

pkg/util/util.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/pkg/browser"
 	"net/url"
 	"os"
 	"os/signal"
@@ -28,6 +27,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pkg/browser"
+
 	"github.com/briandowns/spinner"
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/reporter"