if namespace is omitted, default to username (#372)

* if namespace is omitted, default to username

* just fetch the ID and do not worry about the username

* remove -namespace from help text

* Update internal/campaigns/service.go

Co-authored-by: Erik Seliger <[email protected]>

* explain the default

* cannot return a nil for a string

* Update cmd/src/campaigns_common.go

Co-authored-by: Thorsten Ball <[email protected]>

* Update internal/campaigns/service.go

Co-authored-by: Thorsten Ball <[email protected]>

* Update cmd/src/campaigns_apply.go

Co-authored-by: Thorsten Ball <[email protected]>

* Update internal/campaigns/service.go

Co-authored-by: Thorsten Ball <[email protected]>

* added CHANGELOG entry

Co-authored-by: Erik Seliger <[email protected]>
Co-authored-by: Thorsten Ball <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -13,6 +13,8 @@ All notable changes to `src-cli` are documented in this file.
 
 ### Added
 
+- Commands for campaigns no longer require the `-namespace` parameter. If omitted, campaigns will use the currently authenticated user as the namespace. [#372](https://github.com/sourcegraph/src-cli/pull/372)
+
 ### Changed
 
 ### Fixed

cmd/src/campaigns_apply.go

@@ -16,10 +16,12 @@ instance, creating or updating the described campaign if necessary.
 
 Usage:
 
-    src campaigns apply -f FILE -namespace NAMESPACE [command options]
+    src campaigns apply -f FILE [command options]
 
 Examples:
 
+    $ src campaigns apply -f campaign.spec.yaml
+  
     $ src campaigns apply -f campaign.spec.yaml -namespace myorg
 
 `

cmd/src/campaigns_common.go

@@ -79,7 +79,7 @@ func newCampaignsApplyFlags(flagSet *flag.FlagSet, cacheDir, tempDir string) *ca
 	)
 	flagSet.StringVar(
 		&caf.namespace, "namespace", "",
-		"The user or organization namespace to place the campaign within.",
+		"The user or organization namespace to place the campaign within. Default is the currently authenticated user.",
 	)
 	flagSet.StringVar(&caf.namespace, "n", "", "Alias for -namespace.")
 
@@ -169,10 +169,6 @@ func campaignsExecute(ctx context.Context, out *output.Output, svc *campaigns.Se
 		defer specFile.Close()
 	}
 
-	if flags.namespace == "" {
-		errs = multierror.Append(errs, &usageError{errors.New("a namespace must be provided with -namespace")})
-	}
-
 	opts := campaigns.ExecutorOpts{
 		Cache:      svc.NewExecutionCache(flags.cacheDir),
 		Creator:    svc.NewWorkspaceCreator(flags.cacheDir, flags.cleanArchives),

cmd/src/campaigns_preview.go

@@ -16,11 +16,11 @@ a Sourcegraph instance, ready to be previewed and applied.
 
 Usage:
 
-    src campaigns preview -f FILE -namespace NAMESPACE [command options]
+    src campaigns preview -f FILE [command options]
 
 Examples:
 
-    $ src campaigns preview -f campaign.spec.yaml -namespace myuser
+    $ src campaigns preview -f campaign.spec.yaml
 
 `
 

internal/campaigns/service.go

@@ -3,6 +3,7 @@ package campaigns
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"reflect"
@@ -312,7 +313,34 @@ query NamespaceQuery($name: String!) {
 }
 `
 
+const usernameQuery = `
+query GetCurrentUserID {
+    currentUser {
+        id
+    }
+}
+`
+
 func (svc *Service) ResolveNamespace(ctx context.Context, namespace string) (string, error) {
+	if namespace == "" {
+		// if no namespace is provided, default to logged in user as namespace
+		var resp struct {
+			Data struct {
+				CurrentUser struct {
+					ID string `json:"id"`
+				} `json:"currentUser"`
+			} `json:"data"`
+		}
+		if ok, err := svc.client.NewRequest(usernameQuery, nil).DoRaw(ctx, &resp); err != nil || !ok {
+			return "", errors.WithMessage(err, "failed to resolve namespace: no user logged in")
+		}
+
+		if resp.Data.CurrentUser.ID == "" {
+			return "", errors.New("cannot resolve current user")
+		}
+		return resp.Data.CurrentUser.ID, nil
+	}
+
 	var result struct {
 		Data struct {
 			User         *struct{ ID string }
@@ -332,7 +360,7 @@ func (svc *Service) ResolveNamespace(ctx context.Context, namespace string) (str
 	if result.Data.Organization != nil {
 		return result.Data.Organization.ID, nil
 	}
-	return "", errors.New("no user or organization found")
+	return "", fmt.Errorf("failed to resolve namespace %q: no user or organization found", namespace)
 }
 
 func (svc *Service) ResolveRepositories(ctx context.Context, spec *CampaignSpec) ([]*graphql.Repository, error) {