Skip to content

feat: add keys to organization provision daemons #14627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Sep 16, 2024
Merged

feat: add keys to organization provision daemons #14627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e5b9cc9
feat: add keys to organization provision daemons
f0ssel Sep 9, 2024
683876b
gen
f0ssel Sep 9, 2024
7192df7
only return recent
f0ssel Sep 10, 2024
c0beed9
lint
f0ssel Sep 10, 2024
4082678
protect reserved keys
f0ssel Sep 11, 2024
6a19014
Fix
f0ssel Sep 11, 2024
1e88381
fix tests
f0ssel Sep 11, 2024
0f60bc9
fix test
f0ssel Sep 11, 2024
f676ba4
format
f0ssel Sep 11, 2024
c0ae056
pr comments
f0ssel Sep 12, 2024
56373ce
gen
f0ssel Sep 12, 2024
174f02a
remove default
f0ssel Sep 13, 2024
9f59974
gen
f0ssel Sep 13, 2024
bdb5f57
add new endpoint
f0ssel Sep 16, 2024
dde933c
gen
f0ssel Sep 16, 2024
8283329
add tests
f0ssel Sep 16, 2024
f7f6ab1
fix
f0ssel Sep 16, 2024
3814ff1
Update enterprise/coderd/provisionerkeys.go
f0ssel Sep 16, 2024
5e457f4
fix
f0ssel Sep 16, 2024
607638b
gen
f0ssel Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: add keys to organization provision daemons
  • Loading branch information
@f0ssel
f0ssel committed Sep 16, 2024
commit e5b9cc919fd46b7a57da7ed30ddb37039f5607a2
4 changes: 4 additions & 0 deletions coderd/database/migrations/000250_built_in_psk_provisioner_keys.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ALTER TABLE provisioner_daemons DROP COLUMN key_id;

DELETE FROM provisioner_keys WHERE name = 'built-in';
DELETE FROM provisioner_keys WHERE name = 'psk';
4 changes: 4 additions & 0 deletions coderd/database/migrations/000250_built_in_psk_provisioner_keys.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INSERT INTO provisioner_keys (id, created_at, name, public_key, organization_id) VALUES (gen_random_uuid(), NOW(), 'built-in', '', (SELECT id FROM organizations WHERE is_default = true));
INSERT INTO provisioner_keys (id, created_at, name, public_key, organization_id) VALUES (gen_random_uuid(), NOW(), 'psk', '', (SELECT id FROM organizations WHERE is_default = true));

ALTER TABLE provisioner_daemons ADD COLUMN key_id UUID NOT NULL REFERENCES provisioner_keys(id) DEFAULT (SELECT id FROM provisioner_keys WHERE name = 'built-in');
9 changes: 6 additions & 3 deletions coderd/database/queries/provisionerdaemons.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ INSERT INTO
last_seen_at,
"version",
organization_id,
api_version
api_version,
key_id
)
VALUES (
gen_random_uuid(),
Expand All @@ -44,14 +45,16 @@ VALUES (
@last_seen_at,
@version,
@organization_id,
@api_version
@api_version,
@key_id
) ON CONFLICT("organization_id", "name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
provisioners = @provisioners,
tags = @tags,
last_seen_at = @last_seen_at,
"version" = @version,
api_version = @api_version,
organization_id = @organization_id
organization_id = @organization_id,
key_id = @key_id
RETURNING *;

-- name: UpdateProvisionerDaemonLastSeenAt :exec
Expand Down
1 change: 1 addition & 0 deletions codersdk/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const (
type ProvisionerDaemon struct {
ID uuid.UUID `json:"id" format:"uuid"`
OrganizationID uuid.UUID `json:"organization_id" format:"uuid"`
KeyID uuid.UUID `json:"key_id" format:"uuid"`
CreatedAt time.Time `json:"created_at" format:"date-time"`
LastSeenAt NullTime `json:"last_seen_at,omitempty" format:"date-time"`
Name string `json:"name"`
Expand Down