Skip to content

chore: protect organization endpoints with license #14001

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 17 commits into from
Jul 25, 2024
+2,222 −1,678
Merged

chore: protect organization endpoints with license #14001

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3fe0fc2
chore: move multi-org endpoints into enterprise directory
Emyrk Jul 24, 2024
9f1671c
fixup! chore: move multi-org endpoints into enterprise directory
Emyrk Jul 24, 2024
ff78bb5
add nolint
Emyrk Jul 24, 2024
59fb67f
use r.Group to override single endpoints
Emyrk Jul 24, 2024
3e40ade
override individual endpoints
Emyrk Jul 24, 2024
45f868c
move test NoTemplateAccess to enterprise
Emyrk Jul 24, 2024
d278682
chore: move tests into enterprise
Emyrk Jul 24, 2024
6b64343
move create organization test util to enterprise
Emyrk Jul 24, 2024
446d51b
continue moving tests
Emyrk Jul 24, 2024
1250dbf
keep moving tests
Emyrk Jul 24, 2024
66cd785
linting
Emyrk Jul 24, 2024
c59d370
keep moving tests
Emyrk Jul 24, 2024
71e1ced
keep moving tests
Emyrk Jul 24, 2024
d1bc83c
fixup TestGetProvisionerDaemons
Emyrk Jul 24, 2024
5da4c8b
fixup TestTemplates/SecondOrganization
Emyrk Jul 25, 2024
ca00727
remove audit log check from test that does not need to'
Emyrk Jul 25, 2024
c8bec5a
fixup new test
Emyrk Jul 25, 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
remove audit log check from test that does not need to'
  • Loading branch information
@Emyrk
Emyrk committed Jul 25, 2024
commit ca007278199f57b5e79f4ce6ba4d7ae7770af5f4
11 changes: 0 additions & 11 deletions enterprise/coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/coder/coder/v2/coderd/audit"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/schedule/cron"
"github.com/coder/coder/v2/codersdk"
Expand Down Expand Up @@ -553,14 +551,12 @@ func TestEnterprisePostUser(t *testing.T) {

t.Run("CreateWithoutOrg", func(t *testing.T) {
t.Parallel()
auditor := audit.NewMock()
dv := coderdtest.DeploymentValues(t)
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}

client, firstUser := coderdenttest.New(t, &coderdenttest.Options{
Options: &coderdtest.Options{
DeploymentValues: dv,
Auditor: auditor,
},
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
Expand All @@ -575,8 +571,6 @@ func TestEnterprisePostUser(t *testing.T) {
// Add an extra org to try and confuse user creation
coderdenttest.CreateOrganization(t, client, coderdenttest.CreateOrganizationOptions{})

numLogs := len(auditor.AuditLogs())

// nolint:gocritic // intentional using the owner.
// Manually making a user with the request instead of the coderdtest util
user, err := client.CreateUser(ctx, codersdk.CreateUserRequest{
Expand All @@ -585,11 +579,6 @@ func TestEnterprisePostUser(t *testing.T) {
Password: "SomeSecurePassword!",
})
require.NoError(t, err)
numLogs++ // add an audit log for user create

require.Len(t, auditor.AuditLogs(), numLogs)
require.Equal(t, database.AuditActionCreate, auditor.AuditLogs()[numLogs-1].Action)
require.Equal(t, database.AuditActionLogin, auditor.AuditLogs()[numLogs-3].Action)

require.Len(t, user.OrganizationIDs, 1)
assert.Equal(t, firstUser.OrganizationID, user.OrganizationIDs[0])
Expand Down
Loading