fixup! Merge branch 'main' into dean/app-sharing

deansheather · deansheather · commit 89a75d0414f7 · 2022-10-12T17:24:49.000Z
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -427,5 +427,4 @@ func RedirectToLogin(rw http.ResponseWriter, r *http.Request, message string) {
 	}
 
 	http.Redirect(rw, r, u.String(), http.StatusTemporaryRedirect)
-	return
 }
diff --git a/coderd/httpmw/userparam.go b/coderd/httpmw/userparam.go
@@ -35,6 +35,8 @@ func UserParam(r *http.Request) database.User {
 
 // ExtractUserParam extracts a user from an ID/username in the {user} URL
 // parameter.
+//
+//nolint:revive
 func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -58,11 +58,11 @@ func (api *API) workspaceAppsProxyPath(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	AppSharingLevel := database.AppSharingLevelOwner
+	appSharingLevel := database.AppSharingLevelOwner
 	if app.SharingLevel != "" {
-		AppSharingLevel = app.SharingLevel
+		appSharingLevel = app.SharingLevel
 	}
-	authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, AppSharingLevel)
+	authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, appSharingLevel)
 	if !ok {
 		return
 	}
@@ -191,11 +191,11 @@ func (api *API) handleSubdomainApplications(middlewares ...func(http.Handler) ht
 
 				// Verify application auth. This function will redirect or
 				// return an error page if the user doesn't have permission.
-				SharingLevel := database.AppSharingLevelOwner
+				sharingLevel := database.AppSharingLevelOwner
 				if workspaceAppPtr != nil && workspaceAppPtr.SharingLevel != "" {
-					SharingLevel = workspaceAppPtr.SharingLevel
+					sharingLevel = workspaceAppPtr.SharingLevel
 				}
-				if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, SharingLevel) {
+				if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, sharingLevel) {
 					return
 				}
 
@@ -598,11 +598,11 @@ type proxyApplication struct {
 func (api *API) proxyWorkspaceApplication(proxyApp proxyApplication, rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	SharingLevel := database.AppSharingLevelOwner
+	sharingLevel := database.AppSharingLevelOwner
 	if proxyApp.App != nil && proxyApp.App.SharingLevel != "" {
-		SharingLevel = proxyApp.App.SharingLevel
+		sharingLevel = proxyApp.App.SharingLevel
 	}
-	if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, SharingLevel) {
+	if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, sharingLevel) {
 		return
 	}
 
diff --git a/enterprise/coderd/workspaceagents_test.go b/enterprise/coderd/workspaceagents_test.go
@@ -129,8 +129,8 @@ func setupWorkspaceAgent(t *testing.T, client *codersdk.Client, user codersdk.Cr
 	defer cancel()
 
 	resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
-	agent, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)
+	agnt, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)
 	require.NoError(t, err)
 
-	return workspace, agent
+	return workspace, agnt
 }

Original file line number	Diff line number	Diff line change
`@@ -427,5 +427,4 @@ func RedirectToLogin(rw http.ResponseWriter, r *http.Request, message string) {`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`http.Redirect(rw, r, u.String(), http.StatusTemporaryRedirect)`
`430`		`- return`
`431`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ func (api API) workspaceAppsProxyPath(rw http.ResponseWriter, r http.Request)`
`58`	`58`	`return`
`59`	`59`	`}`
`60`	`60`
`61`		`- AppSharingLevel := database.AppSharingLevelOwner`
	`61`	`+ appSharingLevel := database.AppSharingLevelOwner`
`62`	`62`	`if app.SharingLevel != "" {`
`63`		`- AppSharingLevel = app.SharingLevel`
	`63`	`+ appSharingLevel = app.SharingLevel`
`64`	`64`	`}`
`65`		`- authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, AppSharingLevel)`
	`65`	`+ authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, appSharingLevel)`
`66`	`66`	`if !ok {`
`67`	`67`	`return`
`68`	`68`	`}`
`@@ -191,11 +191,11 @@ func (api *API) handleSubdomainApplications(middlewares ...func(http.Handler) ht`
`191`	`191`
`192`	`192`	`// Verify application auth. This function will redirect or`
`193`	`193`	`// return an error page if the user doesn't have permission.`
`194`		`- SharingLevel := database.AppSharingLevelOwner`
	`194`	`+ sharingLevel := database.AppSharingLevelOwner`
`195`	`195`	`if workspaceAppPtr != nil && workspaceAppPtr.SharingLevel != "" {`
`196`		`- SharingLevel = workspaceAppPtr.SharingLevel`
	`196`	`+ sharingLevel = workspaceAppPtr.SharingLevel`
`197`	`197`	`}`
`198`		`- if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, SharingLevel) {`
	`198`	`+ if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, sharingLevel) {`
`199`	`199`	`return`
`200`	`200`	`}`
`201`	`201`
`@@ -598,11 +598,11 @@ type proxyApplication struct {`
`598`	`598`	`func (api API) proxyWorkspaceApplication(proxyApp proxyApplication, rw http.ResponseWriter, r http.Request) {`
`599`	`599`	`ctx := r.Context()`
`600`	`600`
`601`		`- SharingLevel := database.AppSharingLevelOwner`
	`601`	`+ sharingLevel := database.AppSharingLevelOwner`
`602`	`602`	`if proxyApp.App != nil && proxyApp.App.SharingLevel != "" {`
`603`		`- SharingLevel = proxyApp.App.SharingLevel`
	`603`	`+ sharingLevel = proxyApp.App.SharingLevel`
`604`	`604`	`}`
`605`		`- if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, SharingLevel) {`
	`605`	`+ if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, sharingLevel) {`
`606`	`606`	`return`
`607`	`607`	`}`
`608`	`608`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ func setupWorkspaceAgent(t testing.T, client codersdk.Client, user codersdk.Cr`
`129`	`129`	`defer cancel()`
`130`	`130`
`131`	`131`	`resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)`
`132`		`- agent, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)`
	`132`	`+ agnt, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)`
`133`	`133`	`require.NoError(t, err)`
`134`	`134`
`135`		`- return workspace, agent`
	`135`	`+ return workspace, agnt`
`136`	`136`	`}`