Move around provisioner daemons schema

coder · kylecarbs · Nov 16, 2022 · Oct 25, 2022 · Nov 7, 2022 · Nov 7, 2022
commit 3033c58dd633609540aa0ea73925c5ce5ccf10a4
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000065_provisioner_daemon_auth.down.sql b/coderd/database/migrations/000065_provisioner_daemon_auth.down.sql
diff --git a/coderd/database/migrations/000065_provisioner_daemon_auth.up.sql b/coderd/database/migrations/000065_provisioner_daemon_auth.up.sql
diff --git a/coderd/database/migrations/000072_provisioner_daemon_auth.down.sql b/coderd/database/migrations/000072_provisioner_daemon_auth.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE provisioner_daemons DROP COLUMN auth_token;
+ALTER TABLE provisioner_daemons DROP COLUMN tags;
diff --git a/coderd/database/migrations/000072_provisioner_daemon_auth.up.sql b/coderd/database/migrations/000072_provisioner_daemon_auth.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE provisioner_daemons ADD COLUMN tags jsonb;
+
+ALTER TABLE template_versions ADD COLUMN provisioner_tags jsonb;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -90,7 +90,18 @@ func New(ctx context.Context, options *Options) (*API, error) {
 				r.Get("/", api.group)
 			})
 		})
-
+		r.Route("/organizations/{organization}/provisionerdaemons", func(r chi.Router) {
+			r.Use(
+				apiKeyMiddleware,
+			)
+			r.Post("/", api.postProvisionerDaemonsByOrganization)
+		})
+		r.Route("/provisionerdaemons", func(r chi.Router) {
+			r.Use(apiKeyMiddleware)
+			r.Get("/", api.provisionerDaemons)
+			r.Get("/listen", api.provisionerDaemonsListen)
+			r.Post("/", api.postProvisionerDaemonsByOrganization)
+		})
 		r.Route("/templates/{template}/acl", func(r chi.Router) {
 			r.Use(
 				api.templateRBACEnabledMW,
@@ -100,7 +111,6 @@ func New(ctx context.Context, options *Options) (*API, error) {
 			r.Get("/", api.templateACL)
 			r.Patch("/", api.patchTemplateACL)
 		})
-
 		r.Route("/groups/{group}", func(r chi.Router) {
 			r.Use(
 				api.templateRBACEnabledMW,
@@ -111,7 +121,6 @@ func New(ctx context.Context, options *Options) (*API, error) {
 			r.Patch("/", api.patchGroup)
 			r.Delete("/", api.deleteGroup)
 		})
-
 		r.Route("/workspace-quota", func(r chi.Router) {
 			r.Use(apiKeyMiddleware)
 			r.Route("/{user}", func(r chi.Router) {

diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/yamux"
 	"golang.org/x/xerrors"
 	"nhooyr.io/websocket"
@@ -54,35 +53,6 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusOK, daemons)
 }
 
-func (api *API) postProvisionerDaemon(rw http.ResponseWriter, r *http.Request) {
-	if !api.Authorize(r, rbac.ActionCreate, rbac.ResourceProvisionerDaemon) {
-		httpapi.Forbidden(rw)
-		return
-	}
-
-	var req codersdk.CreateProvisionerDaemonRequest
-	if !httpapi.Read(r.Context(), rw, r, &req) {
-		return
-	}
-
-	provisioner, err := api.Database.InsertProvisionerDaemon(r.Context(), database.InsertProvisionerDaemonParams{
-		ID:           uuid.New(),
-		CreatedAt:    database.Now(),
-		Name:         req.Name,
-		Provisioners: []database.ProvisionerType{database.ProvisionerTypeTerraform},
-		AuthToken:    uuid.NullUUID{Valid: true, UUID: uuid.New()},
-	})
-	if err != nil {
-		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Error inserting provisioner daemon.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
-	httpapi.Write(r.Context(), rw, http.StatusCreated, convertProvisionerDaemon(provisioner))
-}
-
 // Serves the provisioner daemon protobuf API over a WebSocket.
 func (api *API) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request) {
 	daemon := httpmw.ProvisionerDaemon(r)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE provisioner_daemons DROP COLUMN auth_token;
		ALTER TABLE provisioner_daemons DROP COLUMN tags;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE provisioner_daemons ADD COLUMN tags jsonb;

		ALTER TABLE template_versions ADD COLUMN provisioner_tags jsonb;