coder
diff --git a/‎coderd/coderd.go
Lines changed: 0 additions & 10 deletions b/‎coderd/coderd.go
Lines changed: 0 additions & 10 deletions
diff --git a/‎coderd/provisionerkeys.go
Lines changed: 0 additions & 92 deletions b/‎coderd/provisionerkeys.go
Lines changed: 0 additions & 92 deletions
diff --git a/‎docs/cli/provisionerd.md
Lines changed: 5 additions & 0 deletions b/‎docs/cli/provisionerd.md
Lines changed: 5 additions & 0 deletions
diff --git a/‎docs/manifest.json
Lines changed: 20 additions & 0 deletions b/‎docs/manifest.json
Lines changed: 20 additions & 0 deletions
diff --git a/‎enterprise/cli/provisionerkeys.go
Lines changed: 6 additions & 7 deletions b/‎enterprise/cli/provisionerkeys.go
Lines changed: 6 additions & 7 deletions
@@ -915,16 +915,6 @@ func New(options *Options) *API {
 						})
 					})
 				})
-				r.Route("/provisionerkeys", func(r chi.Router) {
-					r.Get("/", api.provisionerKeys)
-					r.Post("/", api.postProvisionerKey)
-					r.Route("/{provisionerKey}", func(r chi.Router) {
-						r.Use(
-							httpmw.ExtractProvisionerKeyParam(options.Database),
-						)
-						r.Delete("/", api.deleteProvisionerKey)
-					})
-				})
 			})
 		})
 		r.Route("/templates", func(r chi.Router) {
 
@@ -795,6 +795,26 @@
           "description": "Manage provisioner daemons",
           "path": "cli/provisionerd.md"
         },
+        {
+          "title": "provisionerd keys",
+          "description": "Manage provisioner keys",
+          "path": "cli/provisionerd_keys.md"
+        },
+        {
+          "title": "provisionerd keys create",
+          "description": "Create a new provisioner key",
+          "path": "cli/provisionerd_keys_create.md"
+        },
+        {
+          "title": "provisionerd keys delete",
+          "description": "Delete a provisioner key",
+          "path": "cli/provisionerd_keys_delete.md"
+        },
+        {
+          "title": "provisionerd keys list",
+          "description": "List provisioner keys",
+          "path": "cli/provisionerd_keys_list.md"
+        },
         {
           "title": "provisionerd start",
           "description": "Run a provisioner daemon",
 
@@ -33,9 +33,7 @@ func (r *RootCmd) provisionerKeys() *serpent.Command {
 }
 
 func (r *RootCmd) provisionerKeysCreate() *serpent.Command {
-	var (
-		orgContext = agpl.NewOrganizationContext()
-	)
+	orgContext := agpl.NewOrganizationContext()
 
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
@@ -60,13 +58,14 @@ func (r *RootCmd) provisionerKeysCreate() *serpent.Command {
 				return xerrors.Errorf("create provisioner key: %w", err)
 			}
 
-			_, _ = fmt.Fprintf(inv.Stdout, "Successfully created provisioner key %s!\n\n%s", pretty.Sprint(cliui.DefaultStyles.Keyword, inv.Args[0], res.Key))
+			_, _ = fmt.Fprintf(inv.Stdout, "Successfully created provisioner key %s!\n\n%s", pretty.Sprint(cliui.DefaultStyles.Keyword, inv.Args[0]), pretty.Sprint(cliui.DefaultStyles.Keyword, res.Key))
 
 			return nil
 		},
 	}
 
 	cmd.Options = serpent.OptionSet{}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
@@ -142,14 +141,13 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 	}
 
 	cmd.Options = serpent.OptionSet{}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
 
 func (r *RootCmd) provisionerKeysDelete() *serpent.Command {
-	var (
-		orgContext = agpl.NewOrganizationContext()
-	)
+	orgContext := agpl.NewOrganizationContext()
 
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
@@ -179,6 +177,7 @@ func (r *RootCmd) provisionerKeysDelete() *serpent.Command {
 	}
 
 	cmd.Options = serpent.OptionSet{}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,7 @@ func (r RootCmd) provisionerKeys() serpent.Command {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (r RootCmd) provisionerKeysCreate() serpent.Command {`
`36`		`- var (`
`37`		`- orgContext = agpl.NewOrganizationContext()`
`38`		`- )`
	`36`	`+ orgContext := agpl.NewOrganizationContext()`
`39`	`37`
`40`	`38`	`client := new(codersdk.Client)`
`41`	`39`	`cmd := &serpent.Command{`
`@@ -60,13 +58,14 @@ func (r RootCmd) provisionerKeysCreate() serpent.Command {`
`60`	`58`	`return xerrors.Errorf("create provisioner key: %w", err)`
`61`	`59`	`}`
`62`	`60`
`63`		`- _, _ = fmt.Fprintf(inv.Stdout, "Successfully created provisioner key %s!\n\n%s", pretty.Sprint(cliui.DefaultStyles.Keyword, inv.Args[0], res.Key))`
	`61`	`+ _, _ = fmt.Fprintf(inv.Stdout, "Successfully created provisioner key %s!\n\n%s", pretty.Sprint(cliui.DefaultStyles.Keyword, inv.Args[0]), pretty.Sprint(cliui.DefaultStyles.Keyword, res.Key))`
`64`	`62`
`65`	`63`	`return nil`
`66`	`64`	`},`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`cmd.Options = serpent.OptionSet{}`
	`68`	`+ orgContext.AttachOptions(cmd)`
`70`	`69`
`71`	`70`	`return cmd`
`72`	`71`	`}`
`@@ -142,14 +141,13 @@ func (r RootCmd) provisionerKeysList() serpent.Command {`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`cmd.Options = serpent.OptionSet{}`
	`144`	`+ orgContext.AttachOptions(cmd)`
`145`	`145`
`146`	`146`	`return cmd`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`func (r RootCmd) provisionerKeysDelete() serpent.Command {`
`150`		`- var (`
`151`		`- orgContext = agpl.NewOrganizationContext()`
`152`		`- )`
	`150`	`+ orgContext := agpl.NewOrganizationContext()`
`153`	`151`
`154`	`152`	`client := new(codersdk.Client)`
`155`	`153`	`cmd := &serpent.Command{`
`@@ -179,6 +177,7 @@ func (r RootCmd) provisionerKeysDelete() serpent.Command {`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`cmd.Options = serpent.OptionSet{}`
	`180`	`+ orgContext.AttachOptions(cmd)`
`182`	`181`
`183`	`182`	`return cmd`
`184`	`183`	`}`