prevent-git-src-repo-collisions (#111)

* exisitng git-src repo handling

* removed redundant

* bump

* comment

* temp change

* tested: creates a separate repo

* tested

* bump

* using store

* changed Contains to HasSuffix

* using Parse

* without ns in demo resources

* parse gsCloneOpts in Run

* underscore

* no replace

* removed redundant

Author: elad-codefresh

Makefile

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

cmd/commands/git-source.go

@@ -48,11 +48,11 @@ import (
 
 type (
 	GitSourceCreateOptions struct {
-		InsCloneOpts        *git.CloneOptions
-		GsCloneOpts         *git.CloneOptions
-		GsName              string
-		RuntimeName         string
-		FullGsPath          string
+		InsCloneOpts *git.CloneOptions
+		GsCloneOpts  *git.CloneOptions
+		GsName       string
+		RuntimeName  string
+		FullGsPath   string
 	}
 
 	GitSourceDeleteOptions struct {
@@ -70,9 +70,9 @@ type (
 	}
 
 	gitSourceCronExampleOptions struct {
-		runtimeName         string
-		gsCloneOpts         *git.CloneOptions
-		gsFs                fs.FS
+		runtimeName string
+		gsCloneOpts *git.CloneOptions
+		gsFs        fs.FS
 	}
 )
 
@@ -176,9 +176,9 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 
 	if len(fi) == 0 {
 		err = createCronExamplePipeline(&gitSourceCronExampleOptions{
-			runtimeName:         opts.RuntimeName,
-			gsCloneOpts:         opts.GsCloneOpts,
-			gsFs:                gsFs,
+			runtimeName: opts.RuntimeName,
+			gsCloneOpts: opts.GsCloneOpts,
+			gsFs:        gsFs,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create cron example pipeline. Error: %w", err)
@@ -197,6 +197,7 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 		Type: application.AppTypeDirectory,
 		URL:  opts.GsCloneOpts.Repo,
 	}
+
 	if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType); err != nil {
 		return fmt.Errorf("failed to create git-source application. Err: %w", err)
 	}
@@ -211,17 +212,16 @@ func createCronExamplePipeline(opts *gitSourceCronExampleOptions) error {
 		return fmt.Errorf("failed to create demo workflowTemplate: %w", err)
 	}
 
-	eventSourceFilePath := opts.gsFs.Join("resources", store.Get().CronExampleEventSourceFileName)
-	sensorFilePath := opts.gsFs.Join("resources",store.Get().CronExampleSensorFileName)
+	eventSourceFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().CronExampleEventSourceFileName)
+	sensorFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().CronExampleSensorFileName)
 
 	eventSource := &eventsourcev1alpha1.EventSource{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       eventsourcereg.Kind,
 			APIVersion: eventsourcereg.Group + "/v1alpha1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      store.Get().CronExampleEventSourceName,
-			Namespace: opts.runtimeName,
+			Name: store.Get().CronExampleEventSourceName,
 		},
 		Spec: eventsourcev1alpha1.EventSourceSpec{
 			EventBusName: store.Get().EventBusName,
@@ -272,8 +272,7 @@ func createCronExampleSensor(triggers []sensorsv1alpha1.Trigger, runtimeName str
 			APIVersion: sensorreg.Group + "/v1alpha1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cron",
-			Namespace: runtimeName,
+			Name: "cron",
 		},
 		Spec: sensorsv1alpha1.SensorSpec{
 			EventBusName: "codefresh-eventbus",

cmd/commands/runtime.go

@@ -139,18 +139,13 @@ func NewRuntimeInstallCommand() *cobra.Command {
 			}
 
 			insCloneOpts.Parse()
-			if gsCloneOpts.Repo == "" {
-				host, orgRepo, _, _, _, suffix, _ := aputil.ParseGitUrl(insCloneOpts.Repo)
-				gsCloneOpts.Repo = host + orgRepo + "_git-source" + suffix + "/resources"
-			}
-
-			gsCloneOpts.Parse()
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var (
 				version *semver.Version
 				err     error
 			)
+
 			ctx := cmd.Context()
 			if len(args) < 1 {
 				log.G(ctx).Fatal("must enter runtime name")
@@ -172,8 +167,15 @@ func NewRuntimeInstallCommand() *cobra.Command {
 				}
 			}
 
+			runtimeName := args[0]
+			if gsCloneOpts.Repo == "" {
+				host, orgRepo, _, _, _, suffix, _ := aputil.ParseGitUrl(insCloneOpts.Repo)
+				gsCloneOpts.Repo = host + orgRepo + "_git-source" + suffix + "/resources" + "_" + runtimeName
+			}
+			gsCloneOpts.Parse()
+
 			return RunRuntimeInstall(ctx, &RuntimeInstallOptions{
-				RuntimeName:  args[0],
+				RuntimeName:  runtimeName,
 				IngressHost:  ingressHost,
 				Version:      version,
 				Insecure:     true,

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.106/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.107/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -32,11 +32,11 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.106/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.107/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
 
 # check the installation
 cf version
-```
+```

manifests/runtime.yaml

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