campaigns: allow partial changeset publishing

Author: LawnGnome

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to Sourcegraph are documented in this file.
 - The new GraphQL API query field `namespaceByName(name: String!)` makes it easier to look up the user or organization with the given name. Previously callers needed to try looking up the user and organization separately.
 - Changesets created by campaigns will now include a link back to the campaign in their body text. [#14033](https://github.com/sourcegraph/sourcegraph/issues/14033)
 - Users can now preview commits that are going to be created in their repositories in the campaign preview UI. [#14181](https://github.com/sourcegraph/sourcegraph/pull/14181)
+- The `published` flag in campaign specs may now be an array, which allows only specific changesets within a campaign to be published based on the repository name. [#13476](https://github.com/sourcegraph/sourcegraph/pull/13476)
 
 ### Changed
 

enterprise/internal/campaigns/resolvers/resolver_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/graph-gophers/graphql-go"
+	"github.com/sourcegraph/campaignutils/override"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
 	"github.com/sourcegraph/sourcegraph/cmd/repo-updater/repos"
@@ -296,7 +297,7 @@ func TestApplyCampaign(t *testing.T) {
 				Commit: campaigns.CommitTemplate{
 					Message: "Add hello world",
 				},
-				Published: false,
+				Published: override.FromBool(false),
 			},
 		},
 		UserID:          userID,

enterprise/internal/campaigns/store_campaign_specs_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/sourcegraph/campaignutils/override"
 	"github.com/sourcegraph/sourcegraph/cmd/repo-updater/repos"
 	"github.com/sourcegraph/sourcegraph/internal/campaigns"
 	cmpgn "github.com/sourcegraph/sourcegraph/internal/campaigns"
@@ -28,7 +29,7 @@ func testStoreCampaignSpecs(t *testing.T, ctx context.Context, s *Store, _ repos
 						Commit: campaigns.CommitTemplate{
 							Message: "commit message",
 						},
-						Published: false,
+						Published: override.FromBool(false),
 					},
 				},
 				UserID: int32(i + 1234),

go.mod

@@ -149,6 +149,7 @@ require (
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/sirupsen/logrus v1.6.0 // indirect
 	github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
+	github.com/sourcegraph/campaignutils v0.0.0-20200930003955-ca2b439dad80
 	github.com/sourcegraph/codeintelutils v0.0.0-20200824140252-1db3aed5cf58
 	github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81
 	github.com/sourcegraph/go-ctags v0.0.0-20200922223002-071e508aa451

go.sum

@@ -3,6 +3,7 @@ package campaigns
 import (
 	"time"
 
+	"github.com/sourcegraph/campaignutils/override"
 	"github.com/sourcegraph/sourcegraph/schema"
 )
 
@@ -51,11 +52,12 @@ func (cs *CampaignSpec) ExpiresAt() time.Time {
 }
 
 type CampaignSpecFields struct {
-	Name              string             `json:"name"`
-	Description       string             `json:"description"`
-	On                []CampaignSpecOn   `json:"on"`
-	Steps             []CampaignSpecStep `json:"steps"`
-	ChangesetTemplate ChangesetTemplate  `json:"changesetTemplate"`
+	Name              string                    `json:"name"`
+	Description       string                    `json:"description"`
+	On                []CampaignSpecOn          `json:"on"`
+	Steps             []CampaignSpecStep        `json:"steps"`
+	ImportChangeset   []CampaignImportChangeset `json:"importChangesets,omitempty"`
+	ChangesetTemplate ChangesetTemplate         `json:"changesetTemplate"`
 }
 
 type CampaignSpecOn struct {
@@ -69,12 +71,17 @@ type CampaignSpecStep struct {
 	Env       map[string]string `json:"env"`
 }
 
+type CampaignImportChangeset struct {
+	Repository  string        `json:"repository"`
+	ExternalIDs []interface{} `json:"externalIDs"`
+}
+
 type ChangesetTemplate struct {
 	Title     string         `json:"title"`
 	Body      string         `json:"body"`
 	Branch    string         `json:"branch"`
 	Commit    CommitTemplate `json:"commit"`
-	Published bool           `json:"published"`
+	Published override.Bool  `json:"published"`
 }
 
 type CommitTemplate struct {

internal/campaigns/campaign_spec.go

@@ -153,9 +153,24 @@
           }
         },
         "published": {
-          "type": "boolean",
           "description": "Whether to publish the changeset. An unpublished changeset can be previewed on Sourcegraph by any person who can view the campaign, but its commit, branch, and pull request aren't created on the code host. A published changeset results in a commit, branch, and pull request being created on the code host.",
-          "$comment": "TODO(sqs): Come up with a way to specify that only a subset of changesets should be published. For example, making `published` an array with some include/exclude syntax items."
+          "oneOf": [
+            {
+              "type": "boolean",
+              "description": "A single flag to control the publishing state for the entire campaign."
+            },
+            {
+              "type": "array",
+              "description": "A list of repository patterns to match. In the event multiple patterns match, the last matching pattern in the list will be used.",
+              "items": {
+                "type": "object",
+                "description": "An object with one field: the key is the glob pattern to match against repository names; the value will be used as the published flag for matching repositories.",
+                "additionalProperties": { "type": "boolean" },
+                "minProperties": 1,
+                "maxProperties": 1
+              }
+            }
+          ]
         }
       }
     }