Skip to content

Commit 6161d17

Browse files
f0sself0ssel
authored
feat: add tags to provisioner keys api (#13989)
1 parent ca83017 commit 6161d17

21 files changed

+120
-49
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/database/dbgen/dbgen.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ func ProvisionerKey(t testing.TB, db database.Store, orig database.ProvisionerKe
472472
OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
473473
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
474474
HashedSecret: orig.HashedSecret,
475+
Tags: orig.Tags,
475476
})
476477
require.NoError(t, err, "insert provisioner key")
477478
return key

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6586,6 +6586,7 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
65866586
OrganizationID: arg.OrganizationID,
65876587
Name: strings.ToLower(arg.Name),
65886588
HashedSecret: arg.HashedSecret,
6589+
Tags: arg.Tags,
65896590
}
65906591
q.provisionerKeys = append(q.provisionerKeys, provisionerKey)
65916592

@@ -7276,13 +7277,7 @@ func (q *FakeQuerier) ListProvisionerKeysByOrganization(_ context.Context, organ
72767277
keys := make([]database.ProvisionerKey, 0)
72777278
for _, key := range q.provisionerKeys {
72787279
if key.OrganizationID == organizationID {
7279-
keys = append(keys, database.ProvisionerKey{
7280-
ID: key.ID,
7281-
CreatedAt: key.CreatedAt,
7282-
OrganizationID: key.OrganizationID,
7283-
Name: key.Name,
7284-
HashedSecret: key.HashedSecret,
7285-
})
7280+
keys = append(keys, key)
72867281
}
72877282
}
72887283

‎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/000231_provisioner_key_tags.down.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE provisioner_keys DROP COLUMN tags;

‎coderd/database/migrations/000231_provisioner_key_tags.up.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE provisioner_keys ADD COLUMN tags jsonb DEFAULT '{}'::jsonb NOT NULL;
2+
ALTER TABLE provisioner_keys ALTER COLUMN tags DROP DEFAULT;

‎coderd/database/models.go

Lines changed: 1 addition & 0 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: 16 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/provisionerkeys.sql

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
-- name: InsertProvisionerKey :one
22
INSERT INTO
3-
provisioner_keys (
4-
id,
3+
provisioner_keys (
4+
id,
55
created_at,
66
organization_id,
7-
name,
8-
hashed_secret
9-
)
7+
name,
8+
hashed_secret,
9+
tags
10+
)
1011
VALUES
11-
($1, $2, $3, lower(@name), $4) RETURNING *;
12+
($1, $2, $3, lower(@name), $4, $5) RETURNING *;
1213

1314
-- name: GetProvisionerKeyByID :one
1415
SELECT

0 commit comments

Comments
 (0)