github deployment optional automerge

carloscastrojumo · Aug 9, 2023 · 7c39ccc · 7c39ccc
1 parent e3e9fda
commit 7c39ccc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/services/github.go b/pkg/services/github.go
@@ -52,6 +52,7 @@ type GitHubDeployment struct {
 	EnvironmentURL   string   `json:"environmentURL,omitempty"`
 	LogURL           string   `json:"logURL,omitempty"`
 	RequiredContexts []string `json:"requiredContexts"`
+	AutoMerge        bool     `json:"autoMerge,omitempty"`
 }
 
 const (
@@ -191,6 +192,7 @@ func (g *GitHubNotification) GetTemplater(name string, f texttemplate.FuncMap) (
 			}
 			notification.GitHub.Deployment.LogURL = logURLData.String()
 
+			notification.GitHub.Deployment.AutoMerge = g.Deployment.AutoMerge
 			notification.GitHub.Deployment.RequiredContexts = g.Deployment.RequiredContexts
 		}
 

diff --git a/pkg/services/github_test.go b/pkg/services/github_test.go
@@ -117,6 +117,7 @@ func TestGetTemplater_GitHub_Deployment(t *testing.T) {
 				EnvironmentURL:   "https://argoproj.github.io",
 				LogURL:           "https://argoproj.github.io/log",
 				RequiredContexts: []string{},
+				AutoMerge:        false,
 			},
 		},
 	}
@@ -156,6 +157,7 @@ func TestGetTemplater_GitHub_Deployment(t *testing.T) {
 	assert.Equal(t, "https://argoproj.github.io", notification.GitHub.Deployment.EnvironmentURL)
 	assert.Equal(t, "https://argoproj.github.io/log", notification.GitHub.Deployment.LogURL)
 	assert.Len(t, notification.GitHub.Deployment.RequiredContexts, 0)
+	assert.Equal(t, false, notification.GitHub.Deployment.AutoMerge)
 }
 
 func TestNewGitHubService_GitHubOptions(t *testing.T) {