chore: upgrade golangci-lint to v2 and modernize codebase (#68)

Author: freeznet

.github/workflows/lint.yaml

@@ -24,7 +24,7 @@ jobs:
           go mod verify
           go mod download
 
-          LINT_VERSION=1.64.8
+          LINT_VERSION=2.7.2
           curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
             tar xz --strip-components 1 --wildcards \*/golangci-lint
           mkdir -p bin && mv golangci-lint bin/
@@ -45,6 +45,6 @@ jobs:
           assert-nothing-changed go fmt ./...
           assert-nothing-changed go mod tidy
 
-          bin/golangci-lint run --out-format=colored-line-number --timeout=3m || STATUS=$?
+          bin/golangci-lint run --timeout=3m || STATUS=$?
 
           exit $STATUS

.golangci.yml

@@ -1,3 +1,5 @@
+version: "2"
+
 run:
   timeout: 5m
   tests: true
@@ -8,21 +10,24 @@ linters:
     - govet
     - errcheck
     - staticcheck
-    - gofmt
-    - goimports
     - revive
     - ineffassign
-    - typecheck
     - unused
-    - gosimple
     - misspell
     - nakedret
     - bodyclose
     - gocritic
     - makezero
     - gosec
 
+formatters:
+  enable:
+    - gofmt
+    - goimports
+
 output:
-  formats: colored-line-number
-  print-issued-lines: true
-  print-linter-name: true
+  formats:
+    text:
+      path: stdout
+      print-issued-lines: true
+      print-linter-name: true

cmd/streamnative-mcp-server/main.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package main is the entry point for the StreamNative MCP server.
 package main
 
 import (

go.mod

@@ -5,7 +5,7 @@ go 1.24.4
 require (
 	github.com/99designs/keyring v1.2.2
 	github.com/apache/pulsar-client-go v0.13.1
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/golang-jwt/jwt v3.2.1+incompatible
 	github.com/google/go-cmp v0.7.0
 	github.com/hamba/avro/v2 v2.28.0
 	github.com/mark3labs/mcp-go v0.43.2

go.sum

@@ -48,8 +48,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA=
 github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -85,6 +83,7 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
 github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
 github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=

pkg/auth/auth.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package auth provides authentication and authorization functionality for StreamNative MCP Server.
+// It implements OAuth 2.0 flows including client credentials and device authorization grants.
 package auth
 
 import (
@@ -20,12 +22,13 @@ import (
 	"io"
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
+	"github.com/golang-jwt/jwt"
 	"golang.org/x/oauth2"
 	"k8s.io/utils/clock"
 )
 
 const (
+	// ClaimNameUserName is the JWT claim name for the username.
 	ClaimNameUserName = "https://streamnative.io/username"
 )
 
@@ -42,6 +45,7 @@ type AuthorizationGrantRefresher interface {
 	Refresh(grant *AuthorizationGrant) (*AuthorizationGrant, error)
 }
 
+// AuthorizationGrantType defines the supported OAuth2 grant types.
 type AuthorizationGrantType string
 
 const (
@@ -139,17 +143,18 @@ func ExtractUserName(token oauth2.Token) (string, error) {
 	return "", fmt.Errorf("access token doesn't contain a recognizable user claim")
 }
 
+// DumpToken outputs token information to the provided writer for debugging.
 func DumpToken(out io.Writer, token oauth2.Token) {
 	p := jwt.Parser{}
 	claims := jwt.MapClaims{}
 	if _, _, err := p.ParseUnverified(token.AccessToken, claims); err != nil {
-		fmt.Fprintf(out, "Unable to parse token.  Err: %v\n", err)
+		_, _ = fmt.Fprintf(out, "Unable to parse token.  Err: %v\n", err)
 		return
 	}
 
 	text, err := json.MarshalIndent(claims, "", "  ")
 	if err != nil {
-		fmt.Fprintf(out, "Unable to print token.  Err: %v\n", err)
+		_, _ = fmt.Fprintf(out, "Unable to print token.  Err: %v\n", err)
 	}
 	_, _ = out.Write(text)
 	_, _ = fmt.Fprintln(out, "")

pkg/auth/authorization_tokenretriever.go

@@ -82,6 +82,7 @@ type TokenErrorResponse struct {
 	ErrorDescription string `json:"error_description"`
 }
 
+// TokenError represents an error response from the token endpoint.
 type TokenError struct {
 	ErrorCode        string
 	ErrorDescription string
@@ -222,6 +223,7 @@ func (ce *TokenRetriever) ExchangeCode(req AuthorizationCodeExchangeRequest) (*T
 	if err != nil {
 		return nil, err
 	}
+	defer func() { _ = response.Body.Close() }()
 
 	return ce.handleAuthTokensResponse(response)
 }
@@ -230,7 +232,7 @@ func (ce *TokenRetriever) ExchangeCode(req AuthorizationCodeExchangeRequest) (*T
 // auth tokens for errors and parsing the raw body to a TokenResult struct
 func (ce *TokenRetriever) handleAuthTokensResponse(resp *http.Response) (*TokenResult, error) {
 	if resp.Body != nil {
-		defer resp.Body.Close()
+		defer func() { _ = resp.Body.Close() }()
 	}
 
 	if resp.StatusCode < 200 || resp.StatusCode > 299 {
@@ -272,6 +274,7 @@ func (ce *TokenRetriever) ExchangeDeviceCode(ctx context.Context, req DeviceCode
 		if err != nil {
 			return nil, err
 		}
+		defer func() { _ = response.Body.Close() }()
 		token, err := ce.handleAuthTokensResponse(response)
 		if err == nil {
 			return token, nil
@@ -314,6 +317,7 @@ func (ce *TokenRetriever) ExchangeRefreshToken(req RefreshTokenExchangeRequest)
 	if err != nil {
 		return nil, err
 	}
+	defer func() { _ = response.Body.Close() }()
 
 	return ce.handleAuthTokensResponse(response)
 }
@@ -330,6 +334,7 @@ func (ce *TokenRetriever) ExchangeClientCredentials(req ClientCredentialsExchang
 	if err != nil {
 		return nil, err
 	}
+	defer func() { _ = response.Body.Close() }()
 
 	return ce.handleAuthTokensResponse(response)
 }

pkg/auth/cache/cache.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package cache provides cached token sources for authentication flows.
 package cache
 
 import (
@@ -51,6 +52,7 @@ type tokenCache struct {
 	token     *oauth2.Token
 }
 
+// NewDefaultTokenCache creates a default token cache with the given store and refresher.
 func NewDefaultTokenCache(store store.Store, audience string,
 	refresher auth.AuthorizationGrantRefresher) (CachingTokenSource, error) {
 	cache := &tokenCache{

pkg/auth/client_credentials_flow.go

@@ -41,6 +41,7 @@ type ClientCredentialsExchanger interface {
 	ExchangeClientCredentials(req ClientCredentialsExchangeRequest) (*TokenResult, error)
 }
 
+// NewClientCredentialsFlow creates a new client credentials flow with the given components.
 func NewClientCredentialsFlow(
 	issuerData Issuer,
 	provider ClientCredentialsProvider,
@@ -98,6 +99,7 @@ func NewDefaultClientCredentialsFlowWithKeyFileStruct(issuerData Issuer, keyFile
 
 var _ Flow = &ClientCredentialsFlow{}
 
+// Authorize requests an authorization grant using the client credentials flow.
 func (c *ClientCredentialsFlow) Authorize() (*AuthorizationGrant, error) {
 	keyFile, err := c.provider.GetClientCredentials()
 	if err != nil {
@@ -121,12 +123,14 @@ func (c *ClientCredentialsFlow) Authorize() (*AuthorizationGrant, error) {
 	return grant, nil
 }
 
+// ClientCredentialsGrantRefresher refreshes client-credentials grants using the token endpoint.
 type ClientCredentialsGrantRefresher struct {
 	issuerData Issuer
 	exchanger  ClientCredentialsExchanger
 	clock      clock.Clock
 }
 
+// NewDefaultClientCredentialsGrantRefresher creates a default client credentials grant refresher.
 func NewDefaultClientCredentialsGrantRefresher(issuerData Issuer,
 	clock clock.Clock) (*ClientCredentialsGrantRefresher, error) {
 	wellKnownEndpoints, err := GetOIDCWellKnownEndpointsFromIssuerURL(issuerData.IssuerEndpoint)
@@ -147,6 +151,7 @@ func NewDefaultClientCredentialsGrantRefresher(issuerData Issuer,
 
 var _ AuthorizationGrantRefresher = &ClientCredentialsGrantRefresher{}
 
+// Refresh exchanges the client credentials for a fresh authorization grant.
 func (g *ClientCredentialsGrantRefresher) Refresh(grant *AuthorizationGrant) (*AuthorizationGrant, error) {
 	if grant.Type != GrantTypeClientCredentials {
 		return nil, errors.New("unsupported grant type")

pkg/auth/client_credentials_provider.go

@@ -18,26 +18,33 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
 const (
+	// KeyFileTypeServiceAccount identifies service account key files.
 	KeyFileTypeServiceAccount = "sn_service_account"
-	FILE                      = "file://"
-	DATA                      = "data://"
+	// FILE indicates a file:// key file reference.
+	FILE = "file://"
+	// DATA indicates a data:// inline key file reference.
+	DATA = "data://"
 )
 
+// KeyFileProvider provides client credentials from a key file path.
 type KeyFileProvider struct {
 	KeyFile string
 }
 
+// KeyFile holds service account credentials from a JSON key file.
 type KeyFile struct {
 	Type         string `json:"type"`
 	ClientID     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
 	ClientEmail  string `json:"client_email"`
 }
 
+// NewClientCredentialsProviderFromKeyFile creates a provider from a key file path.
 func NewClientCredentialsProviderFromKeyFile(keyFile string) *KeyFileProvider {
 	return &KeyFileProvider{
 		KeyFile: keyFile,
@@ -46,13 +53,14 @@ func NewClientCredentialsProviderFromKeyFile(keyFile string) *KeyFileProvider {
 
 var _ ClientCredentialsProvider = &KeyFileProvider{}
 
+// GetClientCredentials loads client credentials from the configured key file source.
 func (k *KeyFileProvider) GetClientCredentials() (*KeyFile, error) {
 	var keyFile []byte
 	var err error
 	switch {
 	case strings.HasPrefix(k.KeyFile, FILE):
 		filename := strings.TrimPrefix(k.KeyFile, FILE)
-		keyFile, err = os.ReadFile(filename)
+		keyFile, err = os.ReadFile(filepath.Clean(filename))
 	case strings.HasPrefix(k.KeyFile, DATA):
 		keyFile = []byte(strings.TrimPrefix(k.KeyFile, DATA))
 	case strings.HasPrefix(k.KeyFile, "data:"):
@@ -80,17 +88,20 @@ func (k *KeyFileProvider) GetClientCredentials() (*KeyFile, error) {
 	return &v, nil
 }
 
+// KeyFileStructProvider provides client credentials from an in-memory KeyFile struct.
 type KeyFileStructProvider struct {
 	KeyFile *KeyFile
 }
 
+// GetClientCredentials returns the client credentials from the in-memory KeyFile.
 func (k *KeyFileStructProvider) GetClientCredentials() (*KeyFile, error) {
 	if k.KeyFile == nil {
 		return nil, fmt.Errorf("key file is nil")
 	}
 	return k.KeyFile, nil
 }
 
+// NewClientCredentialsProviderFromKeyFileStruct creates a provider from an in-memory KeyFile.
 func NewClientCredentialsProviderFromKeyFileStruct(keyFile *KeyFile) *KeyFileStructProvider {
 	return &KeyFileStructProvider{
 		KeyFile: keyFile,