From 968c52bc36b2751ba6834441fcee351968d440f2 Mon Sep 17 00:00:00 2001 From: Kayla Washburn-Love Date: Fri, 15 Nov 2024 14:43:32 -0700 Subject: [PATCH] fix: add error that provisionerkeys require the externalprovisioners feature (#15541) --- enterprise/cli/provisionerkeys_test.go | 2 +- enterprise/coderd/coderd.go | 2 +- enterprise/coderd/provisionerkeys_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/enterprise/cli/provisionerkeys_test.go b/enterprise/cli/provisionerkeys_test.go index 051bb0b179..8ca2835a13 100644 --- 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 index 03d535f6ff..b7642f4835 100644 --- 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 index d3615c1ccc..56ee440131 100644 --- 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, }, }, })