Refactor workspace apps test

Emyrk · Emyrk · commit fac054aa9e66 · 2023-01-30T14:51:10.000-06:00
diff --git a/coderd/workspaceapps_internal_test.go b/coderd/workspaceapps_internal_test.go
@@ -16,36 +16,22 @@ import (
 func TestAPIKeyEncryption(t *testing.T) {
 	t.Parallel()
 
-	generateAPIKey := func(t *testing.T, db database.Store) (keyID, keySecret string, hashedSecret []byte, data encryptedAPIKeyPayload) {
-		keyID, keySecret, err := GenerateAPIKeyIDSecret()
-		require.NoError(t, err)
+	generateAPIKey := func(t *testing.T, db database.Store) (keyID, keyToken string, hashedSecret []byte, data encryptedAPIKeyPayload) {
+		gen := databasefake.NewGenerator(t, db)
+		key, token := gen.APIKey(context.Background(), database.APIKey{})
 
-		hashedSecretArray := sha256.Sum256([]byte(keySecret))
 		data = encryptedAPIKeyPayload{
-			APIKey:    keyID + "-" + keySecret,
+			APIKey:    token,
 			ExpiresAt: database.Now().Add(24 * time.Hour),
 		}
 
-		return keyID, keySecret, hashedSecretArray[:], data
-	}
-	insertAPIKey := func(t *testing.T, db database.Store, keyID string, hashedSecret []byte) {
-		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
-		defer cancel()
-
-		_, err := db.InsertAPIKey(ctx, database.InsertAPIKeyParams{
-			ID:           keyID,
-			HashedSecret: hashedSecret,
-			LoginType:    database.LoginTypePassword,
-			Scope:        database.APIKeyScopeAll,
-		})
-		require.NoError(t, err)
+		return key.ID, token, key.HashedSecret[:], data
 	}
 
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 		db := databasefake.New()
 		keyID, _, hashedSecret, data := generateAPIKey(t, db)
-		insertAPIKey(t, db, keyID, hashedSecret)
 
 		encrypted, err := encryptAPIKey(data)
 		require.NoError(t, err)
@@ -66,8 +52,7 @@ func TestAPIKeyEncryption(t *testing.T) {
 		t.Run("Expiry", func(t *testing.T) {
 			t.Parallel()
 			db := databasefake.New()
-			keyID, _, hashedSecret, data := generateAPIKey(t, db)
-			insertAPIKey(t, db, keyID, hashedSecret)
+			_, _, _, data := generateAPIKey(t, db)
 
 			data.ExpiresAt = database.Now().Add(-1 * time.Hour)
 			encrypted, err := encryptAPIKey(data)
@@ -84,9 +69,18 @@ func TestAPIKeyEncryption(t *testing.T) {
 		t.Run("KeyMatches", func(t *testing.T) {
 			t.Parallel()
 			db := databasefake.New()
-			keyID, _, _, data := generateAPIKey(t, db)
+
+			gen := databasefake.NewGenerator(t, db)
 			hashedSecret := sha256.Sum256([]byte("wrong"))
-			insertAPIKey(t, db, keyID, hashedSecret[:])
+			// Insert a token with a mismatched hashed secret.
+			_, token := gen.APIKey(context.Background(), database.APIKey{
+				HashedSecret: hashedSecret[:],
+			})
+
+			data := encryptedAPIKeyPayload{
+				APIKey:    token,
+				ExpiresAt: database.Now().Add(24 * time.Hour),
+			}
 
 			encrypted, err := encryptAPIKey(data)
 			require.NoError(t, err)
