coder · f0ssel · Sep 27, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -275,11 +275,11 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione
 }
 
 type ProvisionerKey struct {
-	ID             uuid.UUID         `json:"id" table:"-" format:"uuid"`
-	CreatedAt      time.Time         `json:"created_at" table:"created at" format:"date-time"`
-	OrganizationID uuid.UUID         `json:"organization" table:"organization id" format:"uuid"`
-	Name           string            `json:"name" table:"name,default_sort"`
-	Tags           map[string]string `json:"tags" table:"tags"`
+	ID             uuid.UUID         `json:"id" format:"uuid"`
+	CreatedAt      time.Time         `json:"created_at" format:"date-time"`
+	OrganizationID uuid.UUID         `json:"organization" format:"uuid"`
+	Name           string            `json:"name"`
+	Tags           map[string]string `json:"tags"`
 	// HashedSecret - never include the access token in the API response
 }
 

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -916,34 +916,34 @@
 							"path": "reference/cli/port-forward.md"
 						},
 						{
-							"title": "provisionerd",
+							"title": "provisioner",
 							"description": "Manage provisioner daemons",
-							"path": "reference/cli/provisionerd.md"
+							"path": "reference/cli/provisioner.md"
 						},
 						{
-							"title": "provisionerd keys",
+							"title": "provisioner keys",
 							"description": "Manage provisioner keys",
-							"path": "reference/cli/provisionerd_keys.md"
+							"path": "reference/cli/provisioner_keys.md"
 						},
 						{
-							"title": "provisionerd keys create",
+							"title": "provisioner keys create",
 							"description": "Create a new provisioner key",
-							"path": "reference/cli/provisionerd_keys_create.md"
+							"path": "reference/cli/provisioner_keys_create.md"
 						},
 						{
-							"title": "provisionerd keys delete",
+							"title": "provisioner keys delete",
 							"description": "Delete a provisioner key",
-							"path": "reference/cli/provisionerd_keys_delete.md"
+							"path": "reference/cli/provisioner_keys_delete.md"
 						},
 						{
-							"title": "provisionerd keys list",
+							"title": "provisioner keys list",
 							"description": "List provisioner keys in an organization",
-							"path": "reference/cli/provisionerd_keys_list.md"
+							"path": "reference/cli/provisioner_keys_list.md"
 						},
 						{
-							"title": "provisionerd start",
+							"title": "provisioner start",
 							"description": "Run a provisioner daemon",
-							"path": "reference/cli/provisionerd_start.md"
+							"path": "reference/cli/provisioner_start.md"
 						},
 						{
 							"title": "publickey",

diff --git a/docs/reference/cli/README.md b/docs/reference/cli/README.md
diff --git a/docs/reference/cli/provisioner.md b/docs/reference/cli/provisioner.md
diff --git a/docs/reference/cli/provisioner_keys.md b/docs/reference/cli/provisioner_keys.md
diff --git a/...reference/cli/provisionerd_keys_create.md → .../reference/cli/provisioner_keys_create.md b/...reference/cli/provisionerd_keys_create.md → .../reference/cli/provisioner_keys_create.md
diff --git a/...reference/cli/provisionerd_keys_delete.md → .../reference/cli/provisioner_keys_delete.md b/...reference/cli/provisionerd_keys_delete.md → .../reference/cli/provisioner_keys_delete.md
diff --git a/docs/reference/cli/provisionerd_keys_list.md → docs/reference/cli/provisioner_keys_list.md b/docs/reference/cli/provisionerd_keys_list.md → docs/reference/cli/provisioner_keys_list.md
diff --git a/docs/reference/cli/provisionerd_start.md → docs/reference/cli/provisioner_start.md b/docs/reference/cli/provisionerd_start.md → docs/reference/cli/provisioner_start.md
diff --git a/docs/reference/cli/provisionerd.md b/docs/reference/cli/provisionerd.md
diff --git a/docs/reference/cli/provisionerd_keys.md b/docs/reference/cli/provisionerd_keys.md
diff --git a/enterprise/cli/provisionerdaemons.go b/enterprise/cli/provisionerdaemons.go
@@ -4,12 +4,12 @@ import "github.com/coder/serpent"
 
 func (r *RootCmd) provisionerDaemons() *serpent.Command {
 	cmd := &serpent.Command{
-		Use:   "provisionerd",
+		Use:   "provisioner",
 		Short: "Manage provisioner daemons",
 		Handler: func(inv *serpent.Invocation) error {
 			return inv.Command.HelpHandler(inv)
 		},
-		Aliases: []string{"provisioner"},
+		Aliases: []string{"provisioners"},
 		Children: []*serpent.Command{
 			r.provisionerDaemonStart(),
 			r.provisionerKeys(),
@@ -18,3 +18,21 @@ func (r *RootCmd) provisionerDaemons() *serpent.Command {
 
 	return cmd
 }
+
+// The provisionerd command group is deprecated and hidden but kept around
+// for backwards compatibility with the start command.
+func (r *RootCmd) provisionerd() *serpent.Command {
+	cmd := &serpent.Command{
+		Use:   "provisionerd",
+		Short: "Manage provisioner daemons",
+		Handler: func(inv *serpent.Invocation) error {
+			return inv.Command.HelpHandler(inv)
+		},
+		Children: []*serpent.Command{
+			r.provisionerDaemonStart(),
+		},
+		Hidden: true,
+	}
+
+	return cmd
+}
diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go
@@ -270,7 +270,6 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 		Env:         "CODER_PROVISIONER_DAEMON_KEY",
 		Description: "Provisioner key to authenticate with Coder server.",
 		Value:       serpent.StringOf(&provisionerKey),
-		Hidden:      true,
 	}
 	cmd.Options = serpent.OptionSet{
 		{

diff --git a/enterprise/cli/provisionerkeys.go b/enterprise/cli/provisionerkeys.go
@@ -3,6 +3,7 @@ package cli
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"golang.org/x/xerrors"
 
@@ -95,7 +96,7 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 	var (
 		orgContext = agpl.NewOrganizationContext()
 		formatter  = cliui.NewOutputFormatter(
-			cliui.TableFormat([]codersdk.ProvisionerKey{}, nil),
+			cliui.TableFormat([]provisionerKeyListItem{}, nil),
 			cliui.JSONFormat(),
 		)
 	)
@@ -127,7 +128,7 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 				return nil
 			}
 
-			out, err := formatter.Format(inv.Context(), keys)
+			out, err := formatter.Format(inv.Context(), provisionerKeyList(keys))
 			if err != nil {
 				return xerrors.Errorf("display provisioner keys: %w", err)
 			}
@@ -144,6 +145,29 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 	return cmd
 }
 
+type provisionerKeyListItem struct {
+	CreatedAt time.Time `json:"created_at" table:"created at" format:"date-time"`
+	Name      string    `json:"name" table:"name,default_sort"`
+	Tags      string    `json:"tags" table:"tags"`
+}
+
+func provisionerKeyList(items []codersdk.ProvisionerKey) []provisionerKeyListItem {
+	var out []provisionerKeyListItem
+	for _, item := range items {
+		tags := []string{}
+		for k, v := range item.Tags {
+			tags = append(tags, fmt.Sprintf("%s=%s", k, v))
+		}
+		out = append(out, provisionerKeyListItem{
+			Name:      item.Name,
+			CreatedAt: item.CreatedAt,
+			Tags:      strings.Join(tags, ", "),
+		})
+	}
+
+	return out
+}
+
 func (r *RootCmd) provisionerKeysDelete() *serpent.Command {
 	orgContext := agpl.NewOrganizationContext()
 

diff --git a/enterprise/cli/root.go b/enterprise/cli/root.go
@@ -17,6 +17,7 @@ func (r *RootCmd) enterpriseOnly() []*serpent.Command {
 		r.licenses(),
 		r.groups(),
 		r.provisionerDaemons(),
+		r.provisionerd(),
 	}
 }