feat: add prevent_self_approve option

runatlantis · Aug 7, 2024 · d376934 · d376934
1 parent a30225d
commit d376934
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 35 deletions.
diff --git a/server/core/config/raw/policies.go b/server/core/config/raw/policies.go
@@ -70,12 +70,12 @@ func (o PolicyOwners) ToValid() valid.PolicyOwners {
 }
 
 type PolicySet struct {
-	Path         string       `yaml:"path" json:"path"`
-	Source       string       `yaml:"source" json:"source"`
-	Name         string       `yaml:"name" json:"name"`
-	Owners       PolicyOwners `yaml:"owners,omitempty" json:"owners,omitempty"`
-	ApproveCount int          `yaml:"approve_count,omitempty" json:"approve_count,omitempty"`
-	SelfApprove  bool         `yaml:"self_approve,omitempty" json:"self_approve,omitempty"`
+	Path               string       `yaml:"path" json:"path"`
+	Source             string       `yaml:"source" json:"source"`
+	Name               string       `yaml:"name" json:"name"`
+	Owners             PolicyOwners `yaml:"owners,omitempty" json:"owners,omitempty"`
+	ApproveCount       int          `yaml:"approve_count,omitempty" json:"approve_count,omitempty"`
+	PreventSelfApprove bool         `yaml:"self_approve,omitempty" json:"prevent_self_approve,omitempty"`
 }
 
 func (p PolicySet) Validate() error {
@@ -95,7 +95,7 @@ func (p PolicySet) ToValid() valid.PolicySet {
 	policySet.Path = p.Path
 	policySet.Source = p.Source
 	policySet.ApproveCount = p.ApproveCount
-	policySet.SelfApprove = p.SelfApprove
+	policySet.PreventSelfApprove = p.PreventSelfApprove
 	policySet.Owners = p.Owners.ToValid()
 
 	return policySet

diff --git a/server/core/config/valid/policies.go b/server/core/config/valid/policies.go
@@ -27,12 +27,12 @@ type PolicyOwners struct {
 }
 
 type PolicySet struct {
-	Source       string
-	Path         string
-	Name         string
-	ApproveCount int
-	Owners       PolicyOwners
-	SelfApprove  bool
+	Source             string
+	Path               string
+	Name               string
+	ApproveCount       int
+	Owners             PolicyOwners
+	PreventSelfApprove bool
 }
 
 func (p *PolicySets) HasPolicies() bool {

diff --git a/server/events/project_command_runner.go b/server/events/project_command_runner.go
@@ -377,7 +377,7 @@ func (p *DefaultProjectCommandRunner) doApprovePolicies(ctx command.ProjectConte
 					ignorePolicy = true
 				}
 				// Increment approval if user is owner.
-				if isOwner && !ignorePolicy && (ctx.User.Username != ctx.Pull.Author || policySet.SelfApprove) {
+				if isOwner && !ignorePolicy && (ctx.User.Username != ctx.Pull.Author || !policySet.PreventSelfApprove) {
 					if !ctx.ClearPolicyApproval {
 						prjPolicyStatus[i].Approvals = policyStatus.Approvals + 1
 					} else {

diff --git a/server/events/project_command_runner_test.go b/server/events/project_command_runner_test.go
@@ -791,12 +791,10 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 					{
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Name:         "policy2",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -825,12 +823,10 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Name:         "policy2",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -859,12 +855,10 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 					{
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Name:         "policy2",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -894,12 +888,10 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Name:         "policy2",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -928,7 +920,6 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -959,7 +950,6 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -993,15 +983,13 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Owners: valid.PolicyOwners{
 							Teams: []string{"someuserteam"},
 						},
 						Name:         "policy2",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -1044,15 +1032,13 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Owners: valid.PolicyOwners{
 							Teams: []string{"someuserteam"},
 						},
 						Name:         "policy2",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -1095,15 +1081,13 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Owners: valid.PolicyOwners{
 							Teams: []string{"someotheruserteam"},
 						},
 						Name:         "policy2",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -1147,15 +1131,13 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Owners: valid.PolicyOwners{
 							Teams: []string{"someuserteam"},
 						},
 						Name:         "policy2",
 						ApproveCount: 2,
-						SelfApprove:  true,
 					},
 				},
 			},
@@ -1198,14 +1180,14 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
 						},
 						Name:         "policy1",
 						ApproveCount: 1,
-						SelfApprove:  true,
 					},
 					{
 						Owners: valid.PolicyOwners{
 							Users: []string{"lkysow"},
 						},
-						Name:         "policy2",
-						ApproveCount: 1,
+						Name:               "policy2",
+						ApproveCount:       1,
+						PreventSelfApprove: true,
 					},
 				},
 			},