Add workspace config CLI

Author: rowantrollope

cmd/afs/afs_commands_test.go

@@ -28,6 +28,10 @@ func (s stubAFSControlPlane) GetWorkspace(context.Context, string) (controlplane
 	return controlplane.WorkspaceDetail{}, fmt.Errorf("unexpected GetWorkspace call")
 }
 
+func (s stubAFSControlPlane) GetWorkspaceConfig(context.Context, string) (controlplane.WorkspaceConfig, error) {
+	return controlplane.WorkspaceConfig{}, fmt.Errorf("unexpected GetWorkspaceConfig call")
+}
+
 func (s stubAFSControlPlane) GetWorkspaceVersioningPolicy(context.Context, string) (controlplane.WorkspaceVersioningPolicy, error) {
 	return controlplane.WorkspaceVersioningPolicy{}, fmt.Errorf("unexpected GetWorkspaceVersioningPolicy call")
 }
@@ -68,6 +72,10 @@ func (s stubAFSControlPlane) ImportWorkspace(context.Context, controlplane.Impor
 	return controlplane.ImportWorkspaceResponse{}, fmt.Errorf("unexpected ImportWorkspace call")
 }
 
+func (s stubAFSControlPlane) UpdateWorkspaceConfig(context.Context, string, controlplane.WorkspaceConfig) (controlplane.WorkspaceConfig, error) {
+	return controlplane.WorkspaceConfig{}, fmt.Errorf("unexpected UpdateWorkspaceConfig call")
+}
+
 func (s stubAFSControlPlane) UpdateWorkspaceVersioningPolicy(context.Context, string, controlplane.WorkspaceVersioningPolicy) (controlplane.WorkspaceVersioningPolicy, error) {
 	return controlplane.WorkspaceVersioningPolicy{}, fmt.Errorf("unexpected UpdateWorkspaceVersioningPolicy call")
 }

cmd/afs/afs_surface_test.go

@@ -31,13 +31,13 @@ func TestWorkspaceRootShortcutsAreDocumentedAliases(t *testing.T) {
 	for _, command := range []string{
 		"mount", "unmount", "create", "list", "clone", "default",
 		"set-default", "unset-default", "info", "import", "fork",
-		"versioning", "delete",
+		"delete",
 	} {
 		if !isWorkspaceRootShortcut(command) {
 			t.Fatalf("isWorkspaceRootShortcut(%q) = false, want true", command)
 		}
 	}
-	for _, command := range []string{"status", "fs", "cp", "log", "config", "reset"} {
+	for _, command := range []string{"status", "fs", "cp", "log", "config", "reset", "versioning"} {
 		if isWorkspaceRootShortcut(command) {
 			t.Fatalf("isWorkspaceRootShortcut(%q) = true, want false", command)
 		}
@@ -53,7 +53,7 @@ func TestWorkspaceRootShortcutsAreDocumentedAliases(t *testing.T) {
 	for _, documented := range []string{
 		"Workspace Shortcuts", "mount", "unmount", "create", "list", "clone",
 		"default", "set-default", "unset-default", "info", "import", "fork",
-		"versioning", "delete",
+		"delete",
 	} {
 		if !strings.Contains(out, documented) {
 			t.Fatalf("top-level help should document workspace shortcut %q:\n%s", documented, out)

cmd/afs/backend.go

@@ -119,6 +119,7 @@ func rewriteManagedRedisAddrForLocalhost(controlPlaneURL, redisAddr string) stri
 type afsControlPlane interface {
 	ListWorkspaceSummaries(ctx context.Context) (controlplane.WorkspaceListResponse, error)
 	GetWorkspace(ctx context.Context, workspace string) (controlplane.WorkspaceDetail, error)
+	GetWorkspaceConfig(ctx context.Context, workspace string) (controlplane.WorkspaceConfig, error)
 	GetWorkspaceVersioningPolicy(ctx context.Context, workspace string) (controlplane.WorkspaceVersioningPolicy, error)
 	GetFileHistory(ctx context.Context, workspace, rawPath string, newestFirst bool) (controlplane.FileHistoryResponse, error)
 	GetFileHistoryPage(ctx context.Context, workspace string, req controlplane.FileHistoryRequest) (controlplane.FileHistoryResponse, error)
@@ -129,6 +130,7 @@ type afsControlPlane interface {
 	UndeleteFileVersion(ctx context.Context, workspace, rawPath string, selector controlplane.FileVersionSelector) (controlplane.FileVersionUndeleteResponse, error)
 	CreateWorkspace(ctx context.Context, input controlplane.CreateWorkspaceRequest) (controlplane.WorkspaceDetail, error)
 	ImportWorkspace(ctx context.Context, input controlplane.ImportWorkspaceRequest) (controlplane.ImportWorkspaceResponse, error)
+	UpdateWorkspaceConfig(ctx context.Context, workspace string, cfg controlplane.WorkspaceConfig) (controlplane.WorkspaceConfig, error)
 	UpdateWorkspaceVersioningPolicy(ctx context.Context, workspace string, policy controlplane.WorkspaceVersioningPolicy) (controlplane.WorkspaceVersioningPolicy, error)
 	DeleteWorkspace(ctx context.Context, workspace string) error
 	CreateWorkspaceSession(ctx context.Context, workspace string, input controlplane.CreateWorkspaceSessionRequest) (controlplane.WorkspaceSession, error)

cmd/afs/config_commands_test.go

@@ -925,7 +925,7 @@ func TestCmdWorkspaceHelpListsSubcommands(t *testing.T) {
 
 	for _, want := range []string{
 		"workspace <subcommand>",
-		"versioning <get|set>",
+		"config <workspace> <get|set|unset|list>",
 		"default",
 		"set-default <workspace>",
 		"unset-default",
@@ -941,7 +941,7 @@ func TestCmdWorkspaceHelpListsSubcommands(t *testing.T) {
 	if strings.Contains(out, "run [workspace]") {
 		t.Fatalf("workspace help output = %q, did not expect removed run subcommand", out)
 	}
-	for _, removed := range []string{"use <workspace>", "current                                      Show"} {
+	for _, removed := range []string{"use <workspace>", "current                                      Show", "versioning <get|set>"} {
 		if strings.Contains(out, removed) {
 			t.Fatalf("workspace help output = %q, did not expect removed subcommand %q", out, removed)
 		}
@@ -968,7 +968,7 @@ func TestCmdWorkspaceRunReportsRemovedCommand(t *testing.T) {
 func TestCmdWorkspaceUseAndCurrentAreNotSupported(t *testing.T) {
 	t.Helper()
 
-	for _, subcommand := range []string{"use", "current"} {
+	for _, subcommand := range []string{"use", "current", "versioning"} {
 		err := cmdWorkspace([]string{"workspace", subcommand})
 		if err == nil {
 			t.Fatalf("cmdWorkspace(%s) returned nil error, want unsupported-command error", subcommand)

cmd/afs/controlplane_http_client.go

@@ -150,6 +150,12 @@ func (c *httpControlPlaneClient) GetWorkspace(ctx context.Context, workspace str
 	return out, err
 }
 
+func (c *httpControlPlaneClient) GetWorkspaceConfig(ctx context.Context, workspace string) (controlplane.WorkspaceConfig, error) {
+	var out controlplane.WorkspaceConfig
+	err := c.doJSON(ctx, http.MethodGet, c.workspacePath(workspace, "config"), nil, &out, http.StatusOK)
+	return out, err
+}
+
 func (c *httpControlPlaneClient) GetWorkspaceVersioningPolicy(ctx context.Context, workspace string) (controlplane.WorkspaceVersioningPolicy, error) {
 	var out controlplane.WorkspaceVersioningPolicy
 	err := c.doJSON(ctx, http.MethodGet, c.workspacePath(workspace, "versioning"), nil, &out, http.StatusOK)
@@ -250,6 +256,12 @@ func (c *httpControlPlaneClient) ImportWorkspace(ctx context.Context, input cont
 	return out, err
 }
 
+func (c *httpControlPlaneClient) UpdateWorkspaceConfig(ctx context.Context, workspace string, cfg controlplane.WorkspaceConfig) (controlplane.WorkspaceConfig, error) {
+	var out controlplane.WorkspaceConfig
+	err := c.doJSON(ctx, http.MethodPut, c.workspacePath(workspace, "config"), cfg, &out, http.StatusOK)
+	return out, err
+}
+
 func (c *httpControlPlaneClient) UpdateWorkspaceVersioningPolicy(ctx context.Context, workspace string, policy controlplane.WorkspaceVersioningPolicy) (controlplane.WorkspaceVersioningPolicy, error) {
 	var out controlplane.WorkspaceVersioningPolicy
 	err := c.doJSON(ctx, http.MethodPut, c.workspacePath(workspace, "versioning"), policy, &out, http.StatusOK)

cmd/afs/main.go

@@ -109,7 +109,7 @@ func isWorkspaceRootShortcut(command string) bool {
 	switch command {
 	case "mount", "unmount", "create", "list", "clone", "default",
 		"set-default", "unset-default", "info", "import", "fork",
-		"versioning", "delete":
+		"delete":
 		return true
 	default:
 		return false
@@ -142,7 +142,7 @@ func printUsage() {
 	fmt.Fprintf(w, "%sCommands:%s\n", bold, reset)
 	fmt.Fprintf(w, "  %sstatus%s             %sshow AFS status and local workspace mounts%s\n\n", bold, reset, dim, reset)
 
-	fmt.Fprintf(w, "  %sws%s (workspace)     %smount, create, list, clone, defaults, import, fork, versioning%s\n", bold, reset, dim, reset)
+	fmt.Fprintf(w, "  %sws%s (workspace)     %smount, create, list, clone, defaults, import, fork, config%s\n", bold, reset, dim, reset)
 	fmt.Fprintf(w, "  %sfs%s (filesystem)    %sread, search, and safely write workspace files%s\n", bold, reset, dim, reset)
 	fmt.Fprintf(w, "  %scp%s (checkpoint)    %screate, list, show, diff, restore%s\n", bold, reset, dim, reset)
 	fmt.Fprintf(w, "  %slog%s                %sWorkspace file-change log%s\n\n", bold, reset, dim, reset)
@@ -155,7 +155,7 @@ func printUsage() {
 
 	fmt.Fprintf(w, "%sWorkspace Shortcuts:%s\n", bold, reset)
 	fmt.Fprintf(w, "  %sOmit \"ws\" for:%s mount, unmount, create, list, clone, default, set-default,\n", dim, reset)
-	fmt.Fprintf(w, "                 unset-default, info, import, fork, versioning, delete\n")
+	fmt.Fprintf(w, "                 unset-default, info, import, fork, delete\n")
 	fmt.Fprintf(w, "  %sExample:%s %s%s mount demo ~/demo%s  %s(same as %s ws mount demo ~/demo)%s\n\n", dim, reset, orange, bin, reset, dim, bin, reset)
 
 	fmt.Fprintf(w, "%sExamples:%s\n", bold, reset)