From 5a916682ba2db830fdee8739fbf4f1fde6eaf898 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 10 Jul 2024 19:32:21 +0000 Subject: [PATCH] chore: ensure correct version of golangci-lint is run in ci --- Makefile | 3 +-- apiversion/apiversion.go | 2 +- enterprise/coderd/workspaceproxy.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0cd253efa6c1d..664e1287ff712 100644 --- 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 index 225fe01785724..349b5c9fecc15 100644 --- 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 index 22bd360ccbffe..aa431c5fe231d 100644 --- 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,