May 29, 2024 · May 23, 2024 · May 23, 2024 · May 24, 2024 · May 24, 2024 · May 24, 2024
diff --git a/enterprise/coderd/roles.go b/enterprise/coderd/roles.go
 if role.OrganizationID != orgID.String() {
 httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 Message: "Invalid request, organization in role and url must match",
 Detail:  fmt.Sprintf("roleorg%q does not match URL%q", role.OrganizationID, orgID.String()),
 Detail:  fmt.Sprintf("roleorganization=%q does not match URL=%q", role.OrganizationID, orgID.String()),
 })
 return codersdk.Role{}, false
 }
diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go

 // Revoked licenses cannot modify/create custom roles, but they can
 // use the existing roles.
 t.Run("Revoked License", func(t *testing.T) {
 t.Run("RevokedLicense", func(t *testing.T) {
 t.Parallel()
 dv := coderdtest.DeploymentValues(t)
 dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
 })
 require.ErrorContains(t, err, "Validation")
 })

 t.Run("MismatchedOrganizations", func(t *testing.T) {
 t.Parallel()
 dv := coderdtest.DeploymentValues(t)
 dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
 owner, first := coderdenttest.New(t, &coderdenttest.Options{
 Options: &coderdtest.Options{
 DeploymentValues: dv,
 },
 LicenseOptions: &coderdenttest.LicenseOptions{
 Features: license.Features{
 codersdk.FeatureCustomRoles: 1,
 },
 },
 })

 ctx := testutil.Context(t, testutil.WaitMedium)

 //nolint:gocritic // owner is required for this
 _, err := owner.PatchOrganizationRole(ctx, first.OrganizationID, templateAdminCustom(uuid.New()))
 require.ErrorContains(t, err, "does not match")
 })
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,7 +54,7 @@ func (h enterpriseCustomRoleHandler) PatchOrganizationRole(ctx context.Context,
		if role.OrganizationID != orgID.String() {
		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
		Message: "Invalid request, organization in role and url must match",
		Detail: fmt.Sprintf("roleorg%q does not match URL%q", role.OrganizationID, orgID.String()),
		Detail: fmt.Sprintf("roleorganization=%q does not match URL=%q", role.OrganizationID, orgID.String()),
		})
		return codersdk.Role{}, false
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,7 +89,7 @@ func TestCustomOrganizationRole(t *testing.T) {

		// Revoked licenses cannot modify/create custom roles, but they can
		// use the existing roles.
		t.Run("Revoked License", func(t *testing.T) {
		t.Run("RevokedLicense", func(t *testing.T) {
		t.Parallel()
		dv := coderdtest.DeploymentValues(t)
		dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
Expand DownExpand Up		@@ -208,4 +208,26 @@ func TestCustomOrganizationRole(t *testing.T) {
		})
		require.ErrorContains(t, err, "Validation")
		})

		t.Run("MismatchedOrganizations", func(t *testing.T) {
		t.Parallel()
		dv := coderdtest.DeploymentValues(t)
		dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
		owner, first := coderdenttest.New(t, &coderdenttest.Options{
		Options: &coderdtest.Options{
		DeploymentValues: dv,
		},
		LicenseOptions: &coderdenttest.LicenseOptions{
		Features: license.Features{
		codersdk.FeatureCustomRoles: 1,
		},
		},
		})

		ctx := testutil.Context(t, testutil.WaitMedium)

		//nolint:gocritic // owner is required for this
		_, err := owner.PatchOrganizationRole(ctx, first.OrganizationID, templateAdminCustom(uuid.New()))
		require.ErrorContains(t, err, "does not match")
		})
		}