Remove underscore from test names

unexport fields from zobject
coder · Emyrk · Mar 26, 2022 · Mar 26, 2022 · Mar 27, 2022 · Mar 27, 2022
commit a4e038f44bd20471a42b7d94f86560e6e538b659
diff --git a/coderd/authz/authz_test.go b/coderd/authz/authz_test.go
@@ -11,7 +11,7 @@ import (
 
 var nilSet = authztest.Set{nil}
 
-func Test_ExhaustiveAuthorize(t *testing.T) {
+func TestExhaustiveAuthorize(t *testing.T) {
 	t.Parallel()
 
 	all := authztest.GroupedPermissions(authztest.AllPermissions())

diff --git a/coderd/authz/authztest/level_test.go b/coderd/authz/authztest/level_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coder/coder/coderd/authz/authztest"
 )
 
-func Test_GroupedPermissions(t *testing.T) {
+func TestGroupedPermissions(t *testing.T) {
 	t.Parallel()
 
 	set := make(authztest.Set, 0)

diff --git a/coderd/authz/authztest/permissions_test.go b/coderd/authz/authztest/permissions_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coder/coder/coderd/authz/authztest"
 )
 
-func Test_AllPermissions(t *testing.T) {
+func TestAllPermissions(t *testing.T) {
 	t.Parallel()
 
 	// If this changes, then we might have to fix some other tests. This constant

diff --git a/coderd/authz/authztest/role_test.go b/coderd/authz/authztest/role_test.go
@@ -9,7 +9,7 @@ import (
 	crand "github.com/coder/coder/cryptorand"
 )
 
-func Test_NewRole(t *testing.T) {
+func TestNewRole(t *testing.T) {
 	t.Parallel()
 
 	for i := 0; i < 50; i++ {

diff --git a/coderd/authz/authztest/set_test.go b/coderd/authz/authztest/set_test.go
@@ -10,7 +10,7 @@ import (
 	crand "github.com/coder/coder/cryptorand"
 )
 
-func Test_Set(t *testing.T) {
+func TestSet(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Simple", func(t *testing.T) {

diff --git a/coderd/authz/example_test.go b/coderd/authz/example_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/coder/coder/coderd/authz"
 )
 
-// Test_Example gives some examples on how to use the authz library.
+// TestExample gives some examples on how to use the authz library.
 // This serves to test syntax more than functionality.
-func Test_Example(t *testing.T) {
+func TestExample(t *testing.T) {
 	t.Parallel()
 
 	// user will become an authn object, and can even be a database.User if it

diff --git a/coderd/authz/object.go b/coderd/authz/object.go
@@ -25,25 +25,25 @@ var _ OrgResource = (*zObject)(nil)
 // that represents the set of workspaces you are trying to get access too.
 // Do not export this type, as it can be created from a resource type constant.
 type zObject struct {
-	ObjectID   string `json:"object_id"`
-	OwnedBy    string `json:"owner_id"`
-	OwnedByOrg string `json:"org_owner_id"`
+	id         string
+	owner      string
+	OwnedByOrg string
 
 	// ObjectType is "workspace", "project", "devurl", etc
-	ObjectType ResourceType `json:"object_type"`
+	ObjectType ResourceType
 	// TODO: SharedUsers?
 }
 
 func (z zObject) ID() string {
-	return z.ObjectID
+	return z.id
 }
 
 func (z zObject) ResourceType() ResourceType {
 	return z.ObjectType
 }
 
 func (z zObject) OwnerID() string {
-	return z.OwnedBy
+	return z.owner
 }
 
 func (z zObject) OrgOwnerID() string {
@@ -60,12 +60,12 @@ func (z zObject) Org(orgID string) zObject {
 // Owner adds an OwnerID to the resource
 //nolint:revive
 func (z zObject) Owner(id string) zObject {
-	z.OwnedBy = id
+	z.owner = id
 	return z
 }
 
 //nolint:revive
 func (z zObject) AsID(id string) zObject {
-	z.ObjectID = id
+	z.id = id
 	return z
 }
diff --git a/coderd/authz/permission_test.go b/coderd/authz/permission_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coder/coder/coderd/authz"
 )
 
-func Test_PermissionString(t *testing.T) {
+func TestPermissionString(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
@@ -72,7 +72,7 @@ func Test_PermissionString(t *testing.T) {
 	}
 }
 
-func Test_ParsePermissions(t *testing.T) {
+func TestParsePermissions(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {

diff --git a/coderd/authz/resources.go b/coderd/authz/resources.go
@@ -31,15 +31,15 @@ func (r ResourceType) Org(orgID string) zObject {
 //nolint:revive
 func (r ResourceType) Owner(id string) zObject {
 	return zObject{
-		OwnedBy:    id,
+		owner:      id,
 		ObjectType: r,
 	}
 }
 
 //nolint:revive
 func (r ResourceType) AsID(id string) zObject {
 	return zObject{
-		ObjectID:   id,
+		id:         id,
 		ObjectType: r,
 	}
 }