Merge pull request #355 from kube-tarian/argocd_create_repo_git_commit

added argocd repo and git commit changes
kube-tarian · Dec 30, 2023 · ea673d7 · ea673d7
2 parents 6e78d4a + 07522dc
commit ea673d7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/capten/agent/internal/api/plugin_argocd_apis.go b/capten/agent/internal/api/plugin_argocd_apis.go
@@ -162,6 +162,7 @@ func (a *Agent) addProjectToArgoCD(ctx context.Context, projectUrl, userID, acce
 		Insecure:              false,
 		EnableLFS:             false,
 		InsecureIgnoreHostKey: false,
+		Upsert:                true,
 		ConnectionState: argocd.ConnectionState{
 			Status:  "Connected",
 			Message: "Repository is connected",

diff --git a/capten/common-pkg/plugins/argocd/config.go b/capten/common-pkg/plugins/argocd/config.go
@@ -27,4 +27,5 @@ type Repository struct {
 	EnableLFS             bool            `json:"EnableLFS"`
 	InsecureIgnoreHostKey bool            `json:"InsecureIgnoreHostKey"`
 	ConnectionState       ConnectionState `json:"ConnectionState"`
+	Upsert                bool            `json:"Upsert"`
 }
diff --git a/capten/common-pkg/plugins/argocd/repositories.go b/capten/common-pkg/plugins/argocd/repositories.go
@@ -31,6 +31,7 @@ func (a *ArgoCDClient) CreateRepository(ctx context.Context, repo *Repository) (
 				Message: repo.ConnectionState.Message,
 			},
 		},
+		Upsert: repo.Upsert,
 	})
 	if err != nil {
 		return nil, err

diff --git a/capten/common-pkg/plugins/git/git.go b/capten/common-pkg/plugins/git/git.go
@@ -10,6 +10,7 @@ import (
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/intelops/go-common/logging"
 )
 
 type GitClient struct {
@@ -74,6 +75,15 @@ func (g *GitClient) Commit(msg, name, email string) error {
 		return err
 	}
 
+	status, err := w.Status()
+	if err != nil {
+		return err
+	}
+
+	if status.IsClean() {
+		logging.NewLogger().Info("No commit changes found.")
+		return nil
+	}
 	_, err = w.Commit(msg, &git.CommitOptions{
 		Author: &object.Signature{
 			Name:  name,