fix tests and pr comments

f0ssel · f0ssel · commit bf5b77ff8448 · 2024-07-16T16:05:22.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -124,14 +124,6 @@ func (inTxMutex) RLock()   {}
 func (inTxMutex) Unlock()  {}
 func (inTxMutex) RUnlock() {}
 
-// newUniqueContraintError copies the base unique constraint error and sets the constraint to the provided value.
-func newUniqueContraintError(uc database.UniqueConstraint) *pq.Error {
-	newErr := *errUniqueConstraint
-	newErr.Constraint = string(uc)
-
-	return &newErr
-}
-
 // FakeQuerier replicates database functionality to enable quick testing.  It's an exported type so that our test code
 // can do type checks.
 type FakeQuerier struct {
@@ -277,6 +269,13 @@ func validateDatabaseType(args interface{}) error {
 	return nil
 }
 
+func newUniqueConstraintError(uc database.UniqueConstraint) *pq.Error {
+	newErr := *errUniqueConstraint
+	newErr.Constraint = string(uc)
+
+	return &newErr
+}
+
 func (*FakeQuerier) Ping(_ context.Context) (time.Duration, error) {
 	return 0, nil
 }
@@ -3236,7 +3235,7 @@ func (q *FakeQuerier) GetProvisionerKeyByName(_ context.Context, arg database.Ge
 	defer q.mutex.RUnlock()
 
 	for _, key := range q.provisionerKeys {
-		if strings.ToLower(key.Name) == strings.ToLower(arg.Name) && key.OrganizationID == arg.OrganizationID {
+		if strings.EqualFold(key.Name, arg.Name) && key.OrganizationID == arg.OrganizationID {
 			return key, nil
 		}
 	}
@@ -6551,11 +6550,9 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	newErr := *errUniqueConstraint
-	newErr.Constraint = string(database.UniqueProvisionerKeysOrganizationIDNameIndex)
 	for _, key := range q.provisionerKeys {
-		if key.ID == arg.ID || (key.OrganizationID == arg.OrganizationID && key.Name == arg.Name) {
-			return database.ProvisionerKey{}, &newErr
+		if key.ID == arg.ID || (key.OrganizationID == arg.OrganizationID && strings.EqualFold(key.Name, arg.Name)) {
+			return database.ProvisionerKey{}, newUniqueConstraintError(database.UniqueProvisionerKeysOrganizationIDNameIndex)
 		}
 	}
 
diff --git a/coderd/database/migrations/000226_provisioner_keys.up.sql b/coderd/database/migrations/000226_provisioner_keys.up.sql
@@ -6,4 +6,4 @@ CREATE TABLE provisioner_keys (
     hashed_secret bytea NOT NULL
 );
 
-CREATE UNIQUE INDEX provisioner_keys_organization_id_name_idx ON provisioner_keys (organization_id, name);
+CREATE UNIQUE INDEX provisioner_keys_organization_id_name_idx ON provisioner_keys USING btree (organization_id, lower(name));
diff --git a/coderd/database/queries/provisionerkeys.sql b/coderd/database/queries/provisionerkeys.sql
@@ -26,7 +26,7 @@ FROM
 WHERE
     organization_id = $1
 AND 
-    name = lower(@name);
+    lower(name) = lower(@name);
 
 -- name: ListProvisionerKeysByOrganization :many
 SELECT
diff --git a/enterprise/coderd/provisionerkeys.go b/enterprise/coderd/provisionerkeys.go
@@ -1,8 +1,6 @@
 package coderd
 
 import (
-	"database/sql"
-	"errors"
 	"fmt"
 	"net/http"
 
@@ -118,10 +116,11 @@ func (api *API) deleteProvisionerKey(rw http.ResponseWriter, r *http.Request) {
 		Name:           provisionerKey.Name,
 	})
 	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
+		if httpapi.Is404Error(err) {
 			httpapi.ResourceNotFound(rw)
 			return
 		}
+
 		httpapi.InternalServerError(rw, err)
 		return
 	}
diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go
@@ -77,7 +77,7 @@ func TestProvisionerKeys(t *testing.T) {
 
 	// org admin can conflict on name creating a provisioner key
 	_, err = orgAdmin.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
-		Name: "key",
+		Name: "KEY", // still conflicts
 	})
 	require.ErrorContains(t, err, "already exists in organization")
 
