coder · f0ssel · Jul 25, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -472,6 +472,7 @@ func ProvisionerKey(t testing.TB, db database.Store, orig database.ProvisionerKe
 		OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
 		Name:           takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 		HashedSecret:   orig.HashedSecret,
+		Tags:           orig.Tags,
 	})
 	require.NoError(t, err, "insert provisioner key")
 	return key

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6586,6 +6586,7 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
 		OrganizationID: arg.OrganizationID,
 		Name:           strings.ToLower(arg.Name),
 		HashedSecret:   arg.HashedSecret,
+		Tags:           arg.Tags,
 	}
 	q.provisionerKeys = append(q.provisionerKeys, provisionerKey)
 
@@ -7276,13 +7277,7 @@ func (q *FakeQuerier) ListProvisionerKeysByOrganization(_ context.Context, organ
 	keys := make([]database.ProvisionerKey, 0)
 	for _, key := range q.provisionerKeys {
 		if key.OrganizationID == organizationID {
-			keys = append(keys, database.ProvisionerKey{
-				ID:             key.ID,
-				CreatedAt:      key.CreatedAt,
-				OrganizationID: key.OrganizationID,
-				Name:           key.Name,
-				HashedSecret:   key.HashedSecret,
-			})
+			keys = append(keys, key)
 		}
 	}
 

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000231_provisioner_key_tags.down.sql b/coderd/database/migrations/000231_provisioner_key_tags.down.sql
@@ -0,0 +1 @@
+ALTER TABLE provisioner_keys DROP COLUMN tags;
diff --git a/coderd/database/migrations/000231_provisioner_key_tags.up.sql b/coderd/database/migrations/000231_provisioner_key_tags.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE provisioner_keys ADD COLUMN tags jsonb DEFAULT '{}'::jsonb NOT NULL;
+ALTER TABLE provisioner_keys ALTER COLUMN tags DROP DEFAULT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerkeys.sql b/coderd/database/queries/provisionerkeys.sql
@@ -1,14 +1,15 @@
 -- name: InsertProvisionerKey :one
 INSERT INTO
-	provisioner_keys (
-		id,
+    provisioner_keys (
+        id,
         created_at,
         organization_id,
-		name,
-		hashed_secret
-	)
+        name,
+        hashed_secret,
+        tags
+    )
 VALUES
-	($1, $2, $3, lower(@name), $4) RETURNING *;
+    ($1, $2, $3, lower(@name), $4, $5) RETURNING *;
 
 -- name: GetProvisionerKeyByID :one
 SELECT

diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -44,6 +44,9 @@ sql:
           - column: "provisioner_daemons.tags"
             go_type:
               type: "StringMap"
+          - column: "provisioner_keys.tags"
+            go_type:
+              type: "StringMap"
           - column: "provisioner_jobs.tags"
             go_type:
               type: "StringMap"

diff --git a/coderd/provisionerkey/provisionerkey.go b/coderd/provisionerkey/provisionerkey.go
@@ -14,7 +14,7 @@ import (
 	"github.com/coder/coder/v2/cryptorand"
 )
 
-func New(organizationID uuid.UUID, name string) (database.InsertProvisionerKeyParams, string, error) {
+func New(organizationID uuid.UUID, name string, tags map[string]string) (database.InsertProvisionerKeyParams, string, error) {
 	id := uuid.New()
 	secret, err := cryptorand.HexString(64)
 	if err != nil {
@@ -23,12 +23,17 @@ func New(organizationID uuid.UUID, name string) (database.InsertProvisionerKeyPa
 	hashedSecret := HashSecret(secret)
 	token := fmt.Sprintf("%s:%s", id, secret)
 
+	if tags == nil {
+		tags = map[string]string{}
+	}
+
 	return database.InsertProvisionerKeyParams{
 		ID:             id,
 		CreatedAt:      dbtime.Now(),
 		OrganizationID: organizationID,
 		Name:           name,
 		HashedSecret:   hashedSecret,
+		Tags:           tags,
 	}, token, nil
 }
 

diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -274,15 +274,17 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione
 }
 
 type ProvisionerKey struct {
-	ID             uuid.UUID `json:"id" table:"-" format:"uuid"`
-	CreatedAt      time.Time `json:"created_at" table:"created_at" format:"date-time"`
-	OrganizationID uuid.UUID `json:"organization" table:"organization_id" format:"uuid"`
-	Name           string    `json:"name" table:"name,default_sort"`
+	ID             uuid.UUID         `json:"id" table:"-" format:"uuid"`
+	CreatedAt      time.Time         `json:"created_at" table:"created_at" format:"date-time"`
+	OrganizationID uuid.UUID         `json:"organization" table:"organization_id" format:"uuid"`
+	Name           string            `json:"name" table:"name,default_sort"`
+	Tags           map[string]string `json:"tags" table:"tags"`
 	// HashedSecret - never include the access token in the API response
 }
 
 type CreateProvisionerKeyRequest struct {
-	Name string `json:"name"`
+	Name string            `json:"name"`
+	Tags map[string]string `json:"tags"`
 }
 
 type CreateProvisionerKeyResponse struct {

diff --git a/docs/api/enterprise.md b/docs/api/enterprise.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/cli/provisionerkeys.go b/enterprise/cli/provisionerkeys.go
@@ -33,7 +33,10 @@ func (r *RootCmd) provisionerKeys() *serpent.Command {
 }
 
 func (r *RootCmd) provisionerKeysCreate() *serpent.Command {
-	orgContext := agpl.NewOrganizationContext()
+	var (
+		orgContext = agpl.NewOrganizationContext()
+		rawTags    []string
+	)
 
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
@@ -51,8 +54,14 @@ func (r *RootCmd) provisionerKeysCreate() *serpent.Command {
 				return xerrors.Errorf("current organization: %w", err)
 			}
 
+			tags, err := agpl.ParseProvisionerTags(rawTags)
+			if err != nil {
+				return err
+			}
+
 			res, err := client.CreateProvisionerKey(ctx, org.ID, codersdk.CreateProvisionerKeyRequest{
 				Name: inv.Args[0],
+				Tags: tags,
 			})
 			if err != nil {
 				return xerrors.Errorf("create provisioner key: %w", err)
@@ -69,7 +78,15 @@ func (r *RootCmd) provisionerKeysCreate() *serpent.Command {
 		},
 	}
 
-	cmd.Options = serpent.OptionSet{}
+	cmd.Options = serpent.OptionSet{
+		{
+			Flag:          "tag",
+			FlagShorthand: "t",
+			Env:           "CODER_PROVISIONERD_TAGS",
+			Description:   "Tags to filter provisioner jobs by.",
+			Value:         serpent.StringArrayOf(&rawTags),
+		},
+	}
 	orgContext.AttachOptions(cmd)
 
 	return cmd

diff --git a/enterprise/cli/provisionerkeys_test.go b/enterprise/cli/provisionerkeys_test.go
@@ -41,7 +41,7 @@ func TestProvisionerKeys(t *testing.T) {
 		ctx := testutil.Context(t, testutil.WaitMedium)
 		inv, conf := newCLI(
 			t,
-			"provisioner", "keys", "create", name,
+			"provisioner", "keys", "create", name, "--tag", "foo=bar",
 		)
 
 		pty := ptytest.New(t)
@@ -77,8 +77,10 @@ func TestProvisionerKeys(t *testing.T) {
 		require.Contains(t, line, "NAME")
 		require.Contains(t, line, "CREATED AT")
 		require.Contains(t, line, "ORGANIZATION ID")
+		require.Contains(t, line, "TAGS")
 		line = pty.ReadLine(ctx)
 		require.Contains(t, line, strings.ToLower(name))
+		require.Contains(t, line, "map[foo:bar]")
 
 		inv, conf = newCLI(
 			t,

diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
@@ -559,7 +559,7 @@ func TestProvisionerDaemonServe(t *testing.T) {
 	t.Run("ProvisionerKeyAuth", func(t *testing.T) {
 		t.Parallel()
 
-		insertParams, token, err := provisionerkey.New(uuid.Nil, "dont-TEST-me")
+		insertParams, token, err := provisionerkey.New(uuid.Nil, "dont-TEST-me", nil)
 		require.NoError(t, err)
 
 		tcs := []struct {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE provisioner_keys ADD COLUMN tags jsonb DEFAULT '{}'::jsonb NOT NULL;
		ALTER TABLE provisioner_keys ALTER COLUMN tags DROP DEFAULT;