move logic to enterprise part

defelmnq · defelmnq · commit cd3cdcff9209 · 2024-11-14T08:55:31.000+01:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1135,11 +1135,6 @@ func New(options *Options) *API {
 				})
 			})
 		})
-		r.Route("/provisionerkeys", func(r chi.Router) {
-			r.Route("/{provisionerkeyid}", func(r chi.Router) {
-				r.Get("/tags", api.getProvisionKeyTags)
-			})
-		})
 		r.Route("/workspaceagents", func(r chi.Router) {
 			r.Post("/azure-instance-identity", api.postWorkspaceAuthAzureInstanceIdentity)
 			r.Post("/aws-instance-identity", api.postWorkspaceAuthAWSInstanceIdentity)
diff --git a/coderd/provisionerkeys.go b/coderd/provisionerkeys.go
diff --git a/coderd/provisionerkeys_test.go b/coderd/provisionerkeys_test.go
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -368,10 +368,10 @@ func (c *Client) ListProvisionerKeys(ctx context.Context, organizationID uuid.UU
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
-// GetProvisionTagsByKeyID returns the provisioner tags associated with the provisioner key ID.
-func (c *Client) GetProvisionTagsByKeyID(ctx context.Context, provisionerKeyID uuid.UUID) (ProvisionerKeyTags, error) {
+// GetProvisionTagsByKey returns the provisioner tags associated with the provisioner key.
+func (c *Client) GetProvisionTagsByKey(ctx context.Context, organizationID uuid.UUID, provisionerKey string) (ProvisionerKeyTags, error) {
 	res, err := c.Request(ctx, http.MethodGet,
-		fmt.Sprintf("/api/v2/provisionerkeys/%s/tags", provisionerKeyID.String()),
+		fmt.Sprintf("/api/v2/organizations/%s/provisionerkeys/%s/tags", organizationID.String(), provisionerKey),
 		nil,
 	)
 	if err != nil {
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -352,6 +352,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 				r.Use(
 					httpmw.ExtractProvisionerKeyParam(options.Database),
 				)
+				r.Get("/tags", api.fetchProvisionerKeyTags)
 				r.Delete("/", api.deleteProvisionerKey)
 			})
 		})
diff --git a/enterprise/coderd/provisionerkeys.go b/enterprise/coderd/provisionerkeys.go
@@ -200,6 +200,23 @@ func (api *API) deleteProvisionerKey(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
 }
 
+// @Summary Get provisioner key tags by ID
+// @ID get-provisioner-key-tags-by-id
+// @Produce json
+// @Tags Enterprise
+// @Param organization path string true "Organization ID"
+// @Param provisionerkeyid path string true "Provisioner Key ID" format(uuid)
+// @Success 200 {object} codersdk.ProvisionerKeyTags
+// @Router /organizations/{organization}/provisionerkeys/{provisionerkeyid}/tags [get]
+func (api *API) fetchProvisionerKeyTags(rw http.ResponseWriter, r *http.Request) {
+	var (
+		ctx = r.Context()
+		pk  = httpmw.ProvisionerKeyParam(r)
+	)
+
+	httpapi.Write(ctx, rw, http.StatusOK, codersdk.ProvisionerKeyTags(pk.Tags))
+}
+
 func convertProvisionerKeys(dbKeys []database.ProvisionerKey) []codersdk.ProvisionerKey {
 	keys := make([]codersdk.ProvisionerKey, 0, len(dbKeys))
 	for _, dbKey := range dbKeys {
diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go
@@ -133,3 +133,38 @@ func TestProvisionerKeys(t *testing.T) {
 	err = orgAdmin.DeleteProvisionerKey(ctx, owner.OrganizationID, codersdk.ProvisionerKeyNamePSK)
 	require.ErrorContains(t, err, "reserved")
 }
+
+func TestProvisionerKeyTags(t *testing.T) {
+	t.Parallel()
+	t.Run("GetTags", func(t *testing.T) {
+		t.Parallel()
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong*10)
+		t.Cleanup(cancel)
+		dv := coderdtest.DeploymentValues(t)
+		client, owner := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				DeploymentValues: dv,
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureMultipleOrganizations: 1,
+				},
+			},
+		})
+
+		//nolint:gocritic // Not the purpose of this test
+		_, err := client.CreateProvisionerKey(ctx, owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
+			Name: "key",
+			Tags: map[string]string{"key1": "value1", "key2": "value2"},
+		})
+		require.NoError(t, err)
+
+		tags, err := client.GetProvisionTagsByKeyID(ctx, owner.OrganizationID, "key")
+		require.NoError(t, err)
+		require.Equal(t, tags, codersdk.ProvisionerKeyTags{"key1": "value1", "key2": "value2"})
+
+		err = client.DeleteProvisionerKey(ctx, owner.OrganizationID, "invalid_key")
+		require.ErrorContains(t, err, "Resource not found")
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -368,10 +368,10 @@ func (c *Client) ListProvisionerKeys(ctx context.Context, organizationID uuid.UU`
`368`	`368`	`return resp, json.NewDecoder(res.Body).Decode(&resp)`
`369`	`369`	`}`
`370`	`370`
`371`		`-// GetProvisionTagsByKeyID returns the provisioner tags associated with the provisioner key ID.`
`372`		`-func (c *Client) GetProvisionTagsByKeyID(ctx context.Context, provisionerKeyID uuid.UUID) (ProvisionerKeyTags, error) {`
	`371`	`+// GetProvisionTagsByKey returns the provisioner tags associated with the provisioner key.`
	`372`	`+func (c *Client) GetProvisionTagsByKey(ctx context.Context, organizationID uuid.UUID, provisionerKey string) (ProvisionerKeyTags, error) {`
`373`	`373`	`res, err := c.Request(ctx, http.MethodGet,`
`374`		`- fmt.Sprintf("/api/v2/provisionerkeys/%s/tags", provisionerKeyID.String()),`
	`374`	`+ fmt.Sprintf("/api/v2/organizations/%s/provisionerkeys/%s/tags", organizationID.String(), provisionerKey),`
`375`	`375`	`nil,`
`376`	`376`	`)`
`377`	`377`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -352,6 +352,7 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`352`	`352`	`r.Use(`
`353`	`353`	`httpmw.ExtractProvisionerKeyParam(options.Database),`
`354`	`354`	`)`
	`355`	`+ r.Get("/tags", api.fetchProvisionerKeyTags)`
`355`	`356`	`r.Delete("/", api.deleteProvisionerKey)`
`356`	`357`	`})`
`357`	`358`	`})`