synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kayla Washburn-Love
2024-11-15 14:43:32 -07:00
committed by GitHub
parent 16ade985ae
commit 968c52bc36
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
enterprise/cli/provisionerkeys_test.go
View File

@ -26,7 +26,7 @@ func TestProvisionerKeys(t *testing.T) {
client, owner := coderdenttest.New(t, &coderdenttest.Options{ client, owner := coderdenttest.New(t, &coderdenttest.Options{
LicenseOptions: &coderdenttest.LicenseOptions{ LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{ Features: license.Features{
codersdk.FeatureMultipleOrganizations: 1, codersdk.FeatureExternalProvisionerDaemons: 1,
}, },
}, },
}) })

2
enterprise/coderd/coderd.go
View File

@ -343,7 +343,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
r.Use( r.Use(
apiKeyMiddleware, apiKeyMiddleware,
httpmw.ExtractOrganizationParam(api.Database), httpmw.ExtractOrganizationParam(api.Database),
api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations), api.RequireFeatureMW(codersdk.FeatureExternalProvisionerDaemons),
) )
r.Get("/", api.provisionerKeys) r.Get("/", api.provisionerKeys)
r.Post("/", api.postProvisionerKey) r.Post("/", api.postProvisionerKey)

3
enterprise/coderd/provisionerkeys_test.go
View File

@ -26,7 +26,8 @@ func TestProvisionerKeys(t *testing.T) {
}, },
LicenseOptions: &coderdenttest.LicenseOptions{ LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{ Features: license.Features{
codersdk.FeatureMultipleOrganizations: 1, codersdk.FeatureExternalProvisionerDaemons: 1,
codersdk.FeatureMultipleOrganizations: 1,
}, },
}, },
}) })