lint

f0ssel · f0ssel · commit cbe7882fe702 · 2022-09-29T18:36:39.000Z
diff --git a/coderd/workspacequota/workspacequota.go b/coderd/workspacequota/workspacequota.go
@@ -11,9 +11,9 @@ func NewNop() *nop {
 	return &nop{}
 }
 
-func (_ *nop) UserWorkspaceLimit() int {
+func (*nop) UserWorkspaceLimit() int {
 	return 0
 }
-func (_ *nop) CanCreateWorkspace(_ int) bool {
+func (*nop) CanCreateWorkspace(_ int) bool {
 	return true
 }
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -323,8 +323,9 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 	canCreate := e.CanCreateWorkspace(len(workspaces))
 	if !canCreate {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: fmt.Sprintf("User workspace limit of %s is already reached.", e.UserWorkspaceLimit()),
+			Message: fmt.Sprintf("User workspace limit of %d is already reached.", e.UserWorkspaceLimit()),
 		})
+		return
 	}
 
 	templateVersion, err := api.Database.GetTemplateVersionByID(ctx, template.ActiveVersionID)
diff --git a/site/src/components/WorkspaceQuota/WorkspaceQuota.stories.tsx b/site/src/components/WorkspaceQuota/WorkspaceQuota.stories.tsx
@@ -11,16 +11,16 @@ const Template: Story<WorkspaceQuotaProps> = (args) => <WorkspaceQuota {...args}
 export const Example = Template.bind({})
 Example.args = {
   quota: {
-    count: 1,
-    limit: 3,
+    user_workspace_count: 1,
+    user_workspace_limit: 3,
   },
 }
 
 export const LimitOf1 = Template.bind({})
 LimitOf1.args = {
   quota: {
-    count: 1,
-    limit: 1,
+    user_workspace_count: 1,
+    user_workspace_limit: 1,
   },
 }
 
@@ -32,7 +32,7 @@ Loading.args = {
 export const Disabled = Template.bind({})
 Disabled.args = {
   quota: {
-    count: 1,
-    limit: 0,
+    user_workspace_count: 1,
+    user_workspace_limit: 0,
   },
 }

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ func NewNop() *nop {`
`11`	`11`	`return &nop{}`
`12`	`12`	`}`
`13`	`13`
`14`		`-func (_ *nop) UserWorkspaceLimit() int {`
	`14`	`+func (*nop) UserWorkspaceLimit() int {`
`15`	`15`	`return 0`
`16`	`16`	`}`
`17`		`-func (_ *nop) CanCreateWorkspace(_ int) bool {`
	`17`	`+func (*nop) CanCreateWorkspace(_ int) bool {`
`18`	`18`	`return true`
`19`	`19`	`}`