Git source fix (#36)

ATGardner · web-flow · commit 0b952d8e55f3 · 2021-08-02T15:58:13.000+03:00
* updated argo-rollouts@1.0.4
updated argo-workflows@3.1.3

* wip

* fixed appset field name

* bumped to version 0.0.42

* ran codegen
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.41
+VERSION=v0.0.42
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -187,6 +187,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	if err != nil {
 		return fmt.Errorf("failed to get a runtime creation response: %w", err)
 	}
+
 	opts.RuntimeToken = runtimeCreationResponse.NewAccessToken
 
 	log.G(ctx).WithField("version", rt.Spec.Version).Infof("installing runtime '%s'", opts.RuntimeName)
@@ -203,14 +204,17 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	err = apcmd.RunProjectCreate(ctx, &apcmd.ProjectCreateOptions{
 		CloneOpts:   opts.insCloneOpts,
 		ProjectName: opts.RuntimeName,
+		Labels: map[string]string{
+			store.Get().LabelKeyCFType: fmt.Sprintf("{{ labels.%s }}", util.EscapeAppsetFieldName(store.Get().LabelKeyCFType)),
+		},
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create project: %w", err)
 	}
 
 	for _, component := range rt.Spec.Components {
 		log.G(ctx).Infof("creating component '%s'", component.Name)
-		if err = component.CreateApp(ctx, opts.KubeFactory, opts.insCloneOpts, opts.RuntimeName, rt.Spec.Version); err != nil {
+		if err = component.CreateApp(ctx, opts.KubeFactory, opts.insCloneOpts, opts.RuntimeName, store.Get().CFComponentType, rt.Spec.Version); err != nil {
 			return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)
 		}
 	}
@@ -464,7 +468,7 @@ func RunRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 
 	for _, component := range newComponents {
 		log.G(ctx).Infof("Creating app '%s'", component.Name)
-		if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, newRt.Spec.Version); err != nil {
+		if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, store.Get().CFComponentType, newRt.Spec.Version); err != nil {
 			return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)
 		}
 	}
@@ -504,7 +508,7 @@ func createComponentsReporter(ctx context.Context, cloneOpts *git.CloneOptions,
 		Type: application.AppTypeDirectory,
 		URL:  cloneOpts.URL() + "/" + resPath,
 	}
-	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, nil); err != nil {
+	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType, nil); err != nil {
 		return err
 	}
 
@@ -543,18 +547,10 @@ func updateProject(repofs fs.FS, runtimeName string) error {
 		return err
 	}
 
-	if appset.Spec.Template.Labels == nil {
-		appset.Spec.Template.Labels = make(map[string]string)
-	}
-	if appset.Labels == nil {
-		appset.Labels = make(map[string]string)
-	}
-
 	if project.ObjectMeta.Labels == nil {
 		project.ObjectMeta.Labels = make(map[string]string)
 	}
 
-	appset.Spec.Template.Labels[store.Get().LabelKeyCFType] = store.Get().CFComponentType
 	project.ObjectMeta.Labels[store.Get().LabelKeyCFType] = store.Get().CFRuntimeType
 	return repofs.WriteYamls(projPath, project, appset)
 }
@@ -884,7 +880,7 @@ func createGitSource(ctx context.Context, insCloneOpts *git.CloneOptions, gsClon
 		Type: application.AppTypeDirectory,
 		URL:  insCloneOpts.URL() + insFs.Join(insFs.Root(), resPath),
 	}
-	if err = appDef.CreateApp(ctx, nil, insCloneOpts, runtimeName, nil); err != nil {
+	if err = appDef.CreateApp(ctx, nil, insCloneOpts, runtimeName, store.Get().CFGitSourceType, nil); err != nil {
 		return fmt.Errorf("failed to create git-source: %w", err)
 	}
 
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
@@ -8,7 +8,7 @@
 ### Linux
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.41/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.42/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -20,7 +20,7 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.41/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.42/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/argoproj-labs/applicationset v0.1.0
-	github.com/argoproj-labs/argocd-autopilot v0.2.11
+	github.com/argoproj-labs/argocd-autopilot v0.2.12
 	github.com/argoproj/argo-cd/v2 v2.0.3
 	github.com/argoproj/argo-events v1.3.1
 	github.com/argoproj/argo-workflows/v3 v3.1.0
diff --git a/go.sum b/go.sum
@@ -167,8 +167,8 @@ github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAF
 github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
 github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a h1:8Nm2KtOu/G7NtoAgucj4TkX8rghzwgFJGXNrAmuz7gc=
 github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a/go.mod h1:5rxggh8ymYXedQDIYylNzIHe6jdshDNasIBCVJuR1iU=
-github.com/argoproj-labs/argocd-autopilot v0.2.11 h1:ysxOnVuRtvEe0Qj9apPMHcYi77oxTeu9LuZVDcOupl4=
-github.com/argoproj-labs/argocd-autopilot v0.2.11/go.mod h1:o+e85vsYHC7FqUgxgQMAcIOmlRmVvcAwCw/fPXPz3xY=
+github.com/argoproj-labs/argocd-autopilot v0.2.12 h1:xQoGlXAr6+BSRTRKg1xtAkSVBaHNoq9YvEiv6ASC31g=
+github.com/argoproj-labs/argocd-autopilot v0.2.12/go.mod h1:o+e85vsYHC7FqUgxgQMAcIOmlRmVvcAwCw/fPXPz3xY=
 github.com/argoproj/argo-cd v1.8.1/go.mod h1:Vfl7OGgBC83dVWgq58wU6UR3kG864h0dtHEIQ8xqw4s=
 github.com/argoproj/argo-cd v1.8.7 h1:CkIu8p/gcTY/fOZWM2tHuSCIAV2HggXjJftrT1IIT3k=
 github.com/argoproj/argo-cd v1.8.7/go.mod h1:tqFZW5Lr9KBCDsvOaE5Fh8M1eJ1ThvR58pyyLv8Zqvs=
diff --git a/manifests/argo-rollouts/kustomization.yaml b/manifests/argo-rollouts/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/argoproj/argo-rollouts/releases/download/v1.0.2/install.yaml
+  - https://github.com/argoproj/argo-rollouts/releases/download/v1.0.4/install.yaml
 patches:
   - target:
       group: apiextensions.k8s.io
diff --git a/manifests/argo-workflows/kustomization.yaml b/manifests/argo-workflows/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/argoproj/argo-workflows/releases/download/v3.1.2/install.yaml
+  - https://github.com/argoproj/argo-workflows/releases/download/v3.1.3/install.yaml
 
 patches:
   # reset the crbs to `subject.namespace: default`, so that argo-workflows will later change them to the actual ns
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.41
+  version: 0.0.42
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/store"
+	"github.com/codefresh-io/cli-v2/pkg/util"
 
 	"github.com/Masterminds/semver/v3"
 	apcmd "github.com/argoproj-labs/argocd-autopilot/cmd/commands"
@@ -210,7 +211,7 @@ func (r *RuntimeSpec) FullSpecifier() string {
 	return buildFullURL(r.BootstrapSpecifier, r.Version)
 }
 
-func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.CloneOptions, projectName string, version *semver.Version) error {
+func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.CloneOptions, projectName, cfType string, version *semver.Version) error {
 	timeout := time.Duration(0)
 	if a.Wait {
 		timeout = store.Get().WaitTimeout
@@ -225,6 +226,9 @@ func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.C
 			AppSpecifier:  buildFullURL(a.URL, version),
 			AppType:       a.Type,
 			DestNamespace: projectName,
+			Labels: map[string]string{
+				util.EscapeAppsetFieldName(store.Get().LabelKeyCFType): cfType,
+			},
 		},
 		KubeFactory: f,
 		Timeout:     timeout,
diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -45,6 +45,7 @@ type Version struct {
 type Store struct {
 	BinaryName             string
 	CFComponentType        string
+	CFGitSourceType        string
 	CFRuntimeDefType       string
 	CFRuntimeType          string
 	CFTokenSecret          string
@@ -72,6 +73,7 @@ func Get() *Store {
 func init() {
 	s.BinaryName = binaryName
 	s.CFComponentType = "component"
+	s.CFGitSourceType = "git-source"
 	s.CFRuntimeDefType = "runtimeDef"
 	s.CFRuntimeType = "runtime"
 	s.CFTokenSecret = "codefresh-token"
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -34,8 +35,9 @@ const (
 )
 
 var (
-	spinnerCharSet  = spinner.CharSets[26]
-	spinnerDuration = time.Millisecond * 500
+	spinnerCharSet    = spinner.CharSets[26]
+	spinnerDuration   = time.Millisecond * 500
+	appsetFieldRegexp = regexp.MustCompile(`[\./]`)
 )
 
 // ContextWithCancelOnSignals returns a context that is canceled when one of the specified signals
@@ -149,3 +151,7 @@ func (ar *AsyncRunner) Wait() error {
 		return nil
 	}
 }
+
+func EscapeAppsetFieldName(field string) string {
+	return appsetFieldRegexp.ReplaceAllString(field, "_")
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.41`
	`1`	`+VERSION=v0.0.42`
`2`	`2`	`OUT_DIR=dist`
`3`	`3`	`YEAR?=$(shell date +"%Y")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {`
`187`	`187`	`if err != nil {`
`188`	`188`	`return fmt.Errorf("failed to get a runtime creation response: %w", err)`
`189`	`189`	`}`
	`190`	`+`
`190`	`191`	`opts.RuntimeToken = runtimeCreationResponse.NewAccessToken`
`191`	`192`
`192`	`193`	`log.G(ctx).WithField("version", rt.Spec.Version).Infof("installing runtime '%s'", opts.RuntimeName)`
`@@ -203,14 +204,17 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {`
`203`	`204`	`err = apcmd.RunProjectCreate(ctx, &apcmd.ProjectCreateOptions{`
`204`	`205`	`CloneOpts: opts.insCloneOpts,`
`205`	`206`	`ProjectName: opts.RuntimeName,`
	`207`	`+ Labels: map[string]string{`
	`208`	`+ store.Get().LabelKeyCFType: fmt.Sprintf("{{ labels.%s }}", util.EscapeAppsetFieldName(store.Get().LabelKeyCFType)),`
	`209`	`+ },`
`206`	`210`	`})`
`207`	`211`	`if err != nil {`
`208`	`212`	`return fmt.Errorf("failed to create project: %w", err)`
`209`	`213`	`}`
`210`	`214`
`211`	`215`	`for _, component := range rt.Spec.Components {`
`212`	`216`	`log.G(ctx).Infof("creating component '%s'", component.Name)`
`213`		`- if err = component.CreateApp(ctx, opts.KubeFactory, opts.insCloneOpts, opts.RuntimeName, rt.Spec.Version); err != nil {`
	`217`	`+ if err = component.CreateApp(ctx, opts.KubeFactory, opts.insCloneOpts, opts.RuntimeName, store.Get().CFComponentType, rt.Spec.Version); err != nil {`
`214`	`218`	`return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)`
`215`	`219`	`}`
`216`	`220`	`}`
`@@ -464,7 +468,7 @@ func RunRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {`
`464`	`468`
`465`	`469`	`for _, component := range newComponents {`
`466`	`470`	`log.G(ctx).Infof("Creating app '%s'", component.Name)`
`467`		`- if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, newRt.Spec.Version); err != nil {`
	`471`	`+ if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, store.Get().CFComponentType, newRt.Spec.Version); err != nil {`
`468`	`472`	`return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)`
`469`	`473`	`}`
`470`	`474`	`}`
`@@ -504,7 +508,7 @@ func createComponentsReporter(ctx context.Context, cloneOpts *git.CloneOptions,`
`504`	`508`	`Type: application.AppTypeDirectory,`
`505`	`509`	`URL: cloneOpts.URL() + "/" + resPath,`
`506`	`510`	`}`
`507`		`- if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, nil); err != nil {`
	`511`	`+ if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType, nil); err != nil {`
`508`	`512`	`return err`
`509`	`513`	`}`
`510`	`514`
`@@ -543,18 +547,10 @@ func updateProject(repofs fs.FS, runtimeName string) error {`
`543`	`547`	`return err`
`544`	`548`	`}`
`545`	`549`
`546`		`- if appset.Spec.Template.Labels == nil {`
`547`		`- appset.Spec.Template.Labels = make(map[string]string)`
`548`		`- }`
`549`		`- if appset.Labels == nil {`
`550`		`- appset.Labels = make(map[string]string)`
`551`		`- }`
`552`		`-`
`553`	`550`	`if project.ObjectMeta.Labels == nil {`
`554`	`551`	`project.ObjectMeta.Labels = make(map[string]string)`
`555`	`552`	`}`
`556`	`553`
`557`		`- appset.Spec.Template.Labels[store.Get().LabelKeyCFType] = store.Get().CFComponentType`
`558`	`554`	`project.ObjectMeta.Labels[store.Get().LabelKeyCFType] = store.Get().CFRuntimeType`
`559`	`555`	`return repofs.WriteYamls(projPath, project, appset)`
`560`	`556`	`}`
`@@ -884,7 +880,7 @@ func createGitSource(ctx context.Context, insCloneOpts *git.CloneOptions, gsClon`
`884`	`880`	`Type: application.AppTypeDirectory,`
`885`	`881`	`URL: insCloneOpts.URL() + insFs.Join(insFs.Root(), resPath),`
`886`	`882`	`}`
`887`		`- if err = appDef.CreateApp(ctx, nil, insCloneOpts, runtimeName, nil); err != nil {`
	`883`	`+ if err = appDef.CreateApp(ctx, nil, insCloneOpts, runtimeName, store.Get().CFGitSourceType, nil); err != nil {`
`888`	`884`	`return fmt.Errorf("failed to create git-source: %w", err)`
`889`	`885`	`}`
`890`	`886`