mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: clean up stale and dangerous //nolint comments (#23643)
## Changes
- **Commit 1**: Remove 17 unnecessary `//nolint` directives:
- `//nolint:varnamelen` — linter not active
- `//nolint:unused` on exported `SlimUnsupported`
- `//nolint:govet` in `coderd/httpmw/csrf` — no longer fires
- `//nolint:revive` on functions refactored since the nolint was added
- `//nolint:paralleltest` citing Go 1.22 loop variable capture
(obsolete)
- Bare `//nolint` narrowed to specific `//nolint:gocritic` with
justification
- **Commit 2**: Fix root causes behind 5 dangerous nolint suppressions:
- Add `MinVersion: tls.VersionTLS12` to TLS client config (removes
`gosec` G402)
- Delete trivial unexported wrappers `apiKey()`/`normalizeProvider()` in
chatprovider (removes `revive` confusing-naming)
- Add doc comments to `StartWithAssert` and `Router` (removes `revive`
exported)
- Rename unused parameters to `_` in integration test helpers
> 🤖 This PR was created using Coder Agents and reviewed by me.
This commit is contained in:
@@ -101,7 +101,6 @@ func TestConnectionLog(t *testing.T) {
|
||||
reason: "because error says so",
|
||||
},
|
||||
}
|
||||
//nolint:paralleltest // No longer necessary to reinitialise the variable tt.
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
@@ -73,7 +73,6 @@ func CSRF(cookieCfg codersdk.HTTPCookieConfig) func(next http.Handler) http.Hand
|
||||
|
||||
// CSRF only affects requests that automatically attach credentials via a cookie.
|
||||
// If no cookie is present, then there is no risk of CSRF.
|
||||
//nolint:govet
|
||||
sessCookie, err := r.Cookie(codersdk.SessionTokenCookie)
|
||||
if xerrors.Is(err, http.ErrNoCookie) {
|
||||
return true
|
||||
|
||||
@@ -118,11 +118,6 @@ func (k ProviderAPIKeys) APIKey(provider string) string {
|
||||
}
|
||||
}
|
||||
|
||||
//nolint:revive // Intentional: apiKey is the unexported helper for APIKey.
|
||||
func (k ProviderAPIKeys) apiKey(provider string) string {
|
||||
return k.APIKey(provider)
|
||||
}
|
||||
|
||||
// BaseURL returns the configured base URL for a provider.
|
||||
func (k ProviderAPIKeys) BaseURL(provider string) string {
|
||||
normalized := NormalizeProvider(provider)
|
||||
@@ -219,7 +214,7 @@ func (c *ModelCatalog) ListConfiguredModels(
|
||||
providerSet := make(map[string]struct{})
|
||||
|
||||
for _, provider := range configuredProviders {
|
||||
normalized := normalizeProvider(provider.Provider)
|
||||
normalized := NormalizeProvider(provider.Provider)
|
||||
if normalized == "" {
|
||||
continue
|
||||
}
|
||||
@@ -264,7 +259,7 @@ func (c *ModelCatalog) ListConfiguredModels(
|
||||
Provider: provider,
|
||||
Models: models,
|
||||
}
|
||||
if keys.apiKey(provider) == "" {
|
||||
if keys.APIKey(provider) == "" {
|
||||
result.Available = false
|
||||
result.UnavailableReason = codersdk.ChatModelProviderUnavailableMissingAPIKey
|
||||
} else {
|
||||
@@ -292,7 +287,7 @@ func (c *ModelCatalog) ListConfiguredProviderAvailability(
|
||||
Provider: provider,
|
||||
Models: []codersdk.ChatModel{},
|
||||
}
|
||||
if keys.apiKey(provider) == "" {
|
||||
if keys.APIKey(provider) == "" {
|
||||
result.Available = false
|
||||
result.UnavailableReason = codersdk.ChatModelProviderUnavailableMissingAPIKey
|
||||
} else {
|
||||
@@ -371,11 +366,6 @@ func NormalizeProvider(provider string) string {
|
||||
}
|
||||
}
|
||||
|
||||
//nolint:revive // Intentional: normalizeProvider is the unexported helper for NormalizeProvider.
|
||||
func normalizeProvider(provider string) string {
|
||||
return NormalizeProvider(provider)
|
||||
}
|
||||
|
||||
func ResolveModelWithProviderHint(modelName, providerHint string) (provider string, model string, err error) {
|
||||
modelName = strings.TrimSpace(modelName)
|
||||
if modelName == "" {
|
||||
@@ -386,7 +376,7 @@ func ResolveModelWithProviderHint(modelName, providerHint string) (provider stri
|
||||
return provider, modelID, nil
|
||||
}
|
||||
|
||||
if provider := normalizeProvider(providerHint); provider != "" {
|
||||
if provider := NormalizeProvider(providerHint); provider != "" {
|
||||
return provider, modelName, nil
|
||||
}
|
||||
|
||||
@@ -422,7 +412,7 @@ func parseCanonicalModelRef(modelRef string) (provider string, model string, ok
|
||||
continue
|
||||
}
|
||||
|
||||
provider := normalizeProvider(parts[0])
|
||||
provider := NormalizeProvider(parts[0])
|
||||
modelID := strings.TrimSpace(parts[1])
|
||||
if provider != "" && modelID != "" {
|
||||
return provider, modelID, true
|
||||
@@ -433,7 +423,7 @@ func parseCanonicalModelRef(modelRef string) (provider string, model string, ok
|
||||
}
|
||||
|
||||
func isChatModelForProvider(provider, modelID string) bool {
|
||||
normalizedProvider := normalizeProvider(provider)
|
||||
normalizedProvider := NormalizeProvider(provider)
|
||||
normalizedModel := strings.ToLower(strings.TrimSpace(modelID))
|
||||
switch normalizedProvider {
|
||||
case fantasyopenai.Name:
|
||||
|
||||
Reference in New Issue
Block a user