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
Prev Previous commit
Next Next commit
protect reserved keys
  • Loading branch information
@f0ssel
f0ssel committed Sep 16, 2024
commit 40826789d1b4562e9bfe10b986c5b48e6fa84ff4
6 changes: 6 additions & 0 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion coderd/database/queries/provisionerkeys.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ SELECT
FROM
provisioner_keys
WHERE
organization_id = $1;
organization_id = $1
AND
id != '11111111-1111-1111-1111-111111111111'::uuid
AND
id != '22222222-2222-2222-2222-222222222222'::uuid
AND
id != '33333333-3333-3333-3333-333333333333'::uuid;

-- name: DeleteProvisionerKey :exec
DELETE FROM
Expand Down
33 changes: 20 additions & 13 deletions enterprise/coderd/provisionerkeys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package coderd
import (
"fmt"
"net/http"
"slices"

"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/httpapi"
Expand Down Expand Up @@ -54,6 +55,20 @@ func (api *API) postProvisionerKey(rw http.ResponseWriter, r *http.Request) {
return
}

reserved := []string{"built-in", "psk", "user-auth"}
if slices.Contains(reserved, req.Name) {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("Name cannot be reserved name '%s'", req.Name),
Validations: []codersdk.ValidationError{
{
Field: "name",
Detail: fmt.Sprintf("Name cannot be reserved name '%s'", req.Name),
},
},
})
return
}

params, token, err := provisionerkey.New(organization.ID, req.Name, req.Tags)
if err != nil {
httpapi.InternalServerError(rw, err)
Expand Down Expand Up @@ -108,24 +123,16 @@ func (api *API) provisionerKeys(rw http.ResponseWriter, r *http.Request) {
// @Router /organizations/{organization}/provisionerkeys/{provisionerkey} [delete]
func (api *API) deleteProvisionerKey(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()
organization := httpmw.OrganizationParam(r)
provisionerKey := httpmw.ProvisionerKeyParam(r)

pk, err := api.Database.GetProvisionerKeyByName(ctx, database.GetProvisionerKeyByNameParams{
OrganizationID: organization.ID,
Name: provisionerKey.Name,
})
if err != nil {
if httpapi.Is404Error(err) {
httpapi.ResourceNotFound(rw)
return
}

httpapi.InternalServerError(rw, err)
if provisionerKey.ID.String() == codersdk.ProvisionerKeyIDBuiltIn || provisionerKey.ID.String() == codersdk.ProvisionerKeyIDPSK || provisionerKey.ID.String() == codersdk.ProvisionerKeyIDUserAuth {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("Cannot delete '%s' provisioner key", provisionerKey.Name),
})
return
}

err = api.Database.DeleteProvisionerKey(ctx, pk.ID)
err := api.Database.DeleteProvisionerKey(ctx, provisionerKey.ID)
if err != nil {
httpapi.InternalServerError(rw, err)
return
Expand Down