fix: add error that provisionerkeys require the externalprovisioners feature (#15541)

aslilac · web-flow · commit 968c52bc36b2 · 2024-11-15T14:43:32.000-07:00
diff --git a/enterprise/cli/provisionerkeys_test.go b/enterprise/cli/provisionerkeys_test.go
@@ -26,7 +26,7 @@ func TestProvisionerKeys(t *testing.T) {
 		client, owner := coderdenttest.New(t, &coderdenttest.Options{
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureMultipleOrganizations: 1,
+					codersdk.FeatureExternalProvisionerDaemons: 1,
 				},
 			},
 		})
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -343,7 +343,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 			r.Use(
 				apiKeyMiddleware,
 				httpmw.ExtractOrganizationParam(api.Database),
-				api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
+				api.RequireFeatureMW(codersdk.FeatureExternalProvisionerDaemons),
 			)
 			r.Get("/", api.provisionerKeys)
 			r.Post("/", api.postProvisionerKey)
diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go
@@ -26,7 +26,8 @@ func TestProvisionerKeys(t *testing.T) {
 		},
 		LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
-				codersdk.FeatureMultipleOrganizations: 1,
+				codersdk.FeatureExternalProvisionerDaemons: 1,
+				codersdk.FeatureMultipleOrganizations:      1,
 			},
 		},
 	})

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`343`	`343`	`r.Use(`
`344`	`344`	`apiKeyMiddleware,`
`345`	`345`	`httpmw.ExtractOrganizationParam(api.Database),`
`346`		`- api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),`
	`346`	`+ api.RequireFeatureMW(codersdk.FeatureExternalProvisionerDaemons),`
`347`	`347`	`)`
`348`	`348`	`r.Get("/", api.provisionerKeys)`
`349`	`349`	`r.Post("/", api.postProvisionerKey)`