Skip to content

chore: add provisioner key crud apis #13857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jul 16, 2024
Merged

chore: add provisioner key crud apis #13857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6019ded
chore: add provisioner key crud apis
f0ssel Jul 9, 2024
2d2ea40
add api routes
f0ssel Jul 9, 2024
ea9fa64
testing
f0ssel Jul 11, 2024
5ce5549
more tests and rbac fix
f0ssel Jul 11, 2024
06f2e94
fix file
f0ssel Jul 12, 2024
2408612
tests
f0ssel Jul 12, 2024
67701de
gen
f0ssel Jul 12, 2024
53dccb7
fix migrations
f0ssel Jul 12, 2024
5a7e2de
add swagger
f0ssel Jul 12, 2024
76cce30
move to enterprise
f0ssel Jul 12, 2024
e2b2d6b
dbauthz
f0ssel Jul 12, 2024
5f5e923
fix swagger
f0ssel Jul 12, 2024
81d4e92
put routes under experiment
f0ssel Jul 12, 2024
efcf832
add fixture
f0ssel Jul 12, 2024
3530f73
use existing org id
f0ssel Jul 12, 2024
e5f7311
save
f0ssel Jul 15, 2024
28ded45
fix case sensitivity
f0ssel Jul 15, 2024
1d246ec
fix tests and pr comments
f0ssel Jul 16, 2024
1a5deb8
fix migration
f0ssel Jul 16, 2024
ff62057
make gen and test fix
f0ssel Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
put routes under experiment
  • Loading branch information
@f0ssel
f0ssel committed Jul 16, 2024
commit 81d4e92f9cd6c44a02e7a31712eb027c7293f52b
1 change: 1 addition & 0 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6551,6 +6551,7 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
}
}

//nolint:gosimple
provisionerKey := database.ProvisionerKey{
ID: arg.ID,
CreatedAt: arg.CreatedAt,
Expand Down
1 change: 1 addition & 0 deletions enterprise/coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
apiKeyMiddleware,
httpmw.ExtractOrganizationParam(api.Database),
api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),
)
r.Get("/", api.provisionerKeys)
r.Post("/", api.postProvisionerKey)
Expand Down
15 changes: 11 additions & 4 deletions enterprise/coderd/provisionerkeys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@ func TestProvisionerKeys(t *testing.T) {

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong*10)
t.Cleanup(cancel)
client, owner := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureMultipleOrganizations: 1,
dv := coderdtest.DeploymentValues(t)
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
client, owner := coderdenttest.New(t, &coderdenttest.Options{
Options: &coderdtest.Options{
DeploymentValues: dv,
},
}})
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureMultipleOrganizations: 1,
},
},
})
orgAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
otherOrg := coderdtest.CreateOrganization(t, client, coderdtest.CreateOrganizationOptions{})
Expand Down