CR-5821-gs-delete (#57)

* successfully deletes git-source

* removed comment

* removed redundant

* removed redundant

* underscore

* returning err

* bump

* resolved conflicts

* added files

* returning nil

* added file

Author: elad-codefresh

Makefile

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

cmd/commands/git-source.go

@@ -17,15 +17,18 @@ package commands
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/runtime"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 
+	apcmd "github.com/argoproj-labs/argocd-autopilot/cmd/commands"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/application"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/git"
+	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
 	wf "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow"
 	wfv1alpha1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	"github.com/go-git/go-billy/v5/memfs"
@@ -42,19 +45,28 @@ type (
 		runtimeName  string
 		fullGsPath   string
 	}
+
+	GitSourceDeleteOptions struct {
+		RuntimeName string
+		GsName      string
+		CloneOpts   *git.CloneOptions
+		Timeout     time.Duration
+	}
 )
 
 func NewGitSourceCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "git-source",
-		Short: "Manage git-sources of Codefresh runtimes",
+		Use:               "git-source",
+		Short:             "Manage git-sources of Codefresh runtimes",
+		PersistentPreRunE: cfConfig.RequireAuthentication,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmd.HelpFunc()(cmd, args)
 			exit(1)
 		},
 	}
 
 	cmd.AddCommand(NewGitSourceCreateCommand())
+	cmd.AddCommand(NewGitSourceDeleteCommand())
 
 	return cmd
 }
@@ -69,7 +81,7 @@ func NewGitSourceCreateCommand() *cobra.Command {
 		Use:   "create runtime_name git-source_name",
 		Short: "add a new git-source to an existing runtime",
 		Example: util.Doc(`
-			<BIN> git-source create runtime_name git-source-name https://github.com/owner/repo-name/my-workflow
+			<BIN> git-source create runtime_name git-source-name --git-src-repo https://github.com/owner/repo-name/my-workflow
 		`),
 		PreRun: func(cmd *cobra.Command, args []string) {
 			ctx := cmd.Context()
@@ -120,6 +132,49 @@ func NewGitSourceCreateCommand() *cobra.Command {
 	return cmd
 }
 
+func NewGitSourceDeleteCommand() *cobra.Command {
+	var (
+		cloneOpts *git.CloneOptions
+	)
+
+	cmd := &cobra.Command{
+		Use:   "delete runtime_name git-source_name",
+		Short: "delete a git-source from a runtime",
+		Example: util.Doc(`
+			<BIN> git-source delete runtime_name git-source_name 
+		`),
+		PreRun: func(cmd *cobra.Command, args []string) {
+			ctx := cmd.Context()
+
+			if len(args) < 1 {
+				log.G(ctx).Fatal("must enter runtime name")
+			}
+
+			if len(args) < 2 {
+				log.G(ctx).Fatal("must enter git-source name")
+			}
+
+			cloneOpts.Parse()
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+
+			return RunDeleteGitSource(ctx, &GitSourceDeleteOptions{
+				RuntimeName: args[0],
+				GsName:      args[1],
+				Timeout:     aputil.MustParseDuration(cmd.Flag("request-timeout").Value.String()),
+				CloneOpts:   cloneOpts,
+			})
+		},
+	}
+
+	cloneOpts = git.AddFlags(cmd, &git.AddFlagsOptions{
+		FS: memfs.New(),
+	})
+
+	return cmd
+}
+
 func RunCreateGitSource(ctx context.Context, opts *GitSourceCreateOptions) error {
 	gsRepo, gsFs, err := opts.gsCloneOpts.GetRepo(ctx)
 	if err != nil {
@@ -160,6 +215,23 @@ func RunCreateGitSource(ctx context.Context, opts *GitSourceCreateOptions) error
 	return nil
 }
 
+func RunDeleteGitSource(ctx context.Context, opts *GitSourceDeleteOptions) error {
+	err := apcmd.RunAppDelete(ctx, &apcmd.AppDeleteOptions{
+		CloneOpts:   opts.CloneOpts,
+		ProjectName: opts.RuntimeName,
+		AppName:     opts.GsName,
+		Global:      false,
+	})
+
+	if err != nil {
+		return fmt.Errorf("failed to delete git-source %s. Err: %w", opts.GsName, err)
+	}
+
+	log.G(ctx).Debug("successfully deleted git-source: %s", opts.GsName)
+
+	return nil
+}
+
 func createDemoWorkflowTemplate(gsFs fs.FS, gsName, runtimeName string) error {
 	wfTemplate := &wfv1alpha1.WorkflowTemplate{
 		TypeMeta: metav1.TypeMeta{
@@ -186,6 +258,6 @@ func createDemoWorkflowTemplate(gsFs fs.FS, gsName, runtimeName string) error {
 			},
 		},
 	}
-	
+
 	return gsFs.WriteYamls("demo-wf-template.yaml", wfTemplate)
 }

docs/commands/cli-v2_git-source.md

@@ -25,4 +25,5 @@ cli-v2 git-source [flags]
 
 * [cli-v2](cli-v2.md)	 - cli-v2 is used for installing and managing codefresh installations using gitops
 * [cli-v2 git-source create](cli-v2_git-source_create.md)	 - add a new git-source to an existing runtime
+* [cli-v2 git-source delete](cli-v2_git-source_delete.md)	 - delete a git-source from a runtime
 

docs/commands/cli-v2_git-source_create.md

@@ -10,7 +10,7 @@ cli-v2 git-source create runtime_name git-source_name [flags]
 
 ```
 
-            cli-v2 git-source create runtime_name git-source-name https://github.com/owner/repo-name/my-workflow
+            cli-v2 git-source create runtime_name git-source-name --git-src-repo https://github.com/owner/repo-name/my-workflow
         
 ```
 

docs/commands/cli-v2_git-source_delete.md

@@ -0,0 +1,37 @@
+## cli-v2 git-source delete
+
+delete a git-source from a runtime
+
+```
+cli-v2 git-source delete runtime_name git-source_name [flags]
+```
+
+### Examples
+
+```
+
+            cli-v2 git-source delete runtime_name git-source_name 
+        
+```
+
+### Options
+
+```
+  -t, --git-token string   Your git provider api token [GIT_TOKEN]
+  -h, --help               help for delete
+      --repo string        Repository URL [GIT_REPO]
+```
+
+### Options inherited from parent commands
+
+```
+      --auth-context string        Run the next command using a specific authentication context
+      --cfconfig string            Custom path for authentication contexts config file (default "/home/user")
+      --insecure                   Disable certificate validation for TLS connections (e.g. to g.codefresh.io)
+      --request-timeout duration   Request timeout (default 30s)
+```
+
+### SEE ALSO
+
+* [cli-v2 git-source](cli-v2_git-source.md)	 - Manage git-sources of Codefresh runtimes
+

docs/releases/release_notes.md

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

go.mod

@@ -58,4 +58,5 @@ replace (
 	k8s.io/mount-utils => k8s.io/mount-utils v0.21.1
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.1
 	sigs.k8s.io/kustomize => sigs.k8s.io/kustomize/v4 v4.1.3
+
 )

manifests/runtime.yaml

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