From a72add90e3c5098d5d88555740e100bcccef97c0 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 15 Nov 2024 18:14:18 +0000 Subject: [PATCH 1/4] fix: warn that acquiring a provisionerkey requires the external provisioners feature --- enterprise/coderd/coderd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index 03d535f6ffb69..b7642f4835c3b 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) From 14883b4eafe43b7fabb1aa07a7cc1d60a32d0273 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 15 Nov 2024 18:30:49 +0000 Subject: [PATCH 2/4] update test --- enterprise/coderd/provisionerkeys_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go index d3615c1ccc931..f80d896bf5edb 100644 --- a/enterprise/coderd/provisionerkeys_test.go +++ b/enterprise/coderd/provisionerkeys_test.go @@ -26,7 +26,7 @@ func TestProvisionerKeys(t *testing.T) { }, LicenseOptions: &coderdenttest.LicenseOptions{ Features: license.Features{ - codersdk.FeatureMultipleOrganizations: 1, + codersdk.FeatureExternalProvisionerDaemons: 1, }, }, }) From 793e648bab9ee79f2d7d26af9274d4e5c8f8a753 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 15 Nov 2024 18:38:53 +0000 Subject: [PATCH 3/4] ok here we go --- enterprise/coderd/provisionerkeys_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go index f80d896bf5edb..56ee440131f69 100644 --- a/enterprise/coderd/provisionerkeys_test.go +++ b/enterprise/coderd/provisionerkeys_test.go @@ -27,6 +27,7 @@ func TestProvisionerKeys(t *testing.T) { LicenseOptions: &coderdenttest.LicenseOptions{ Features: license.Features{ codersdk.FeatureExternalProvisionerDaemons: 1, + codersdk.FeatureMultipleOrganizations: 1, }, }, }) From 96ab69204b707e2003774a38b223b0b23da7222b Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 15 Nov 2024 18:48:13 +0000 Subject: [PATCH 4/4] fix cli too --- enterprise/cli/provisionerkeys_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise/cli/provisionerkeys_test.go b/enterprise/cli/provisionerkeys_test.go index 051bb0b1790b8..8ca2835a13d45 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, }, }, })