Skip to content

feat: Add external provisioner daemons #4935

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 23 commits into from
Nov 16, 2022
Merged

feat: Add external provisioner daemons #4935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
48fcf30
Start to port over provisioner daemons PR
kylecarbs Oct 25, 2022
1497980
Merge branch 'main' into provisionerdaemons
kylecarbs Nov 7, 2022
3022f7b
Move to Enterprise
kylecarbs Nov 7, 2022
59b842b
Merge branch 'main' into provisionerdaemons
kylecarbs Nov 8, 2022
3f0738e
Begin adding tests for external registration
kylecarbs Nov 8, 2022
0d29eaf
Move provisioner daemons query to enterprise
kylecarbs Nov 9, 2022
3033c58
Move around provisioner daemons schema
kylecarbs Nov 9, 2022
4326816
Add tags to provisioner daemons
kylecarbs Nov 10, 2022
b1ce65b
make gen
kylecarbs Nov 13, 2022
e97287f
Add user local provisioner daemons
kylecarbs Nov 14, 2022
5255b13
Add provisioner daemons
kylecarbs Nov 15, 2022
cf1221b
Add feature for external daemons
kylecarbs Nov 15, 2022
7dda3a2
Add command to start a provisioner daemon
kylecarbs Nov 15, 2022
200e652
Add provisioner tags to template push and create
kylecarbs Nov 15, 2022
29f6f49
Merge branch 'main' into provisionerdaemons
kylecarbs Nov 16, 2022
ac853f1
Rename migration files
kylecarbs Nov 16, 2022
4b965f4
Merge branch 'main' into provisionerdaemons
kylecarbs Nov 16, 2022
d218655
Fix tests
kylecarbs Nov 16, 2022
b21004f
Fix entitlements test
kylecarbs Nov 16, 2022
ea94e1b
PR comments
kylecarbs Nov 16, 2022
2ea0c9f
Merge branch 'main' into provisionerdaemons
kylecarbs Nov 16, 2022
e9b8e2d
Update migration
kylecarbs Nov 16, 2022
d1f31f8
Fix FE types
kylecarbs Nov 16, 2022
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
Fix tests
  • Loading branch information
@kylecarbs
kylecarbs committed Nov 16, 2022
commit d218655bdd576caccba57d1356396d415881ec2d
3 changes: 2 additions & 1 deletion enterprise/coderd/coderdenttest/coderdenttest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
ctx, _ := testutil.Context(t)
admin := coderdtest.CreateFirstUser(t, client)
license := coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
TemplateRBAC: true,
TemplateRBAC: true,
ExternalProvisionerDaemons: true,
})
group, err := client.CreateGroup(ctx, admin.OrganizationID, codersdk.CreateGroupRequest{
Name: "testgroup",
Expand Down
30 changes: 16 additions & 14 deletions enterprise/coderd/licenses_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,27 @@ func TestGetLicense(t *testing.T) {
assert.Equal(t, int32(1), licenses[0].ID)
assert.Equal(t, "testing", licenses[0].Claims["account_id"])
assert.Equal(t, map[string]interface{}{
codersdk.FeatureUserLimit: json.Number("0"),
codersdk.FeatureAuditLog: json.Number("1"),
codersdk.FeatureSCIM: json.Number("1"),
codersdk.FeatureBrowserOnly: json.Number("1"),
codersdk.FeatureHighAvailability: json.Number("0"),
codersdk.FeatureTemplateRBAC: json.Number("1"),
codersdk.FeatureMultipleGitAuth: json.Number("0"),
codersdk.FeatureUserLimit: json.Number("0"),
codersdk.FeatureAuditLog: json.Number("1"),
codersdk.FeatureSCIM: json.Number("1"),
codersdk.FeatureBrowserOnly: json.Number("1"),
codersdk.FeatureHighAvailability: json.Number("0"),
codersdk.FeatureTemplateRBAC: json.Number("1"),
codersdk.FeatureMultipleGitAuth: json.Number("0"),
codersdk.FeatureExternalProvisionerDaemons: json.Number("0"),
}, licenses[0].Claims["features"])
assert.Equal(t, int32(2), licenses[1].ID)
assert.Equal(t, "testing2", licenses[1].Claims["account_id"])
assert.Equal(t, true, licenses[1].Claims["trial"])
assert.Equal(t, map[string]interface{}{
codersdk.FeatureUserLimit: json.Number("200"),
codersdk.FeatureAuditLog: json.Number("1"),
codersdk.FeatureSCIM: json.Number("1"),
codersdk.FeatureBrowserOnly: json.Number("1"),
codersdk.FeatureHighAvailability: json.Number("0"),
codersdk.FeatureTemplateRBAC: json.Number("0"),
codersdk.FeatureMultipleGitAuth: json.Number("0"),
codersdk.FeatureUserLimit: json.Number("200"),
codersdk.FeatureAuditLog: json.Number("1"),
codersdk.FeatureSCIM: json.Number("1"),
codersdk.FeatureBrowserOnly: json.Number("1"),
codersdk.FeatureHighAvailability: json.Number("0"),
codersdk.FeatureTemplateRBAC: json.Number("0"),
codersdk.FeatureMultipleGitAuth: json.Number("0"),
codersdk.FeatureExternalProvisionerDaemons: json.Number("0"),
}, licenses[1].Claims["features"])
})
}
Expand Down