fixing gitsource (#127)

Author: roi-codefresh

Makefile

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

cmd/commands/git-source.go

@@ -52,14 +52,13 @@ import (
 
 type (
 	GitSourceCreateOptions struct {
-		InsCloneOpts               *git.CloneOptions
-		GsCloneOpts                *git.CloneOptions
-		GsName                     string
-		RuntimeName                string
-		FullGsPath                 string
-		CreateDemoWorkflowTemplate bool
-		Exclude                    string
-		Include                    string
+		InsCloneOpts        *git.CloneOptions
+		GsCloneOpts         *git.CloneOptions
+		GsName              string
+		RuntimeName         string
+		CreateDemoResources bool
+		Exclude             string
+		Include             string
 	}
 
 	GitSourceDeleteOptions struct {
@@ -155,66 +154,34 @@ func NewGitSourceCreateCommand() *cobra.Command {
 			ctx := cmd.Context()
 
 			return RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-				InsCloneOpts:               insCloneOpts,
-				GsCloneOpts:                gsCloneOpts,
-				GsName:                     args[1],
-				RuntimeName:                args[0],
-				FullGsPath:                 gsCloneOpts.Path(),
-				CreateDemoWorkflowTemplate: false,
+				InsCloneOpts:        insCloneOpts,
+				GsCloneOpts:         gsCloneOpts,
+				GsName:              args[1],
+				RuntimeName:         args[0],
+				CreateDemoResources: false,
 			})
 		},
 	}
 
-	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
-		CreateIfNotExist: true,
-	})
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
 	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
-		Prefix:           "git-src",
-		Optional:         true,
-		CreateIfNotExist: true,
+		Prefix:   "git-src",
+		Optional: true,
 	})
 
 	return cmd
 }
 
 func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error {
-	if opts.CreateDemoWorkflowTemplate {
-
-		gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
-		if err != nil {
-			return err
-		}
-
-		fi, err := gsFs.ReadDir(".")
-		if err != nil {
-			return fmt.Errorf("failed to read files in git-source repo. Err: %w", err)
-		}
-
-		if len(fi) == 0 {
-			err = createCronExamplePipeline(&gitSourceCronExampleOptions{
-				runtimeName: opts.RuntimeName,
-				gsCloneOpts: opts.GsCloneOpts,
-				gsFs:        gsFs,
-			})
-			if err != nil {
-				return fmt.Errorf("failed to create cron example pipeline. Error: %w", err)
-			}
-
-			err = createGithubExamplePipeline(&gitSourceGithubExampleOptions{
-				runtimeName: opts.RuntimeName,
-				gsCloneOpts: opts.GsCloneOpts,
-				gsFs:        gsFs,
-			})
-			if err != nil {
-				return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
-			}
-
-			commitMsg := fmt.Sprintf("Created demo pipelines in %s Directory", opts.GsCloneOpts.Path())
+	// upsert git-source repo
+	gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to clone git-source repo: %w", err)
+	}
 
-			log.G(ctx).Info("Pushing demo pipelines to the new git-source repo")
-			if err := apu.PushWithMessage(ctx, gsRepo, commitMsg); err != nil {
-				return fmt.Errorf("failed to push demo pipelines to git-source repo: %w", err)
-			}
+	if opts.CreateDemoResources {
+		if err := createDemoResources(ctx, opts, gsRepo, gsFs); err != nil {
+			return fmt.Errorf("failed to create git source demo resources: %w", err)
 		}
 	}
 
@@ -227,7 +194,43 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 	if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType, opts.Include, ""); err != nil {
 		return fmt.Errorf("failed to create git-source application. Err: %w", err)
 	}
-	log.G(ctx).Infof("Successfully created the git-source: '%s'", opts.GsName)
+	log.G(ctx).Infof("Successfully created git-source: '%s'", opts.GsName)
+
+	return nil
+}
+
+func createDemoResources(ctx context.Context, opts *GitSourceCreateOptions, gsRepo git.Repository, gsFs fs.FS) error {
+	fi, err := gsFs.ReadDir(".")
+	if err != nil {
+		return fmt.Errorf("failed to read files in git-source repo. Err: %w", err)
+	}
+
+	if len(fi) == 0 {
+		err = createCronExamplePipeline(&gitSourceCronExampleOptions{
+			runtimeName: opts.RuntimeName,
+			gsCloneOpts: opts.GsCloneOpts,
+			gsFs:        gsFs,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to create cron example pipeline. Error: %w", err)
+		}
+
+		err = createGithubExamplePipeline(&gitSourceGithubExampleOptions{
+			runtimeName: opts.RuntimeName,
+			gsCloneOpts: opts.GsCloneOpts,
+			gsFs:        gsFs,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
+		}
+
+		commitMsg := fmt.Sprintf("Created demo pipelines in %s Directory", opts.GsCloneOpts.Path())
+
+		log.G(ctx).Info("Pushing demo pipelines to the new git-source repo")
+		if err := apu.PushWithMessage(ctx, gsRepo, commitMsg); err != nil {
+			return fmt.Errorf("failed to push demo pipelines to git-source repo: %w", err)
+		}
+	}
 
 	return nil
 }

cmd/commands/runtime.go

@@ -47,6 +47,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ghodss/yaml"
+	"github.com/go-git/go-billy/v5/memfs"
 	billyUtils "github.com/go-git/go-billy/v5/util"
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
@@ -316,34 +317,31 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		return err
 	}
 
-	gsPath := opts.GsCloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().GitSourceName, opts.RuntimeName)
-	fullGsPath := opts.GsCloneOpts.FS.Join(opts.GsCloneOpts.FS.Root(), gsPath)[1:]
-
 	if err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-		InsCloneOpts:               opts.InsCloneOpts,
-		GsCloneOpts:                opts.GsCloneOpts,
-		GsName:                     store.Get().GitSourceName,
-		RuntimeName:                opts.RuntimeName,
-		FullGsPath:                 fullGsPath,
-		CreateDemoWorkflowTemplate: true,
+		InsCloneOpts:        opts.InsCloneOpts,
+		GsCloneOpts:         opts.GsCloneOpts,
+		GsName:              store.Get().GitSourceName,
+		RuntimeName:         opts.RuntimeName,
+		CreateDemoResources: true,
 	}); err != nil {
 		return fmt.Errorf("failed to create `%s`: %w", store.Get().GitSourceName, err)
 	}
 
 	mpCloneOpts := &git.CloneOptions{
 		Repo: store.Get().MarketplaceRepo,
+		Auth: opts.GsCloneOpts.Auth,
+		FS:   fs.Create(memfs.New()),
 	}
 	mpCloneOpts.Parse()
 	if err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-		InsCloneOpts:               opts.InsCloneOpts,
-		GsCloneOpts:                mpCloneOpts,
-		GsName:                     store.Get().MarketplaceGitSourceName,
-		RuntimeName:                opts.RuntimeName,
-		FullGsPath:                 store.Get().MarketplaceRepo,
-		CreateDemoWorkflowTemplate: false,
-		Include:                    "**/workflowTemplate.yaml",
+		InsCloneOpts:        opts.InsCloneOpts,
+		GsCloneOpts:         mpCloneOpts,
+		GsName:              store.Get().MarketplaceGitSourceName,
+		RuntimeName:         opts.RuntimeName,
+		CreateDemoResources: false,
+		Include:             "**/workflowTemplate.yaml",
 	}); err != nil {
-		return fmt.Errorf("failed to create `%s`: %w", store.Get().GitSourceName, err)
+		return fmt.Errorf("failed to create `%s`: %w", store.Get().MarketplaceGitSourceName, err)
 	}
 
 	var wg sync.WaitGroup

docs/commands/cli-v2_git-source_create.md

@@ -19,12 +19,10 @@ cli-v2 git-source create runtime_name git-source_name [flags]
 ```
       --git-src-git-token string   Your git provider api token [GIT_SRC_GIT_TOKEN]
       --git-src-git-user string    Your git provider user name [GIT_SRC_GIT_USER] (not required in GitHub)
-      --git-src-provider string    The git provider, one of: gitea|github
       --git-src-repo string        Repository URL [GIT_SRC_GIT_REPO]
   -t, --git-token string           Your git provider api token [GIT_TOKEN]
   -u, --git-user string            Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help                       help for create
-      --provider string            The git provider, one of: gitea|github
       --repo string                Repository URL [GIT_REPO]
 ```
 

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.118/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.119/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.118/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.119/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.0
-  version: 0.0.118
+  version: 0.0.119
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/store/store.go

@@ -146,7 +146,7 @@ func init() {
 	s.MaxDefVersion = semver.MustParse(maxDefVersion)
 	s.RuntimeDefURL = RuntimeDefURL
 	s.MarketplaceGitSourceName = "marketplace-git-source"
-	s.MarketplaceRepo = "https://github.com/codefresh-io/2.0-marketplace.git/"
+	s.MarketplaceRepo = "https://github.com/codefresh-io/2.0-marketplace.git"
 	s.WaitTimeout = 8 * time.Minute
 	s.WorkflowName = "workflow"
 	s.WorkflowReporterName = "workflow-reporter"