CR-6234-repo-url (#123)

* add ensureRepo

* add Repo to createNewRunTimeOnPlatform

* ensureRepo on git-source

* - ensureRepo for git-source commands
- adjust gitSources fields to the sdk update (on git-source list command)

* bump version

Author: rotem-codefresh

cmd/commands/common.go

@@ -16,9 +16,11 @@ package commands
 
 import (
 	_ "embed"
+	"fmt"
 	"os"
 	"regexp"
 
+	"github.com/argoproj-labs/argocd-autopilot/pkg/git"
 	"github.com/codefresh-io/cli-v2/pkg/config"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 
@@ -58,3 +60,18 @@ func presetRequiredFlags(cmd *cobra.Command) {
 func IsValid(s string) (bool, error) {
 	return regexp.MatchString(`^[a-z]([-a-z0-9]{0,61}[a-z0-9])?$`, s)
 }
+
+func ensureRepo(cmd *cobra.Command, args []string, cloneOpts  *git.CloneOptions) error {
+	ctx := cmd.Context()
+	if cloneOpts.Repo == "" {
+		runtimeData, err := cfConfig.NewClient().V2().Runtime().Get(ctx, args[0])
+		if err != nil {
+			return fmt.Errorf("Failed getting runtime repo information: %w", err)
+		}
+		if runtimeData.Repo != nil {
+			cloneOpts.Repo = *runtimeData.Repo
+			die(cmd.Flags().Set("repo", *runtimeData.Repo))
+		}
+	}
+	return nil
+}

cmd/commands/git-source.go

@@ -119,7 +119,7 @@ func NewGitSourceCreateCommand() *cobra.Command {
 		Example: util.Doc(`
 			<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) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
 			if len(args) < 1 {
@@ -133,6 +133,11 @@ func NewGitSourceCreateCommand() *cobra.Command {
 			if gsCloneOpts.Repo == "" {
 				log.G(ctx).Fatal("must enter a valid value to --git-src-repo. Example: https://github.com/owner/repo-name/path/to/workflow")
 			}
+			
+			err := ensureRepo(cmd, args, insCloneOpts)
+			if err != nil {
+				return err
+			}
 
 			isValid, err := IsValid(args[1])
 			if err != nil {
@@ -149,6 +154,7 @@ func NewGitSourceCreateCommand() *cobra.Command {
 
 			insCloneOpts.Parse()
 			gsCloneOpts.Parse()
+			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
@@ -396,15 +402,23 @@ func RunGitSourceList(ctx context.Context, runtimeName string) error {
 
 	for _, gs := range gitSources {
 		name := gs.Metadata.Name
-		repoURL := gs.Self.RepoURL
-		path := gs.Self.Path
+		repoURL := "N/A"
+		path := "N/A"
 		healthStatus := "N/A"
 		syncStatus := gs.Self.Status.SyncStatus.String()
 
 		if gs.Self.Status.HealthStatus != nil {
 			healthStatus = gs.Self.Status.HealthStatus.String()
 		}
 
+		if gs.Self.RepoURL != nil {
+			repoURL = *gs.Self.RepoURL
+		}
+
+		if gs.Self.Path != nil {
+			path = *gs.Self.Path
+		}
+
 		_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\n",
 			name,
 			repoURL,
@@ -432,7 +446,7 @@ func NewGitSourceDeleteCommand() *cobra.Command {
 		Example: util.Doc(`
 			<BIN> git-source delete runtime_name git-source_name 
 		`),
-		PreRun: func(cmd *cobra.Command, args []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
 			if len(args) < 1 {
@@ -443,7 +457,13 @@ func NewGitSourceDeleteCommand() *cobra.Command {
 				log.G(ctx).Fatal("must enter git-source name")
 			}
 
+			err := ensureRepo(cmd, args, insCloneOpts)
+			if err != nil {
+				return err
+			}
+
 			insCloneOpts.Parse()
+			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
@@ -491,7 +511,7 @@ func NewGitSourceEditCommand() *cobra.Command {
 		Example: util.Doc(`
 			<BIN> git-source edit runtime_name git-source_name --git-src-repo https://github.com/owner/repo-name/my-workflow
 		`),
-		PreRun: func(cmd *cobra.Command, args []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
 			if len(args) < 1 {
@@ -506,8 +526,14 @@ func NewGitSourceEditCommand() *cobra.Command {
 				log.G(ctx).Fatal("must enter a valid value to --git-src-repo. Example: https://github.com/owner/repo-name/path/to/workflow")
 			}
 
+			err := ensureRepo(cmd, args, insCloneOpts)
+			if err != nil {
+				return err
+			}
+
 			insCloneOpts.Parse()
 			gsCloneOpts.Parse()
+			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()

cmd/commands/runtime.go

@@ -264,6 +264,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		RuntimeVersion: runtimeVersion,
 		IngressHost:    &opts.IngressHost,
 		ComponentNames: componentNames,
+		Repo: &opts.InsCloneOpts.Repo,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create a new runtime: %w", err)
@@ -576,8 +577,13 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 
 	<BIN> runtime uninstall runtime-name --repo gitops_repo
 `),
-		PreRun: func(_ *cobra.Command, _ []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			err := ensureRepo(cmd, args, cloneOpts)
+			if err != nil {
+				return err
+			}
 			cloneOpts.Parse()
+			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
@@ -658,8 +664,13 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 
 	<BIN> runtime upgrade runtime-name --version 0.0.30 --repo gitops_repo
 `),
-		PreRun: func(_ *cobra.Command, _ []string) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			err := ensureRepo(cmd, args, cloneOpts)
+			if err != nil {
+				return err
+			}
 			cloneOpts.Parse()
+			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var (

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/argo-workflows/v3 v3.1.6
 	github.com/briandowns/spinner v1.16.0
-	github.com/codefresh-io/go-sdk v0.34.10
+	github.com/codefresh-io/go-sdk v0.34.12
 	github.com/fatih/color v1.12.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1

go.sum

@@ -262,8 +262,8 @@ github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1w
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codefresh-io/go-sdk v0.34.10 h1:C+wH3rKRT+c/ePmdCuKA6YY2bEmIV1P/pIE9S5QS1AU=
-github.com/codefresh-io/go-sdk v0.34.10/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.34.12 h1:cwUa1DD4yQ16xuUDHRik6M5GK+I2xkX2ADWNCnsQkOM=
+github.com/codefresh-io/go-sdk v0.34.12/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
 github.com/colinmarc/hdfs v1.1.4-0.20180802165501-48eb8d6c34a9/go.mod h1:0DumPviB681UcSuJErAbDIOx6SIaJWj463TymfZG02I=
 github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31/go.mod h1:vSBumefK4HA5uiRSwNP+3ofgrEoScpCS2MMWcWXEuQ4=
 github.com/container-storage-interface/spec v1.3.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=