tests

f0ssel · f0ssel · commit 0f992d6096f4 · 2024-07-25T19:42:13.000Z
diff --git a/enterprise/cli/provisionerkeys_test.go b/enterprise/cli/provisionerkeys_test.go
@@ -4,11 +4,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/cli/clitest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/coderd/provisionerkey"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
@@ -58,10 +58,7 @@ func TestProvisionerKeys(t *testing.T) {
 		_ = pty.ReadLine(ctx)
 		key := pty.ReadLine(ctx)
 		require.NotEmpty(t, key)
-		parts := strings.Split(key, ":")
-		require.Len(t, parts, 2, "expected 2 parts")
-		_, err = uuid.Parse(parts[0])
-		require.NoError(t, err, "expected token to be a uuid")
+		require.NoError(t, provisionerkey.Validate(key))
 
 		inv, conf = newCLI(
 			t,
diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"strings"
 	"testing"
 
 	"github.com/google/uuid"
@@ -612,36 +611,12 @@ func TestProvisionerDaemonServe(t *testing.T) {
 				errStatusCode:             http.StatusUnauthorized,
 			},
 			{
-				name:                      "WrongKey",
+				name:                      "InvalidKey",
 				multiOrgFeatureEnabled:    true,
 				multiOrgExperimentEnabled: true,
 				insertParams:              insertParams,
 				requestProvisionerKey:     "provisionersftw",
-				errStatusCode:             http.StatusUnauthorized,
-			},
-			{
-				name:                      "IdOKKeyValueWrong",
-				multiOrgFeatureEnabled:    true,
-				multiOrgExperimentEnabled: true,
-				insertParams:              insertParams,
-				requestProvisionerKey:     insertParams.ID.String() + ":" + "wrong",
-				errStatusCode:             http.StatusUnauthorized,
-			},
-			{
-				name:                      "IdWrongKeyValueOK",
-				multiOrgFeatureEnabled:    true,
-				multiOrgExperimentEnabled: true,
-				insertParams:              insertParams,
-				requestProvisionerKey:     uuid.NewString() + ":" + token,
-				errStatusCode:             http.StatusUnauthorized,
-			},
-			{
-				name:                      "KeyValueOnly",
-				multiOrgFeatureEnabled:    true,
-				multiOrgExperimentEnabled: true,
-				insertParams:              insertParams,
-				requestProvisionerKey:     strings.Split(token, ":")[1],
-				errStatusCode:             http.StatusUnauthorized,
+				errStatusCode:             http.StatusBadRequest,
 			},
 			{
 				name:                      "KeyAndPSK",
