coder · f0ssel · Sep 27, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/cookiejar"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -274,12 +275,22 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione
 	return proto.NewDRPCProvisionerDaemonClient(drpc.MultiplexedConn(session)), nil
 }
 
+type ProvisionerKeyTags map[string]string
+
+func (p ProvisionerKeyTags) String() string {
+	tags := []string{}
+	for key, value := range p {
+		tags = append(tags, fmt.Sprintf("%s=%s", key, value))
+	}
+	return strings.Join(tags, " ")
+}
+
 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" table:"-" format:"uuid"`
+	CreatedAt      time.Time          `json:"created_at" table:"created at" format:"date-time"`
+	OrganizationID uuid.UUID          `json:"organization" table:"-" format:"uuid"`
+	Name           string             `json:"name" table:"name,default_sort"`
+	Tags           ProvisionerKeyTags `json:"tags" table:"tags"`
 	// HashedSecret - never include the access token in the API response
 }
 

diff --git a/docs/admin/provisioners.md b/docs/admin/provisioners.md
@@ -26,7 +26,7 @@ For example, running 30 provisioner containers will allow 30 users to start
 workspaces at the same time.
 
 Provisioners are started with the
-[coder provisionerd start](../reference/cli/provisionerd_start.md) command.
+[coder provisionerd start](../reference/cli/provisioner_start.md) command.
 
 ## Authentication
 
@@ -49,7 +49,7 @@ the [Helm example](#example-running-an-external-provisioner-with-helm) below.
 
 Provisioners can broadly be categorized by scope: `organization` or `user`. The
 scope of a provisioner can be specified with
-[`-tag=scope=<scope>`](../reference/cli/provisionerd_start.md#t---tag) when
+[`-tag=scope=<scope>`](../reference/cli/provisioner_start.md#t---tag) when
 starting the provisioner daemon. Only users with at least the
 [Template Admin](../admin/users.md#roles) role or higher may create
 organization-scoped provisioner daemons.
@@ -59,7 +59,7 @@ There are two exceptions:
 - [Built-in provisioners](../reference/cli/server.md#provisioner-daemons) are
   always organization-scoped.
 - External provisioners started using a
-  [pre-shared key (PSK)](../reference/cli/provisionerd_start.md#psk) are always
+  [pre-shared key (PSK)](../reference/cli/provisioner_start.md#psk) are always
   organization-scoped.
 
 ### Organization-Scoped Provisioners

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/api/enterprise.md b/docs/reference/api/enterprise.md
diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
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