Bump argocd autopilot (#299)

roi-codefresh · web-flow · commit 63ec9c684bcd · 2022-03-10T18:02:44.000+02:00
* bumped argocd-autopilot

* bump

* codegen
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.274
+VERSION=v0.0.275
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
diff --git a/cmd/commands/git-source.go b/cmd/commands/git-source.go
@@ -194,7 +194,7 @@ func NewGitSourceCreateCommand() *cobra.Command {
 
 	cmd.Flags().BoolVar(&createRepo, "create-repo", false, "If true, will create the specified git-source repo in case it doesn't already exist")
 
-	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{CloneForWrite: true})
 	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		Prefix:   "git-src",
 		Optional: true,
@@ -564,7 +564,7 @@ func NewGitSourceDeleteCommand() *cobra.Command {
 		},
 	}
 
-	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
+	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{CloneForWrite: true})
 
 	return cmd
 }
@@ -637,6 +637,7 @@ func NewGitSourceEditCommand() *cobra.Command {
 
 	insCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		CreateIfNotExist: true,
+		CloneForWrite:    true,
 	})
 
 	gsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -263,6 +263,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 
 	installationOpts.InsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
 		CreateIfNotExist: true,
+		CloneForWrite:    true,
 	})
 
 	installationOpts.GsCloneOpts = &git.CloneOptions{
@@ -1393,7 +1394,7 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 	cmd.Flags().BoolVar(&uninstallationOpts.Force, "force", false, "If true, will guarantee the runtime is removed from the platform, even in case of errors while cleaning the repo and the cluster")
 	cmd.Flags().BoolVar(&uninstallationOpts.FastExit, "fast-exit", false, "If true, will not wait for deletion of cluster resources. This means that full resource deletion will not be verified")
 
-	uninstallationOpts.CloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
+	uninstallationOpts.CloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{CloneForWrite: true})
 	uninstallationOpts.KubeFactory = kube.AddFlags(cmd.Flags())
 
 	return cmd
@@ -1667,7 +1668,7 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&versionStr, "version", "", "The runtime version to upgrade to, defaults to latest")
-	opts.CloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
+	opts.CloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{CloneForWrite: true})
 
 	return cmd
 }
@@ -1919,10 +1920,19 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 	}
 
 	resPath := cloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().EventsReporterName, opts.RuntimeName, "resources")
+	u, err := url.Parse(cloneOpts.URL())
+	if err != nil {
+		return fmt.Errorf("failed to parse url: %w", err)
+	}
+	u.Path += "/" + resPath
+	q := u.Query()
+	q.Add("ref", cloneOpts.Revision())
+	u.RawQuery = q.Encode()
+
 	appDef := &runtime.AppDef{
 		Name:       store.Get().EventsReporterName,
 		Type:       application.AppTypeDirectory,
-		URL:        cloneOpts.URL() + "/" + resPath,
+		URL:        u.String(),
 		IsInternal: true,
 	}
 	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType, "", ""); err != nil {
@@ -1950,10 +1960,19 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 
 func createReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions, reporterCreateOpts reporterCreateOptions) error {
 	resPath := cloneOpts.FS.Join(apstore.Default.AppsDir, reporterCreateOpts.reporterName, opts.RuntimeName, "resources")
+	u, err := url.Parse(cloneOpts.URL())
+	if err != nil {
+		return fmt.Errorf("failed to parse url: %w", err)
+	}
+	u.Path += "/" + resPath
+	q := u.Query()
+	q.Add("ref", cloneOpts.Revision())
+	u.RawQuery = q.Encode()
+
 	appDef := &runtime.AppDef{
 		Name:       reporterCreateOpts.reporterName,
 		Type:       application.AppTypeDirectory,
-		URL:        cloneOpts.URL() + "/" + resPath,
+		URL:        u.String(),
 		IsInternal: reporterCreateOpts.IsInternal,
 	}
 	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType, "", ""); err != nil {
diff --git a/docs/commands/cli-v2_git-source_create.md b/docs/commands/cli-v2_git-source_create.md
@@ -25,6 +25,7 @@ cli-v2 git-source create RUNTIME_NAME GITSOURCE_NAME [flags]
   -u, --git-user string            Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help                       help for create
       --repo string                Repository URL [GIT_REPO]
+  -b, --upsert-branch              If true will try to checkout the specified branch and create it if it doesn't exist
 ```
 
 ### Options inherited from parent commands
diff --git a/docs/commands/cli-v2_git-source_delete.md b/docs/commands/cli-v2_git-source_delete.md
@@ -21,6 +21,7 @@ cli-v2 git-source delete RUNTIME_NAME GITSOURCE_NAME [flags]
   -u, --git-user string    Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help               help for delete
       --repo string        Repository URL [GIT_REPO]
+  -b, --upsert-branch      If true will try to checkout the specified branch and create it if it doesn't exist
 ```
 
 ### Options inherited from parent commands
diff --git a/docs/commands/cli-v2_git-source_edit.md b/docs/commands/cli-v2_git-source_edit.md
@@ -26,6 +26,7 @@ cli-v2 git-source edit RUNTIME_NAME GITSOURCE_NAME [flags]
   -h, --help                       help for edit
       --provider string            The git provider, one of: azure|gitea|github|gitlab
       --repo string                Repository URL [GIT_REPO]
+  -b, --upsert-branch              If true will try to checkout the specified branch and create it if it doesn't exist
 ```
 
 ### Options inherited from parent commands
diff --git a/docs/commands/cli-v2_runtime_install.md b/docs/commands/cli-v2_runtime_install.md
@@ -44,6 +44,7 @@ cli-v2 runtime install [runtime_name] [flags]
       --repo string                 Repository URL [GIT_REPO]
       --skip-cluster-checks         Skips the cluster's checks
       --skip-ingress                Skips the creation of ingress resources
+  -b, --upsert-branch               If true will try to checkout the specified branch and create it if it doesn't exist
       --version string              The runtime version to install (default: latest)
       --wait-timeout duration       How long to wait for the runtime components to be ready (default 8m0s)
 ```
diff --git a/docs/commands/cli-v2_runtime_uninstall.md b/docs/commands/cli-v2_runtime_uninstall.md
@@ -38,6 +38,7 @@ cli-v2 runtime uninstall [RUNTIME_NAME] [flags]
   -n, --namespace string        If present, the namespace scope for this CLI request
       --repo string             Repository URL [GIT_REPO]
       --skip-checks             If true, will not verify that runtime exists before uninstalling
+  -b, --upsert-branch           If true will try to checkout the specified branch and create it if it doesn't exist
       --wait-timeout duration   How long to wait for the runtime components to be deleted (default 8m0s)
 ```
 
diff --git a/docs/commands/cli-v2_runtime_upgrade.md b/docs/commands/cli-v2_runtime_upgrade.md
@@ -32,6 +32,7 @@ cli-v2 runtime upgrade [RUNTIME_NAME] [flags]
   -u, --git-user string    Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help               help for upgrade
       --repo string        Repository URL [GIT_REPO]
+  -b, --upsert-branch      If true will try to checkout the specified branch and create it if it doesn't exist
       --version string     The runtime version to upgrade to, defaults to latest
 ```
 
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.274/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.275/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.274/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.275/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.2.0
-	github.com/argoproj-labs/argocd-autopilot v0.2.30
+	github.com/argoproj-labs/argocd-autopilot v0.2.31
 	github.com/argoproj/argo-cd/v2 v2.1.9
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/argo-workflows/v3 v3.1.6
diff --git a/go.sum b/go.sum
@@ -172,8 +172,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.2.0 h1:yq3u88VtH9bXAl8DkIzBi0Q5FCe/ExZHlnGHDxxsyY4=
 github.com/argoproj-labs/applicationset v0.2.0/go.mod h1:vElTdgajynEAIRuQMqQwYWSWTbdgrQPW6zDsxNPs+NE=
-github.com/argoproj-labs/argocd-autopilot v0.2.30 h1:tSn4DqW3J1iMzfmkcjyhFlsfEM0RVhAfsRfdQG8Xg5E=
-github.com/argoproj-labs/argocd-autopilot v0.2.30/go.mod h1:d9H2xQ1DZt8jw5aFMp2JWpi9OhmXfQ+ZDd9z4k3N2+4=
+github.com/argoproj-labs/argocd-autopilot v0.2.31 h1:EzXJsyBaq4JwTirgA9hbybJSZ0MoSwwQN2tU6m7tdkI=
+github.com/argoproj-labs/argocd-autopilot v0.2.31/go.mod h1:d9H2xQ1DZt8jw5aFMp2JWpi9OhmXfQ+ZDd9z4k3N2+4=
 github.com/argoproj/argo-cd/v2 v2.1.0-rc2/go.mod h1:a21F1IEszRrCLvXXYc1sML3mjlMN3pp6rpDxy+7E0os=
 github.com/argoproj/argo-cd/v2 v2.1.0/go.mod h1:/e8fSyHanaAHLR5YsIIWfCGujTN452K6L7DaYep5KRU=
 github.com/argoproj/argo-cd/v2 v2.1.9 h1:D9YnPQq4xDec2Awm8ANjioEuRfJcjtdlrsQRmVR7l1s=
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.274
+  version: 0.0.275
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/util/aputil/aputil.go b/pkg/util/aputil/aputil.go
@@ -38,6 +38,7 @@ type CloneFlagsOptions struct {
 	Prefix           string
 	Optional         bool
 	CreateIfNotExist bool
+	CloneForWrite    bool
 	Progress         io.Writer
 }
 
@@ -46,6 +47,7 @@ func AddCloneFlags(cmd *cobra.Command, o *CloneFlagsOptions) *git.CloneOptions {
 		FS:               memfs.New(),
 		Prefix:           o.Prefix,
 		CreateIfNotExist: o.CreateIfNotExist,
+		CloneForWrite:    o.CloneForWrite,
 		Optional:         o.Optional,
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.274`
	`1`	`+VERSION=v0.0.275`
`2`	`2`
`3`	`3`	`OUT_DIR=dist`
`4`	`4`	`YEAR?=$(shell date +"%Y")`