[WIP] test what breaks

.golangci.yml

@@ -8,19 +8,18 @@ linters:
   enable:
     - misspell
     - goimports
-    - golint
+    - revive
     - stylecheck
     - unconvert
     - dupl
     - gosec
-    - scopelint
+    - copyloopvar
     - nakedret
     - gochecknoinits
     - goconst
     - gocritic
     - gocyclo
     - lll
-    - maligned
     - prealloc
     - unparam
     - errcheck
@@ -30,7 +29,7 @@ issues:
     - path: _test\.go
       linters:
         - goconst # Don't run on test files because they may often repeate the same string
-        - scopelint # Otherwise you need tc := tc. This isn't actually a problem unless tests are being run in parallel.
+        - copyloopvar # Otherwise you need tc := tc. This isn't actually a problem unless tests are being run in parallel.
         - lll # Don't do line length checks in test code.
         - dupl # Sometimes we duplicate a bunch in tests for the sake of clarity.
     - path: nacl/secretbox
@@ -48,6 +47,22 @@ issues:
     - path: testing/mustcert/example_test.go
       linters:
         - gosec # Don't run gosec, it's insecure because it's a test
+    - path: hmiddleware/basicauth/grpc_test.go
+      linters:
+        - gosec # Don't run gosec, it's insecure because it's a test
+        - staticcheck
+    - path: cmdutil/service/standard.go
+      linters:
+        - copyloopvar
+    - path: testing/testenv/testenv.go
+      linters:
+        - revive
+    - linters: 
+      - gosec 
+      text: "G115"  
+    - linters: 
+      - revive
+      text: "unused-parameter: "
 
 linters-settings:
   misspell:
@@ -62,5 +77,3 @@ linters-settings:
   lll:
     # max line length, lines longer will be reported. Default is 120.
     line-length: 130
-  maligned:
-    suggest-new: true

Makefile

@@ -5,7 +5,7 @@ GOPATH = $(shell go env GOPATH)
 TOOLS_DIR = $(TOP_LEVEL)/.tools
 TOOLS_BIN = $(TOOLS_DIR)/bin
 # Make sure this is in-sync with the version in the circle ci config
-GOLANGCI_LINT_VERSION := v1.55.0
+GOLANGCI_LINT_VERSION := v1.61.0
 PKG_SPEC := ./...
 MOD := -mod=readonly
 GOTEST := go test $(MOD)

cmdutil/spaceca/spaceca.go

@@ -32,7 +32,7 @@ func NewServerTLSConfig(domain string, secData map[string][]byte) (*tls.Config,
 		return nil, errors.Wrap(err, "error generating TLS cert")
 	}
 
-	//nolint:gosec,G40 // we define a minimum version via `tlsconfig.Modern`
+	//nolint:gosec
 	config := &tls.Config{
 		Certificates: []tls.Certificate{*cert},
 	}

go.mod

@@ -1,83 +1,79 @@
 module github.com/heroku/x
 
-go 1.21
+go 1.22.7
 
 require (
-	contrib.go.opencensus.io/exporter/ocagent v0.6.0
+	contrib.go.opencensus.io/exporter/ocagent v0.7.0
 	github.com/VividCortex/gohistogram v1.0.0 // indirect
-	github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e
-	github.com/aws/aws-lambda-go v1.27.0
-	github.com/aws/aws-sdk-go v1.13.10
-	github.com/axiomhq/hyperloglog v0.0.0-20180317131949-fe9507de0228
-	github.com/coreos/go-oidc/v3 v3.2.0
-	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
+	github.com/armon/go-proxyproto v0.1.0
+	github.com/aws/aws-lambda-go v1.47.0
+	github.com/aws/aws-sdk-go v1.55.5
+	github.com/axiomhq/hyperloglog v0.2.0
+	github.com/coreos/go-oidc/v3 v3.11.0
+	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
 	github.com/go-chi/chi v4.1.2+incompatible
-	github.com/go-ini/ini v1.33.0 // indirect
-	github.com/go-kit/kit v0.9.0
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.2
-	github.com/golang/protobuf v1.5.3
-	github.com/gomodule/redigo v1.8.9
-	github.com/google/gops v0.3.22
-	github.com/google/uuid v1.3.1
-	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
+	github.com/go-kit/kit v0.13.0
+	github.com/golang-jwt/jwt/v4 v4.5.0
+	github.com/golang/protobuf v1.5.4
+	github.com/gomodule/redigo v1.9.2
+	github.com/google/gops v0.3.28
+	github.com/google/uuid v1.6.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/heroku/rollrus v0.2.0
-	github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
-	github.com/joeshaw/envdecode v0.0.0-20180129163420-d5f34bca07f3
-	github.com/lstoll/grpce v1.7.0
-	github.com/oklog/run v1.0.0
-	github.com/pkg/errors v0.8.2-0.20190227000051-27936f6d90f9
-	github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1
-	github.com/rollbar/rollbar-go v1.2.0 // indirect
-	github.com/sirupsen/logrus v1.6.0
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
+	github.com/hydrogen18/memlistener v1.0.0
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd
+	github.com/lstoll/grpce v1.7.1
+	github.com/oklog/run v1.1.0
+	github.com/pkg/errors v0.9.1
+	github.com/rafaeljusto/redigomock v2.4.0+incompatible
+	github.com/rollbar/rollbar-go v1.4.5 // indirect
+	github.com/sirupsen/logrus v1.9.3
 	github.com/soveran/redisurl v0.0.0-20180322091936-eb325bc7a4b8
-	github.com/spf13/cobra v0.0.2
-	github.com/spf13/pflag v1.0.1 // indirect
-	github.com/unrolled/secure v1.0.1
-	github.com/urfave/cli v1.21.0
-	go.opencensus.io v0.22.1
-	go.opentelemetry.io/otel v1.27.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
-	go.opentelemetry.io/otel/metric v1.27.0
-	golang.org/x/crypto v0.21.0
-	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
-	google.golang.org/grpc v1.59.0
-	google.golang.org/grpc/examples v0.0.0-20210916203835-567da6b86340
-	google.golang.org/protobuf v1.31.0
-	gopkg.in/ini.v1 v1.42.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.5.1
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/unrolled/secure v1.16.0
+	github.com/urfave/cli v1.22.15
+	go.opencensus.io v0.24.0
+	go.opentelemetry.io/otel v1.30.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0
+	go.opentelemetry.io/otel/metric v1.30.0
+	golang.org/x/crypto v0.27.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/time v0.6.0
+	google.golang.org/grpc v1.67.1
+	google.golang.org/grpc/examples v0.0.0-20241003052815-67e47fc3c1cf
+	google.golang.org/protobuf v1.34.2
+	gopkg.in/square/go-jose.v2 v2.6.0
 )
 
 require (
-	go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0
-	go.opentelemetry.io/otel/sdk v1.27.0
-	go.opentelemetry.io/otel/sdk/metric v1.27.0
-	golang.org/x/text v0.14.0
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.55.0
+	go.opentelemetry.io/otel/sdk v1.30.0
+	go.opentelemetry.io/otel/sdk/metric v1.30.0
+	golang.org/x/text v0.18.0
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.2 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
-	go.opentelemetry.io/otel/trace v1.27.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.12.0 // indirect
-	google.golang.org/api v0.7.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	google.golang.org/api v0.199.0 // indirect
+	google.golang.org/genproto v0.0.0-20240930140551-af27646dc61f // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
 )