coder · Emyrk · Jul 25, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
diff --git a/cli/organization_test.go b/cli/organization_test.go
@@ -12,11 +12,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/cli/clitest"
-	"github.com/coder/coder/v2/coderd/coderdtest"
-	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/pty/ptytest"
-	"github.com/coder/coder/v2/testutil"
 )
 
 func TestCurrentOrganization(t *testing.T) {
@@ -55,64 +52,6 @@ func TestCurrentOrganization(t *testing.T) {
 		require.NoError(t, <-errC)
 		pty.ExpectMatch(orgID.String())
 	})
-
-	t.Run("OnlyID", func(t *testing.T) {
-		t.Parallel()
-		ownerClient := coderdtest.New(t, nil)
-		first := coderdtest.CreateFirstUser(t, ownerClient)
-		// Owner is required to make orgs
-		client, _ := coderdtest.CreateAnotherUser(t, ownerClient, first.OrganizationID, rbac.RoleOwner())
-
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		orgs := []string{"foo", "bar"}
-		for _, orgName := range orgs {
-			_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-				Name: orgName,
-			})
-			require.NoError(t, err)
-		}
-
-		inv, root := clitest.New(t, "organizations", "show", "--only-id", "--org="+first.OrganizationID.String())
-		clitest.SetupConfig(t, client, root)
-		pty := ptytest.New(t).Attach(inv)
-		errC := make(chan error)
-		go func() {
-			errC <- inv.Run()
-		}()
-		require.NoError(t, <-errC)
-		pty.ExpectMatch(first.OrganizationID.String())
-	})
-
-	t.Run("UsingFlag", func(t *testing.T) {
-		t.Parallel()
-		ownerClient := coderdtest.New(t, nil)
-		first := coderdtest.CreateFirstUser(t, ownerClient)
-		// Owner is required to make orgs
-		client, _ := coderdtest.CreateAnotherUser(t, ownerClient, first.OrganizationID, rbac.RoleOwner())
-
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		orgs := map[string]codersdk.Organization{
-			"foo": {},
-			"bar": {},
-		}
-		for orgName := range orgs {
-			org, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-				Name: orgName,
-			})
-			require.NoError(t, err)
-			orgs[orgName] = org
-		}
-
-		inv, root := clitest.New(t, "organizations", "show", "selected", "--only-id", "-O=bar")
-		clitest.SetupConfig(t, client, root)
-		pty := ptytest.New(t).Attach(inv)
-		errC := make(chan error)
-		go func() {
-			errC <- inv.Run()
-		}()
-		require.NoError(t, <-errC)
-		pty.ExpectMatch(orgs["bar"].ID.String())
-	})
 }
 
 func must[V any](v V, err error) V {

diff --git a/cli/organizationmembers_test.go b/cli/organizationmembers_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/coder/coder/v2/cli/clitest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/rbac"
-	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -36,43 +35,6 @@ func TestListOrganizationMembers(t *testing.T) {
 	})
 }
 
-func TestAddOrganizationMembers(t *testing.T) {
-	t.Parallel()
-
-	t.Run("OK", func(t *testing.T) {
-		t.Parallel()
-
-		ownerClient := coderdtest.New(t, &coderdtest.Options{})
-		owner := coderdtest.CreateFirstUser(t, ownerClient)
-		_, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
-
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		//nolint:gocritic // must be an owner, only owners can create orgs
-		otherOrg, err := ownerClient.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "Other",
-			DisplayName: "",
-			Description: "",
-			Icon:        "",
-		})
-		require.NoError(t, err, "create another organization")
-
-		inv, root := clitest.New(t, "organization", "members", "add", "-O", otherOrg.ID.String(), user.Username)
-		//nolint:gocritic // must be an owner
-		clitest.SetupConfig(t, ownerClient, root)
-
-		buf := new(bytes.Buffer)
-		inv.Stdout = buf
-		err = inv.WithContext(ctx).Run()
-		require.NoError(t, err)
-
-		//nolint:gocritic // must be an owner
-		members, err := ownerClient.OrganizationMembers(ctx, otherOrg.ID)
-		require.NoError(t, err)
-
-		require.Len(t, members, 2)
-	})
-}
-
 func TestRemoveOrganizationMembers(t *testing.T) {
 	t.Parallel()
 

diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/coder/coder/v2/testutil"
 )
 
-func TestTemplateCreate(t *testing.T) {
+func TestCliTemplateCreate(t *testing.T) {
 	t.Parallel()
 	t.Run("Create", func(t *testing.T) {
 		t.Parallel()

diff --git a/cli/templatelist_test.go b/cli/templatelist_test.go
@@ -110,41 +110,4 @@ func TestTemplateList(t *testing.T) {
 		pty.ExpectMatch("No templates found")
 		pty.ExpectMatch("Create one:")
 	})
-
-	t.Run("MultiOrg", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
-		owner := coderdtest.CreateFirstUser(t, client)
-
-		// Template in the first organization
-		firstVersion := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
-		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID)
-		_ = coderdtest.CreateTemplate(t, client, owner.OrganizationID, firstVersion.ID)
-
-		secondOrg := coderdtest.CreateOrganization(t, client, coderdtest.CreateOrganizationOptions{
-			// Listing templates does not require the template actually completes.
-			// We cannot provision an external provisioner in AGPL tests.
-			IncludeProvisionerDaemon: false,
-		})
-		secondVersion := coderdtest.CreateTemplateVersion(t, client, secondOrg.ID, nil)
-		_ = coderdtest.CreateTemplate(t, client, secondOrg.ID, secondVersion.ID)
-
-		// Create a site wide template admin
-		templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
-
-		inv, root := clitest.New(t, "templates", "list", "--output=json")
-		clitest.SetupConfig(t, templateAdmin, root)
-
-		ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
-		defer cancelFunc()
-
-		out := bytes.NewBuffer(nil)
-		inv.Stdout = out
-		err := inv.WithContext(ctx).Run()
-		require.NoError(t, err)
-
-		var templates []codersdk.Template
-		require.NoError(t, json.Unmarshal(out.Bytes(), &templates))
-		require.Len(t, templates, 2)
-	})
 }
diff --git a/coderd/audit_test.go b/coderd/audit_test.go
@@ -95,92 +95,6 @@ func TestAuditLogs(t *testing.T) {
 		require.Equal(t, foundUser, *alogs.AuditLogs[0].User)
 	})
 
-	t.Run("IncludeOrganization", func(t *testing.T) {
-		t.Parallel()
-
-		ctx := context.Background()
-		client := coderdtest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "new-org",
-			DisplayName: "New organization",
-			Description: "A new organization to love and cherish until the test is over.",
-			Icon:        "/emojis/1f48f-1f3ff.png",
-		})
-		require.NoError(t, err)
-
-		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			OrganizationID: o.ID,
-			ResourceID:     user.UserID,
-		})
-		require.NoError(t, err)
-
-		alogs, err := client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		// Make sure the organization is fully populated.
-		require.Equal(t, &codersdk.MinimalOrganization{
-			ID:          o.ID,
-			Name:        o.Name,
-			DisplayName: o.DisplayName,
-			Icon:        o.Icon,
-		}, alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is set.
-		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
-
-		// Delete the org and try again, should be mostly empty.
-		err = client.DeleteOrganization(ctx, o.ID.String())
-		require.NoError(t, err)
-
-		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		require.Equal(t, &codersdk.MinimalOrganization{
-			ID: o.ID,
-		}, alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is set.
-		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
-
-		// Some audit entries do not have an organization at all, in which case the
-		// response omits the organization.
-		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			ResourceType: codersdk.ResourceTypeAPIKey,
-			ResourceID:   user.UserID,
-		})
-		require.NoError(t, err)
-
-		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			SearchQuery: "resource_type:api_key",
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		// The other will have no organization.
-		require.Equal(t, (*codersdk.MinimalOrganization)(nil), alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is empty.
-		require.Equal(t, uuid.Nil, alogs.AuditLogs[0].OrganizationID)
-	})
-
 	t.Run("WorkspaceBuildAuditLink", func(t *testing.T) {
 		t.Parallel()
 

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -864,15 +864,12 @@ func New(options *Options) *API {
 			r.Use(
 				apiKeyMiddleware,
 			)
-			r.Post("/", api.postOrganizations)
 			r.Get("/", api.organizations)
 			r.Route("/{organization}", func(r chi.Router) {
 				r.Use(
 					httpmw.ExtractOrganizationParam(options.Database),
 				)
 				r.Get("/", api.organization)
-				r.Patch("/", api.patchOrganization)
-				r.Delete("/", api.deleteOrganization)
 				r.Post("/templateversions", api.postTemplateVersionsByOrganization)
 				r.Route("/templates", func(r chi.Router) {
 					r.Post("/", api.postTemplateByOrganization)