campaigns: allow user to set git commit author

enterprise/internal/campaigns/reconciler.go

@@ -340,6 +340,16 @@ func buildCommitOpts(repo *repos.Repo, spec *campaigns.ChangesetSpec) (protocol.
 		return opts, err
 	}
 
+	commitAuthorName, err := desc.AuthorName()
+	if err != nil {
+		return opts, err
+	}
+
+	commitAuthorEmail, err := desc.AuthorEmail()
+	if err != nil {
+		return opts, err
+	}
+
 	opts = protocol.CreateCommitFromPatchRequest{
 		Repo:       api.RepoName(repo.Name),
 		BaseCommit: api.CommitID(desc.BaseRev),
@@ -356,8 +366,8 @@ func buildCommitOpts(repo *repos.Repo, spec *campaigns.ChangesetSpec) (protocol.
 
 		CommitInfo: protocol.PatchCommitInfo{
 			Message:     commitMessage,
-			AuthorName:  "Sourcegraph",
-			AuthorEmail: "campaigns@sourcegraph.com",
+			AuthorName:  commitAuthorName,
+			AuthorEmail: commitAuthorEmail,
 			Date:        spec.CreatedAt,
 		},
 		// We use unified diffs, not git diffs, which means they're missing the

enterprise/internal/campaigns/testing/specs.go

@@ -91,7 +91,7 @@ index e5af166..d44c3fc 100644
 		"published": false,
 
 		"commits": [
-		  {"message": "git commit message", "diff": %q}]
+		  {"message": "git commit message", "diff": %q, "authorName": "Mary McButtons", "authorEmail": "mary@example.com"}]
 	}`
 
 	return fmt.Sprintf(tmpl, repo, baseRev, repo, diff)

internal/campaigns/types.go

@@ -1956,9 +1956,35 @@ func (d *ChangesetSpecDescription) CommitMessage() (string, error) {
 	return d.Commits[0].Message, nil
 }
 
+// AuthorName returns the author name of the first GitCommitDescription in Commits. If the
+// ChangesetSpecDescription doesn't have Commits it returns ErrNoCommits.
+//
+// We currently only support a single commit in Commits. Once we support more,
+// this method will need to be revisited.
+func (d *ChangesetSpecDescription) AuthorName() (string, error) {
+	if len(d.Commits) == 0 {
+		return "", ErrNoCommits
+	}
+	return d.Commits[0].AuthorName, nil
+}
+
+// AuthorEmail returns the author email of the first GitCommitDescription in Commits. If the
+// ChangesetSpecDescription doesn't have Commits it returns ErrNoCommits.
+//
+// We currently only support a single commit in Commits. Once we support more,
+// this method will need to be revisited.
+func (d *ChangesetSpecDescription) AuthorEmail() (string, error) {
+	if len(d.Commits) == 0 {
+		return "", ErrNoCommits
+	}
+	return d.Commits[0].AuthorEmail, nil
+}
+
 type GitCommitDescription struct {
-	Message string `json:"message,omitempty"`
-	Diff    string `json:"diff,omitempty"`
+	Message     string `json:"message,omitempty"`
+	Diff        string `json:"diff,omitempty"`
+	AuthorName  string `json:"authorName,omitempty"`
+	AuthorEmail string `json:"authorEmail,omitempty"`
 }
 
 // unmarshalValidate validates the input, which can be YAML or JSON, against

internal/campaigns/types_test.go

@@ -998,7 +998,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) {
 				"published": false,
 				"commits": [{
 				  "message": "commit message",
-				  "diff": "the diff"
+				  "diff": "the diff",
+				  "authorName": "Mary McButtons",
+				  "authorEmail": "mary@example.com"
 				}]
 			}`,
 		},
@@ -1012,7 +1014,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) {
 				"title": "my title",
 				"published": false,
 				"commits": [{
-				  "diff": "the diff"
+				  "diff": "the diff",
+				  "authorName": "Mary McButtons",
+				  "authorEmail": "mary@example.com"
 				}]
 			}`,
 			err: "4 errors occurred:\n\t* Must validate one and only one schema (oneOf)\n\t* baseRev is required\n\t* body is required\n\t* commits.0: message is required\n\n",
@@ -1037,7 +1041,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) {
 				"published": false,
 				"commits": [{
 				  "message": "commit message",
-				  "diff": "the diff"
+				  "diff": "the diff",
+				  "authorName": "Mary McButtons",
+				  "authorEmail": "mary@example.com"
 				}]
 			}`,
 			err: ErrHeadBaseMismatch.Error(),
@@ -1056,11 +1062,15 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) {
 				"commits": [
 				  {
 				    "message": "commit message",
-				    "diff": "the diff"
+					"diff": "the diff",
+					"authorName": "Mary McButtons",
+					"authorEmail": "mary@example.com"
 				  },
                   {
 				    "message": "commit message2",
-				    "diff": "the diff2"
+					"diff": "the diff2",
+					"authorName": "Mary McButtons",
+					"authorEmail": "mary@example.com"
 				  }
 				]
 			}`,

migrations/1528395716_add_git_commit_author.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+-- Nothing needed, non-destructive operation
+
+COMMIT;

migrations/1528395716_add_git_commit_author.up.sql

@@ -0,0 +1,11 @@
+BEGIN;
+-- Add default values for git commit author (name and email)
+UPDATE changeset_specs
+SET spec = spec || json_build_object(
+        'commits',
+        json_build_array(
+            spec->'commits'->0 || '{"authorName": "Sourcegraph", "authorEmail": "campaigns@sourcegraph.com"}'
+        )
+    )::jsonb
+WHERE jsonb_array_length(spec->'commits') > 0;
+COMMIT;

schema/campaign_spec.schema.json

@@ -131,6 +131,24 @@
             "message": {
               "type": "string",
               "description": "The Git commit message."
+            },
+            "author": {
+              "title": "GitCommitAuthor",
+              "type": "object",
+              "description": "The author of the Git commit.",
+              "additionalProperties": false,
+              "required": ["name", "email"],
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "description": "The Git commit author name."
+                },
+                "email": {
+                  "type": "string",
+                  "format": "email",
+                  "description": "The Git commit author email."
+                }
+              }
             }
           }
         },

schema/changeset_spec.schema.json

@@ -59,7 +59,7 @@
             "type": "object",
             "description": "The Git commit to create with the changes.",
             "additionalProperties": false,
-            "required": ["message", "diff"],
+            "required": ["message", "diff", "authorName", "authorEmail"],
             "properties": {
               "message": {
                 "type": "string",
@@ -68,6 +68,15 @@
               "diff": {
                 "type": "string",
                 "description": "The commit diff (in unified diff format)."
+              },
+              "authorName": {
+                "type": "string",
+                "description": "The Git commit author name."
+              },
+              "authorEmail": {
+                "type": "string",
+                "format": "email",
+                "description": "The Git commit author email."
               }
             }
           }