Skip to content

Commit 3033c58

Browse files
kylecarbskylecarbs
committed
Move around provisioner daemons schema
1 parent 0d29eaf commit 3033c58

9 files changed

+35
-47
lines changed

‎coderd/database/dump.sql

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000065_provisioner_daemon_auth.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/database/migrations/000065_provisioner_daemon_auth.up.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/database/migrations/000072_provisioner_daemon_auth.down.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE provisioner_daemons DROP COLUMN auth_token;
2+
ALTER TABLE provisioner_daemons DROP COLUMN tags;

‎coderd/database/migrations/000072_provisioner_daemon_auth.up.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE provisioner_daemons ADD COLUMN tags jsonb;
2+
3+
ALTER TABLE template_versions ADD COLUMN provisioner_tags jsonb;

‎coderd/database/models.go

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎enterprise/coderd/coderd.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,18 @@ func New(ctx context.Context, options *Options) (*API, error) {
9090
r.Get("/", api.group)
9191
})
9292
})
93-
93+
r.Route("/organizations/{organization}/provisionerdaemons", func(r chi.Router) {
94+
r.Use(
95+
apiKeyMiddleware,
96+
)
97+
r.Post("/", api.postProvisionerDaemonsByOrganization)
98+
})
99+
r.Route("/provisionerdaemons", func(r chi.Router) {
100+
r.Use(apiKeyMiddleware)
101+
r.Get("/", api.provisionerDaemons)
102+
r.Get("/listen", api.provisionerDaemonsListen)
103+
r.Post("/", api.postProvisionerDaemonsByOrganization)
104+
})
94105
r.Route("/templates/{template}/acl", func(r chi.Router) {
95106
r.Use(
96107
api.templateRBACEnabledMW,
@@ -100,7 +111,6 @@ func New(ctx context.Context, options *Options) (*API, error) {
100111
r.Get("/", api.templateACL)
101112
r.Patch("/", api.patchTemplateACL)
102113
})
103-
104114
r.Route("/groups/{group}", func(r chi.Router) {
105115
r.Use(
106116
api.templateRBACEnabledMW,
@@ -111,7 +121,6 @@ func New(ctx context.Context, options *Options) (*API, error) {
111121
r.Patch("/", api.patchGroup)
112122
r.Delete("/", api.deleteGroup)
113123
})
114-
115124
r.Route("/workspace-quota", func(r chi.Router) {
116125
r.Use(apiKeyMiddleware)
117126
r.Route("/{user}", func(r chi.Router) {

‎enterprise/coderd/provisionerdaemons.go

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"io"
88
"net/http"
99

10-
"github.com/google/uuid"
1110
"github.com/hashicorp/yamux"
1211
"golang.org/x/xerrors"
1312
"nhooyr.io/websocket"
@@ -54,35 +53,6 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
5453
httpapi.Write(ctx, rw, http.StatusOK, daemons)
5554
}
5655

57-
func (api *API) postProvisionerDaemon(rw http.ResponseWriter, r *http.Request) {
58-
if !api.Authorize(r, rbac.ActionCreate, rbac.ResourceProvisionerDaemon) {
59-
httpapi.Forbidden(rw)
60-
return
61-
}
62-
63-
var req codersdk.CreateProvisionerDaemonRequest
64-
if !httpapi.Read(r.Context(), rw, r, &req) {
65-
return
66-
}
67-
68-
provisioner, err := api.Database.InsertProvisionerDaemon(r.Context(), database.InsertProvisionerDaemonParams{
69-
ID: uuid.New(),
70-
CreatedAt: database.Now(),
71-
Name: req.Name,
72-
Provisioners: []database.ProvisionerType{database.ProvisionerTypeTerraform},
73-
AuthToken: uuid.NullUUID{Valid: true, UUID: uuid.New()},
74-
})
75-
if err != nil {
76-
httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
77-
Message: "Error inserting provisioner daemon.",
78-
Detail: err.Error(),
79-
})
80-
return
81-
}
82-
83-
httpapi.Write(r.Context(), rw, http.StatusCreated, convertProvisionerDaemon(provisioner))
84-
}
85-
8656
// Serves the provisioner daemon protobuf API over a WebSocket.
8757
func (api *API) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request) {
8858
daemon := httpmw.ProvisionerDaemon(r)

0 commit comments

Comments
 (0)