Merge pull request #7 from aiven/rkar-remove-requester-from-approvers

remove requester from approvers

main.go

@@ -128,7 +128,7 @@ func main() {
 	result := Result{Ok: true, Errors: []ResultError{}}
 
 	requester := findExternalIdentity(*requesterID, &plan)
-	approvers := findApprovers(strings.Split(*approverIDs, ","), &plan)
+	approvers := findApprovers(strings.Split(*approverIDs, ","), *requesterID, &plan)
 
 	for _, resourceChange := range plan.Changes {
 		if resourceChange.Type == AivenKafkaTopic {
@@ -149,11 +149,11 @@ func findExternalIdentity(userID string, plan *Plan) *StateResource {
 	return nil
 }
 
-func findApprovers(approverIDs []string, plan *Plan) []*StateResource {
+func findApprovers(approverIDs []string, requesterID string, plan *Plan) []*StateResource {
 	var approvers []*StateResource
 	for _, approverID := range approverIDs {
 		approver := findExternalIdentity(approverID, plan)
-		if approver != nil {
+		if approver != nil && requesterID != approverID {
 			approvers = append(approvers, approver)
 		}
 	}

main_test.go

@@ -126,6 +126,16 @@ func TestE2E_Plans(t *testing.T) {
 				ExpectStdout: `{"ok":false,"errors":\[{"error":"approval is required from a member of the owner group","address":"aiven_kafka_topic.foo"}\]}`, //nolint:lll
 				ExpectStderr: "",
 			},
+			{
+				Name: fmt.Sprintf("[%s] Does not consider requester as approver", plan),
+				Args: Args{
+					Requester: "alice",
+					Approvers: "alice",
+					Plan:      plan,
+				},
+				ExpectStdout: `{"ok":false,"errors":\[{"error":"approval is required from a member of the owner group","address":"aiven_kafka_topic.foo"}\]}`, //nolint:lll
+				ExpectStderr: "",
+			},
 		}
 		all_tests = append(all_tests, tests...)
 	}