Skip to content

chore: provisioner acquirer to respect organization ID of jobs #13874

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 3 commits into from
Jul 11, 2024
Merged

chore: provisioner acquirer to respect organization ID of jobs #13874

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63bade6
test: add unit test to verify creation of templates in multiple orgs
Emyrk Jul 11, 2024
026d40d
chore: provisioner acquirer to respect organization ID of jobs
Emyrk Jul 11, 2024
32e9a7b
add comment and stricter check
Emyrk Jul 11, 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
Next Next commit
test: add unit test to verify creation of templates in multiple orgs
  • Loading branch information
@Emyrk
Emyrk committed Jul 11, 2024
commit 63bade645b39581de1efbc5759ee2d97e62fc77c
34 changes: 34 additions & 0 deletions enterprise/coderd/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,3 +1829,37 @@ func TestTemplateAccess(t *testing.T) {
}
})
}

func TestMultipleOrganizationTemplates(t *testing.T) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test would always fail prior to this change.

t.Parallel()

ownerClient, first := coderdenttest.New(t, &coderdenttest.Options{
Options: &coderdtest.Options{
// This only affects the first org.
IncludeProvisionerDaemon: true,
},
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureExternalProvisionerDaemons: 1,
},
},
})

templateAdmin, _ := coderdtest.CreateAnotherUser(t, ownerClient, first.OrganizationID, rbac.RoleTemplateAdmin())

second := coderdtest.CreateOrganization(t, ownerClient, coderdtest.CreateOrganizationOptions{
IncludeProvisionerDaemon: true,
})

third := coderdtest.CreateOrganization(t, ownerClient, coderdtest.CreateOrganizationOptions{
IncludeProvisionerDaemon: true,
})

var _, _ = third, templateAdmin

version := coderdtest.CreateTemplateVersion(t, templateAdmin, second.ID, nil)
coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, version.ID)
coderdtest.CreateTemplate(t, templateAdmin, second.ID, version.ID, func(request *codersdk.CreateTemplateRequest) {
request.Name = "random"
})
}