chore: ensure correct version of golangci-lint is run in ci

coadler · coadler · commit 5a916682ba2d · 2024-07-10T19:32:21.000Z
diff --git a/Makefile b/Makefile
@@ -448,8 +448,7 @@ lint/ts:
 lint/go:
 	./scripts/check_enterprise_imports.sh
 	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver
-	golangci-lint run
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
 .PHONY: lint/go
 
 lint/examples:
diff --git a/apiversion/apiversion.go b/apiversion/apiversion.go
@@ -26,7 +26,7 @@ type APIVersion struct {
 }
 
 func (v *APIVersion) WithBackwardCompat(majs ...int) *APIVersion {
-	v.additionalMajors = append(v.additionalMajors, majs[:]...)
+	v.additionalMajors = append(v.additionalMajors, majs...)
 	return v
 }
 
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -350,7 +350,7 @@ func (api *API) postWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
 		Name:              req.Name,
 		DisplayName:       req.DisplayName,
 		Icon:              req.Icon,
-		TokenHashedSecret: hashedSecret[:],
+		TokenHashedSecret: hashedSecret,
 		// Enabled by default, but will be disabled on register if the proxy has
 		// it disabled.
 		DerpEnabled: true,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type APIVersion struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (v APIVersion) WithBackwardCompat(majs ...int) APIVersion {`
`29`		`- v.additionalMajors = append(v.additionalMajors, majs[:]...)`
	`29`	`+ v.additionalMajors = append(v.additionalMajors, majs...)`
`30`	`30`	`return v`
`31`	`31`	`}`
`32`	`32`