tests

f0ssel · f0ssel · commit 6d0bce640d32 · 2024-07-12T17:20:07.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6543,9 +6543,11 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
+	newErr := *errUniqueConstraint
+	newErr.Constraint = string(database.UniqueProvisionerKeysOrganizationIDNameKey)
 	for _, key := range q.provisionerKeys {
 		if key.ID == arg.ID || (key.OrganizationID == arg.OrganizationID && key.Name == arg.Name) {
-			return database.ProvisionerKey{}, errUniqueConstraint
+			return database.ProvisionerKey{}, &newErr
 		}
 	}
 
diff --git a/coderd/provisionerkeys.go b/coderd/provisionerkeys.go
@@ -3,6 +3,7 @@ package coderd
 import (
 	"database/sql"
 	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/coder/coder/v2/coderd/database"
@@ -21,13 +22,45 @@ func (api *API) postProvisionerKey(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if req.Name == "" {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+			Message: "Name is required",
+			Validations: []codersdk.ValidationError{
+				{
+					Field:  "name",
+					Detail: "Name is required",
+				},
+			},
+		})
+		return
+	}
+
+	if len(req.Name) > 64 {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+			Message: "Name must be at most 64 characters",
+			Validations: []codersdk.ValidationError{
+				{
+					Field:  "name",
+					Detail: "Name must be at most 64 characters",
+				},
+			},
+		})
+		return
+	}
+
 	params, token, err := provisionerkey.New(organization.ID, req.Name)
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
 	}
 
 	_, err = api.Database.InsertProvisionerKey(ctx, params)
+	if database.IsUniqueViolation(err, database.UniqueProvisionerKeysOrganizationIDNameKey) {
+		httpapi.Write(ctx, rw, http.StatusConflict, codersdk.Response{
+			Message: fmt.Sprintf("Provisioner key with name '%s' already exists in organization", req.Name),
+		})
+		return
+	}
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
diff --git a/coderd/provisionerkeys_test.go b/coderd/provisionerkeys_test.go
@@ -70,25 +70,19 @@ func TestProvisionerKeys(t *testing.T) {
 	_, err = orgAdmin.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
 		Name: "key",
 	})
-	require.ErrorContains(t, err, "already exists")
-
-	// key name cannot have special characters
-	_, err = orgAdmin.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
-		Name: "key with spaces",
-	})
-	require.ErrorContains(t, err, "org admin create provisioner key")
+	require.ErrorContains(t, err, "already exists in organization")
 
 	// key name cannot be too long
 	_, err = orgAdmin.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
-		Name: "key with spaces",
+		Name: "Everyone please pass your watermelons to the front of the pool, the storm is approaching.",
 	})
-	require.ErrorContains(t, err, "less than 64 characters")
+	require.ErrorContains(t, err, "must be at most 64 characters")
 
 	// key name cannot be empty
 	_, err = orgAdmin.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
 		Name: "",
 	})
-	require.ErrorContains(t, err, "cannot be empty")
+	require.ErrorContains(t, err, "is required")
 
 	// org admin can list provisioner keys
 	keys, err = orgAdmin.ListProvisionerKeys(ctx, owner.OrganizationID)
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -278,7 +278,7 @@ type CreateProvisionerKeyRequest struct {
 }
 
 type CreateProvisionerKeyResponse struct {
-	Key string
+	Key string `json:"key"`
 }
 
 // CreateProvisionerKey creates a new provisioner key for an organization.

Original file line number	Diff line number	Diff line change
`@@ -6543,9 +6543,11 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser`
`6543`	`6543`	`q.mutex.Lock()`
`6544`	`6544`	`defer q.mutex.Unlock()`
`6545`	`6545`
	`6546`	`+ newErr := *errUniqueConstraint`
	`6547`	`+ newErr.Constraint = string(database.UniqueProvisionerKeysOrganizationIDNameKey)`
`6546`	`6548`	`for _, key := range q.provisionerKeys {`
`6547`	`6549`	`if key.ID == arg.ID \|\| (key.OrganizationID == arg.OrganizationID && key.Name == arg.Name) {`
`6548`		`- return database.ProvisionerKey{}, errUniqueConstraint`
	`6550`	`+ return database.ProvisionerKey{}, &newErr`
`6549`	`6551`	`}`
`6550`	`6552`	`}`
`6551`	`6553`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ type CreateProvisionerKeyRequest struct {`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`type CreateProvisionerKeyResponse struct {`
`281`		`- Key string`
	`281`	+ Key string `json:"key"`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`// CreateProvisionerKey creates a new provisioner key for an organization.`