zObject does not need exported fields

Emyrk · Emyrk · commit 9918c1619b08 · 2022-04-06T10:08:16.000-05:00
diff --git a/coderd/authz/object.go b/coderd/authz/object.go
@@ -25,12 +25,12 @@ 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 {
-	id         string
-	owner      string
-	OwnedByOrg string
+	id       string
+	owner    string
+	orgOwner string
 
-	// ObjectType is "workspace", "project", "devurl", etc
-	ObjectType ResourceType
+	// objectType is "workspace", "project", "devurl", etc
+	objectType ResourceType
 	// TODO: SharedUsers?
 }
 
@@ -39,21 +39,21 @@ func (z zObject) ID() string {
 }
 
 func (z zObject) ResourceType() ResourceType {
-	return z.ObjectType
+	return z.objectType
 }
 
 func (z zObject) OwnerID() string {
 	return z.owner
 }
 
 func (z zObject) OrgOwnerID() string {
-	return z.OwnedByOrg
+	return z.orgOwner
 }
 
 // Org adds an org OwnerID to the resource
 //nolint:revive
 func (z zObject) Org(orgID string) zObject {
-	z.OwnedByOrg = orgID
+	z.orgOwner = orgID
 	return z
 }
 
diff --git a/coderd/authz/resources.go b/coderd/authz/resources.go
@@ -22,8 +22,8 @@ func (t ResourceType) ResourceType() ResourceType {
 //nolint:revive
 func (r ResourceType) Org(orgID string) zObject {
 	return zObject{
-		OwnedByOrg: orgID,
-		ObjectType: r,
+		orgOwner:   orgID,
+		objectType: r,
 	}
 }
 
@@ -32,14 +32,14 @@ func (r ResourceType) Org(orgID string) zObject {
 func (r ResourceType) Owner(id string) zObject {
 	return zObject{
 		owner:      id,
-		ObjectType: r,
+		objectType: r,
 	}
 }
 
 //nolint:revive
 func (r ResourceType) AsID(id string) zObject {
 	return zObject{
 		id:         id,
-		ObjectType: r,
+		objectType: r,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ func (t ResourceType) ResourceType() ResourceType {`
`22`	`22`	`//nolint:revive`
`23`	`23`	`func (r ResourceType) Org(orgID string) zObject {`
`24`	`24`	`return zObject{`
`25`		`- OwnedByOrg: orgID,`
`26`		`- ObjectType: r,`
	`25`	`+ orgOwner: orgID,`
	`26`	`+ objectType: r,`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -32,14 +32,14 @@ func (r ResourceType) Org(orgID string) zObject {`
`32`	`32`	`func (r ResourceType) Owner(id string) zObject {`
`33`	`33`	`return zObject{`
`34`	`34`	`owner: id,`
`35`		`- ObjectType: r,`
	`35`	`+ objectType: r,`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`//nolint:revive`
`40`	`40`	`func (r ResourceType) AsID(id string) zObject {`
`41`	`41`	`return zObject{`
`42`	`42`	`id: id,`
`43`		`- ObjectType: r,`
	`43`	`+ objectType: r,`
`44`	`44`	`}`
`45`	`45`	`}`