Merge branch 'master' into gitlab-pull-push-checker

api/context/context.go

@@ -212,7 +212,7 @@ func New(client *kommons.Client, kubernetes kubernetes.Interface, db *gorm.DB, c
 }
 
 func (ctx *Context) IsDebug() bool {
-	return ctx.Canary.IsDebug()
+	return ctx.Canary.IsDebug() || ctx.IsTrace()
 }
 
 func (ctx *Context) IsTrace() bool {

api/v1/canary_types.go

@@ -61,7 +61,7 @@ type CanarySpec struct {
 	MongoDB        []MongoDBCheck        `yaml:"mongodb,omitempty" json:"mongodb,omitempty"`
 	CloudWatch     []CloudWatchCheck     `yaml:"cloudwatch,omitempty" json:"cloudwatch,omitempty"`
 	GitHub         []GitHubCheck         `yaml:"github,omitempty" json:"github,omitempty"`
-	GitLab         []GitLabCheck         `yaml:"gitlab,omitempty" json:"gitlab,omitempty"`
+	GitProtocol    []GitProtocolCheck    `yaml:"gitProtocol,omitempty" json:"gitProtocol,omitempty"`
 	Kubernetes     []KubernetesCheck     `yaml:"kubernetes,omitempty" json:"kubernetes,omitempty"`
 	Folder         []FolderCheck         `yaml:"folder,omitempty" json:"folder,omitempty"`
 	Exec           []ExecCheck           `yaml:"exec,omitempty" json:"exec,omitempty"`
@@ -162,7 +162,7 @@ func (spec CanarySpec) GetAllChecks() []external.Check {
 	for _, check := range spec.GitHub {
 		checks = append(checks, check)
 	}
-	for _, check := range spec.GitLab {
+	for _, check := range spec.GitProtocol {
 		checks = append(checks, check)
 	}
 	for _, check := range spec.Kubernetes {

api/v1/checks.go

@@ -779,20 +779,21 @@ func (c GitHubCheck) GetEndpoint() string {
 	return strings.ReplaceAll(c.Query, " ", "-")
 }
 
-type GitLabCheck struct {
+type GitProtocolCheck struct {
 	Description    `yaml:",inline" json:",inline"`
 	Templatable    `yaml:",inline" json:",inline"`
 	ConnectionName string       `yaml:"connection,omitempty" json:"connection,omitempty"`
 	Repository     string       `yaml:"repository" json:"repository"`
-	Username       string       `yaml:"username" json:"username"`
-	Password       types.EnvVar `yaml:"password,omitempty" json:"password,omitempty"`
+	FileName       string       `yaml:"filename,omitempty" json:"filename,omitempty"`
+	Username       types.EnvVar `yaml:"username" json:"username"`
+	Password       types.EnvVar `yaml:"password" json:"password"`
 }
 
-func (c GitLabCheck) GetType() string {
-	return "gitProtocol"
+func (c GitProtocolCheck) GetType() string {
+	return "gitprotocol"
 }
 
-func (c GitLabCheck) GetEndpoint() string {
+func (c GitProtocolCheck) GetEndpoint() string {
 	return strings.ReplaceAll(c.Repository, "/", "-")
 }
 
@@ -1370,7 +1371,7 @@ var AllChecks = []external.Check{
 	ExecCheck{},
 	FolderCheck{},
 	GitHubCheck{},
-	GitLabCheck{},
+	GitProtocolCheck{},
 	HelmCheck{},
 	HTTPCheck{},
 	ICMPCheck{},

checks/checker.go

@@ -37,7 +37,7 @@ var All = []Checker{
 	&ExecChecker{},
 	&FolderChecker{},
 	&GitHubChecker{},
-	&GitLabChecker{},
+	&GitProtocolChecker{},
 	&HTTPChecker{},
 	&IcmpChecker{},
 	&JmeterChecker{},

checks/gitlab.go → checks/git_protocol.go

@@ -16,24 +16,24 @@ import (
 )
 
 const (
-	TestFileName = "test.txt"
+	DefaultFileName = "test.txt"
 )
 
-type GitLabChecker struct{}
+type GitProtocolChecker struct{}
 
-func (c *GitLabChecker) Type() string {
-	return "gitlab"
+func (c *GitProtocolChecker) Type() string {
+	return "gitprotocol"
 }
 
-func (c *GitLabChecker) Run(ctx *context.Context) pkg.Results {
+func (c *GitProtocolChecker) Run(ctx *context.Context) pkg.Results {
 	var results pkg.Results
-	for _, conf := range ctx.Canary.Spec.GitLab {
+	for _, conf := range ctx.Canary.Spec.GitProtocol {
 		results = append(results, c.Check(ctx, conf)...)
 	}
 	return results
 }
 
-func pushChanges(repoURL, username, password string) error {
+func pushChanges(repoURL, username, password, filename string) error {
 	dir, err := os.MkdirTemp("", "repo-clone-")
 	if err != nil {
 		return fmt.Errorf("failed to create temp directory: %v", err)
@@ -53,7 +53,7 @@ func pushChanges(repoURL, username, password string) error {
 		return fmt.Errorf("failed to get worktree: %v", err)
 	}
 
-	filePath := path.Join(dir, TestFileName)
+	filePath := path.Join(dir, filename)
 	currentTime := time.Now().Format("2006-01-02-04-05")
 
 	// Check if the file exists and if not we will create it
@@ -70,11 +70,11 @@ func pushChanges(repoURL, username, password string) error {
 		return fmt.Errorf("failed to update file: %v", err)
 	}
 
-	if _, err := w.Add(TestFileName); err != nil {
+	if _, err := w.Add(filename); err != nil {
 		return fmt.Errorf("failed to add changes to staging area: %v", err)
 	}
 
-	commitMsg := fmt.Sprintf("Updated %s with time %s", TestFileName, currentTime)
+	commitMsg := fmt.Sprintf("Updated %s with time %s", filename, currentTime)
 	if _, err := w.Commit(commitMsg, &git.CommitOptions{
 		Author: &object.Signature{
 			Name:  username,
@@ -94,25 +94,37 @@ func pushChanges(repoURL, username, password string) error {
 	return nil
 }
 
-func (c *GitLabChecker) Check(ctx *context.Context, extConfig external.Check) pkg.Results {
-	check := extConfig.(v1.GitLabCheck)
+func (c *GitProtocolChecker) Check(ctx *context.Context, extConfig external.Check) pkg.Results {
+	check := extConfig.(v1.GitProtocolCheck)
 	result := pkg.Success(check, ctx.Canary)
 	var results pkg.Results
 	results = append(results, result)
 
-	// Fetching GitLab Token
+	filename := check.FileName
+
+	if len(filename) == 0 {
+		filename = DefaultFileName
+	}
+
+	// Fetching Username
+	username, err := ctx.GetEnvValueFromCache(check.Username)
+	if err != nil {
+		return results.Failf("error fetching git user from env cache: %v", err)
+	}
+
+	// Fetching Password
 	password, err := ctx.GetEnvValueFromCache(check.Password)
 	if err != nil {
-		return results.Failf("error fetching gitlab token from env cache: %v", err)
+		return results.Failf("error fetching git password from env cache: %v", err)
 	}
 
 	// Push Changes
-	if err := pushChanges(check.Repository, check.Username, password); err != nil {
+	if err := pushChanges(check.Repository, username, password, filename); err != nil {
 		return results.Failf("error pushing changes: %v", err)
 	}
 
 	details := map[string]string{
-		"msg": "GitLab pull/push command succeeded.",
+		"msg": "Git pull/push command succeeded.",
 	}
 	result.AddDetails(details)