Bump github.com/argoproj/argo-cd/v2 from 2.5.9 to 2.7.6 (#488)

* Bump github.com/argoproj/argo-cd/v2 from `2.5.9` to `2.8.3` * Bump github.com/go-git/go-billy/v5 `5.3.1` to `5.4.1` * Bump github.com/go-git/go-git/v5 `5.4.2` to `5.7.0` * Bump github.com/sirupsen/logrus `1.8.1` to `1.9.3` * Bump github.com/spf13/cobra `1.5.0` to `1.7.0` Bumps [github.com/argoproj/argo-cd/v2](https://github.com/argoproj/argo-cd) from 2.5.9 to 2.8.3. - [Release notes](https://github.com/argoproj/argo-cd/releases) - [Changelog](https://github.com/argoproj/argo-cd/blob/master/CHANGELOG.md) - [Commits](argoproj/argo-cd@v2.5.9...v2.8.3) --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Noam Gal <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Noam Gal <[email protected]>
argoproj-labs · Sep 12, 2023 · da9b57c · da9b57c
1 parent 5b7eafb
commit da9b57c
Show file tree

Hide file tree

Showing 8 changed files with 463 additions and 801 deletions.
diff --git a/.snyk b/.snyk
@@ -1,7 +1,3 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
 version: v1.22.2
-ignore:
-  SNYK-GOLANG-GITHUBCOMEMICKLEIGORESTFUL-2435653:
-    - "*":
-        reason: Ignore because there is no fix inside of latest version of github.com/argoproj/argo-cd
-        expires: 2022-10-13T17:33:45.004Z
+ignore: {}
diff --git a/cmd/commands/common.go b/cmd/commands/common.go
@@ -107,7 +107,7 @@ func createApp(opts *createAppOptions) ([]byte, error) {
 		},
 		Spec: argocdv1alpha1.ApplicationSpec{
 			Project: "default",
-			Source: argocdv1alpha1.ApplicationSource{
+			Source: &argocdv1alpha1.ApplicationSource{
 				RepoURL:        opts.repoURL,
 				Path:           opts.srcPath,
 				TargetRevision: opts.revision,
@@ -222,7 +222,7 @@ func createAppSet(o *createAppSetOptions) ([]byte, error) {
 				},
 				Spec: argocdv1alpha1.ApplicationSpec{
 					Project: o.appProject,
-					Source: argocdv1alpha1.ApplicationSource{
+					Source: &argocdv1alpha1.ApplicationSource{
 						RepoURL:        o.repoURL,
 						Path:           o.srcPath,
 						TargetRevision: o.revision,

diff --git a/cmd/commands/project.go b/cmd/commands/project.go
@@ -324,7 +324,7 @@ func generateProjectManifests(o *GenerateProjectOptions) (projectYAML, appSetYAM
 					RequeueAfterSeconds: &DefaultApplicationSetGeneratorInterval,
 					Template: argocdv1alpha1.ApplicationSetTemplate{
 						Spec: argocdv1alpha1.ApplicationSpec{
-							Source: argocdv1alpha1.ApplicationSource{
+							Source: &argocdv1alpha1.ApplicationSource{
 								Directory: &argocdv1alpha1.ApplicationSourceDirectory{
 									Recurse: true,
 									Exclude: "{{ exclude }}",

diff --git a/docs/commands/argocd-autopilot_project_create.md b/docs/commands/argocd-autopilot_project_create.md
@@ -36,6 +36,7 @@ argocd-autopilot project create [PROJECT] [flags]
       --aws-role-arn string                Optional AWS role arn. If set then AWS IAM Authenticator assumes a role to perform cluster operations instead of the default AWS credential provider chain.
       --client-crt string                  Client certificate file
       --client-crt-key string              Client certificate key file
+      --cluster-endpoint string            Cluster endpoint to use. Can be one of the following: 'kubeconfig', 'kube-public', or 'internal'.
       --cluster-resources                  Indicates if cluster level resources should be managed. The setting is used only if list of managed namespaces is not empty.
       --config string                      Path to Argo CD config (default "/home/user/.config/argocd/config")
       --core                               If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/git/provider_ado_test.go b/pkg/git/provider_ado_test.go
@@ -32,7 +32,7 @@ func Test_adoGit_CreateRepository(t *testing.T) {
 		{
 			name: "Failure creating repo",
 			mockClient: func(client *adoMock.MockAdoClient, url *adoMock.MockAdoUrl) {
-				client.EXPECT().CreateRepository(context.TODO(), gomock.AssignableToTypeOf(ado.CreateRepositoryArgs{})).
+				client.EXPECT().CreateRepository(context.Background(), gomock.AssignableToTypeOf(ado.CreateRepositoryArgs{})).
 					Times(1).
 					Return(nil, errors.New("ah an error"))
 				url.EXPECT().GetProjectName().
@@ -51,7 +51,7 @@ func Test_adoGit_CreateRepository(t *testing.T) {
 				url.EXPECT().GetProjectName().
 					Times(1).
 					Return("PROJECT")
-				client.EXPECT().CreateRepository(context.TODO(), gomock.AssignableToTypeOf(ado.CreateRepositoryArgs{})).
+				client.EXPECT().CreateRepository(context.Background(), gomock.AssignableToTypeOf(ado.CreateRepositoryArgs{})).
 					Times(1).
 					Return(&ado.GitRepository{
 						Links:            nil,

diff --git a/pkg/git/repository.go b/pkg/git/repository.go
@@ -359,6 +359,7 @@ func (r *repo) commit(ctx context.Context, opts *PushOptions) (*plumbing.Hash, e
 	h, err = w.Commit(opts.CommitMsg, &gg.CommitOptions{
 		All:    true,
 		Author: author,
+		AllowEmptyCommits: true,
 	})
 	if err != nil {
 		return nil, err