- Linting changes.

general-kroll-4-life · general-kroll-4-life · commit 02e79a20002b · 2025-10-04T23:57:52.000+10:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
 
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v4.0.0
+        uses: golangci/golangci-lint-action@v8.0.0
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
           args: --timeout ${{ env.DEFAULT_STEP_TIMEOUT }}m
diff --git a/.golangci.yml b/.golangci.yml
@@ -23,7 +23,7 @@ linters:
     - gochecknoglobals
     - gochecknoinits
     - gocognit
-    - goconst
+    # - goconst
     - gocritic
     - gocyclo
     - godot
@@ -41,8 +41,8 @@ linters:
     - nestif
     - nilerr
     - nilnil
-    - noctx
-    - nolintlint
+    # - noctx
+    # - nolintlint
     - nonamedreturns
     - nosprintfhostport
     - predeclared
@@ -51,7 +51,7 @@ linters:
     - revive
     - rowserrcheck
     - sqlclosecheck
-    - staticcheck
+    # - staticcheck
     - testableexamples
     - testpackage
     - tparallel
@@ -172,15 +172,23 @@ linters:
       - linters:
           - goconst
         path: internal\/test\/.*\.go
+      - linters:
+          - mnd
+        path: pkg\/mcp_server\/.*\.go
+      - linters: 
+          - staticcheck
+        path: ast_format_postgres\.go
       - linters:
           - bodyclose
           - dupl
+          - errcheck
           - funlen
           - goconst
           - gosec
           - noctx
           - revive
           - wrapcheck
+          - govet
         path: _test\.go
     paths:
       - third_party$
diff --git a/internal/stackql/acid/tsm_physio/access_methods.go b/internal/stackql/acid/tsm_physio/access_methods.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck,revive // prefer this nomenclature
 
 var (
 	_ AccessMethods = (*accessMethods)(nil)
diff --git a/internal/stackql/acid/tsm_physio/best_effort_coordinator.go b/internal/stackql/acid/tsm_physio/best_effort_coordinator.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck // prefer this nomenclature
 
 import (
 	"fmt"
diff --git a/internal/stackql/acid/tsm_physio/buffer_pool.go b/internal/stackql/acid/tsm_physio/buffer_pool.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck,revive // prefer this nomenclature
 
 var (
 	_ BufferPool = (*bufferPool)(nil)
diff --git a/internal/stackql/acid/tsm_physio/lazy_coordinator.go b/internal/stackql/acid/tsm_physio/lazy_coordinator.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck,revive // prefer this nomenclature
 
 import (
 	"fmt"
diff --git a/internal/stackql/acid/tsm_physio/lock_manager.go b/internal/stackql/acid/tsm_physio/lock_manager.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck,revive // prefer this nomenclature
 
 var (
 	_ LockManager = (*lockManager)(nil)
diff --git a/internal/stackql/acid/tsm_physio/statement.go b/internal/stackql/acid/tsm_physio/statement.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck // prefer this nomenclature
 
 import (
 	"github.com/stackql/stackql-parser/go/vt/sqlparser"
diff --git a/internal/stackql/acid/tsm_physio/tsm_implementation.go b/internal/stackql/acid/tsm_physio/tsm_implementation.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck // prefer this nomenclature
 
 import (
 	"github.com/stackql/stackql/internal/stackql/acid/tsm"
diff --git a/internal/stackql/acid/tsm_physio/txn_orchestrator.go b/internal/stackql/acid/tsm_physio/txn_orchestrator.go
@@ -1,4 +1,4 @@
-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature
+package tsm_physio //nolint:stylecheck // prefer this nomenclature
 
 import (
 	"fmt"
diff --git a/internal/stackql/acid/txn_context/txn_context.go b/internal/stackql/acid/txn_context/txn_context.go
@@ -1,4 +1,4 @@
-package txn_context //nolint:revive,stylecheck // meaning of package name is clear
+package txn_context //nolint:stylecheck,revive // meaning of package name is clear
 
 var (
 	_ ITransactionContext = &transactionContext{}
diff --git a/internal/stackql/astanalysis/earlyanalysis/first_passes.go b/internal/stackql/astanalysis/earlyanalysis/first_passes.go
@@ -28,7 +28,6 @@ const (
 )
 
 var (
-	//nolint:revive // prefer declarative
 	errPgOnly error = fmt.Errorf("cannot accomodate PG-only statement when backend is not matched to PG")
 )
 
diff --git a/internal/stackql/astvisit/assign_leftover_references.go b/internal/stackql/astvisit/assign_leftover_references.go
@@ -81,7 +81,7 @@ func (v *standardLeftoverReferencesAstVisitor) findTableLeftover(
 	return nil, fmt.Errorf("could not locate table corresponding to expression '%s'", colName.GetRawVal())
 }
 
-//nolint:dupl,funlen,gocognit,gocyclo,cyclop,errcheck,staticcheck,goconst,gocritic,lll,nestif,govet,gomnd,exhaustive,revive // defer uplifts on analysers
+//nolint:dupl,funlen,gocognit,gocyclo,cyclop,errcheck,staticcheck,gocritic,lll,nestif,govet,gomnd,exhaustive,revive // defer uplifts on analysers
 func (v *standardLeftoverReferencesAstVisitor) Visit(node sqlparser.SQLNode) error {
 	var err error
 
diff --git a/internal/stackql/astvisit/query_rewriting.go b/internal/stackql/astvisit/query_rewriting.go
@@ -25,9 +25,8 @@ import (
 )
 
 var (
-	_ QueryRewriteAstVisitor = &standardQueryRewriteAstVisitor{}
-	//nolint:revive // acceptable
-	isJSONEachCompatibleRegexp *regexp.Regexp = regexp.MustCompile(
+	_                          QueryRewriteAstVisitor = &standardQueryRewriteAstVisitor{}
+	isJSONEachCompatibleRegexp *regexp.Regexp         = regexp.MustCompile(
 		`^(.*\.value|value)$`)
 )
 
diff --git a/internal/stackql/astvisit/table_extract.go b/internal/stackql/astvisit/table_extract.go
@@ -47,7 +47,7 @@ func (v *standardParserTableExtractAstVisitor) MergeTableExprs() sqlparser.Table
 	return v.tables
 }
 
-//nolint:dupl,funlen,gocognit,gocyclo,cyclop,errcheck,staticcheck,gocritic,lll,exhaustive,nestif,gomnd,revive // defer uplifts on analysers
+//nolint:dupl,funlen,gocognit,gocyclo,cyclop,errcheck,staticcheck,goconst,gocritic,lll,exhaustive,nestif,gomnd,revive // defer uplifts on analysers
 func (v *standardParserTableExtractAstVisitor) Visit(node sqlparser.SQLNode) error {
 	var err error
 
diff --git a/internal/stackql/data_staging/output_data_staging/packet_preparator.go b/internal/stackql/data_staging/output_data_staging/packet_preparator.go
@@ -1,4 +1,4 @@
-package output_data_staging //nolint:revive,stylecheck // package name is helpful
+package output_data_staging //nolint:stylecheck,revive // package name is helpful
 
 import (
 	"fmt"
diff --git a/internal/stackql/datasource/sql_datasource/sql_datasource.go b/internal/stackql/datasource/sql_datasource/sql_datasource.go
@@ -1,4 +1,4 @@
-package sql_datasource //nolint:revive,stylecheck // package name is helpful
+package sql_datasource //nolint:stylecheck,revive // package name is helpful
 
 import (
 	"database/sql"
diff --git a/internal/stackql/dbmsinternal/dbmsinternal.go b/internal/stackql/dbmsinternal/dbmsinternal.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stackql/stackql/internal/stackql/sql_system"
 )
 
-//nolint:lll,revive // complex regex
+//nolint:lll // complex regex
 var (
 	_                      Router         = &standardDBMSInternalRouter{}
 	internalTableRegexp    *regexp.Regexp = regexp.MustCompile(`(?i)^(?:public\.)?(?:pg_type|pg_namespace|pg_catalog.*|current_schema|pg_.*|information_schema.*)`)
diff --git a/internal/stackql/driver/aggregation_compute_disks_integration_test.go b/internal/stackql/driver/aggregation_compute_disks_integration_test.go
@@ -23,7 +23,7 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksOrderByCrtTmstpAsc(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksOrderByCrtTmstpAsc")
 	if err != nil {
@@ -99,7 +99,7 @@ func TestSelectComputeDisksAggOrderBySizeAsc(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggSizeOrderSizeAsc})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggOrderBySizeDesc(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggOrderBySizeDesc")
 	if err != nil {
@@ -137,7 +137,7 @@ func TestSelectComputeDisksAggOrderBySizeDesc(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggSizeOrderSizeDesc})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggTotalSize(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggTotalSize")
 	if err != nil {
@@ -175,7 +175,7 @@ func TestSelectComputeDisksAggTotalSize(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggSizeTotal})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggTotalString(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggTotalString")
 	if err != nil {
diff --git a/internal/stackql/driver/aggregation_container_subnetworks_integration_test.go b/internal/stackql/driver/aggregation_container_subnetworks_integration_test.go
@@ -49,7 +49,7 @@ func TestSimpleAggGoogleContainerSubnetworksGroupedAllowedDriverOutputAsc(t *tes
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSimpleAggCountGroupedGoogleCotainerSubnetworkTableFileAsc})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSimpleAggGoogleContainerSubnetworksGroupedAllowedDriverOutputDesc(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "table", "TestSimpleAggGoogleContainerSubnetworksGroupedAllowedDriverOutputDesc")
 	if err != nil {
diff --git a/internal/stackql/driver/aggregation_paginated_compute_disks_integration_test.go b/internal/stackql/driver/aggregation_paginated_compute_disks_integration_test.go
@@ -15,7 +15,7 @@ import (
 	lrucache "github.com/stackql/stackql-parser/go/cache"
 )
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksOrderByCrtTmstpAscPaginated(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksOrderByCrtTmstpAscPaginated")
 	if err != nil {
@@ -93,7 +93,7 @@ func TestSelectComputeDisksAggOrderBySizeAscPaginated(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggPaginatedSizeOrderSizeAsc})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggOrderBySizeDescPaginated(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggOrderBySizeDescPaginated")
 	if err != nil {
@@ -132,7 +132,7 @@ func TestSelectComputeDisksAggOrderBySizeDescPaginated(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggPaginatedSizeOrderSizeDesc})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggTotalSizePaginated(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggTotalSizePaginated")
 	if err != nil {
@@ -171,7 +171,7 @@ func TestSelectComputeDisksAggTotalSizePaginated(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksAggPaginatedSizeTotal})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksAggTotalStringPaginated(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSelectComputeDisksAggTotalStringPaginated")
 	if err != nil {
diff --git a/internal/stackql/driver/driver_integration_test.go b/internal/stackql/driver/driver_integration_test.go
@@ -63,7 +63,7 @@ func TestSimpleSelectGoogleComputeInstanceDriver(t *testing.T) {
 	t.Logf("simple select driver integration test passed")
 }
 
-//nolint:lll,errcheck,govet // legacy test
+//nolint:lll,govet // legacy test
 func TestSimpleSelectGoogleComputeInstanceDriverOutput(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSimpleSelectGoogleComputeInstanceDriverOutput")
 	if err != nil {
@@ -98,7 +98,7 @@ func TestSimpleSelectGoogleComputeInstanceDriverOutput(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSimpleSelectGoogleComputeInstanceTextFile01, testobjects.ExpectedSimpleSelectGoogleComputeInstanceTextFile02})
 }
 
-//nolint:lll,errcheck,govet // legacy test
+//nolint:lll,govet // legacy test
 func TestSimpleSelectGoogleComputeInstanceDriverOutputRepeated(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSimpleSelectGoogleComputeInstanceDriverOutputRepeated")
 	if err != nil {
@@ -133,7 +133,7 @@ func TestSimpleSelectGoogleComputeInstanceDriverOutputRepeated(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSimpleSelectGoogleComputeInstanceTextFile01, testobjects.ExpectedSimpleSelectGoogleComputeInstanceTextFile02})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSimpleSelectGoogleContainerSubnetworksAllowedDriverOutput(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSimpleSelectGoogleContainerSubnetworksAllowedDriverOutput")
 	if err != nil {
@@ -168,7 +168,7 @@ func TestSimpleSelectGoogleContainerSubnetworksAllowedDriverOutput(t *testing.T)
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSimpleSelectGoogleCotainerSubnetworkTextFile01, testobjects.ExpectedSimpleSelectGoogleCotainerSubnetworkTextFile02})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSimpleInsertGoogleComputeNetworkAsync(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSimpleInsertGoogleComputeNetworkAsync")
 	if err != nil {
diff --git a/internal/stackql/driver/functions_integration_test.go b/internal/stackql/driver/functions_integration_test.go
@@ -18,7 +18,7 @@ import (
 	lrucache "github.com/stackql/stackql-parser/go/cache"
 )
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksOrderByCrtTmstpAscPlusJsonExtract(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "csv", "TestSelectComputeDisksOrderByCrtTmstpAscPlusJsonExtract")
 	if err != nil {
@@ -56,7 +56,7 @@ func TestSelectComputeDisksOrderByCrtTmstpAscPlusJsonExtract(t *testing.T) {
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksOrderCrtTmstpAscPlusJsonExtract})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonExtract(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "csv", "TestSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonExtract")
 	if err != nil {
@@ -94,7 +94,7 @@ func TestSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonExtract(t *testing.
 	stackqltestutil.RunCaptureTestAgainstFiles(t, testSubject, []string{testobjects.ExpectedSelectComputeDisksOrderCrtTmstpAscPlusJsonExtractCoalesce})
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonInstr(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "csv", "TestSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonInstr")
 	if err != nil {
diff --git a/internal/stackql/driver/okta_integration_test.go b/internal/stackql/driver/okta_integration_test.go
@@ -72,7 +72,7 @@ func TestSelectOktaApplicationAppsDriver(t *testing.T) {
 	t.Logf("simple select driver integration test passed")
 }
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestSimpleSelectOktaApplicationAppsDriverOutput(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "text", "TestSimpleSelectOktaApplicationAppsDriverOutput")
 	if err != nil {
diff --git a/internal/stackql/driver/routine_complex_integration_test.go b/internal/stackql/driver/routine_complex_integration_test.go
@@ -18,7 +18,7 @@ import (
 	lrucache "github.com/stackql/stackql-parser/go/cache"
 )
 
-//nolint:govet,lll,errcheck // legacy test
+//nolint:govet,lll // legacy test
 func TestUnionAllSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonExtract(t *testing.T) {
 	runtimeCtx, err := stackqltestutil.GetRuntimeCtx(testobjects.GetGoogleProviderString(), "csv", "TestUnionAllSelectComputeDisksOrderByCrtTmstpAscPlusCoalesceJsonExtract")
 	if err != nil {
diff --git a/internal/stackql/execution/mono_valent_execution.go b/internal/stackql/execution/mono_valent_execution.go
@@ -1472,7 +1472,7 @@ func shimProcessHTTP(
 	return httpResponse, nil
 }
 
-//nolint:funlen,gocognit // acceptable for now
+//nolint:funlen,gocognit,errcheck // acceptable for now
 func GetMonitorExecutor(
 	handlerCtx handler.HandlerContext,
 	provider anysdk.Provider,
diff --git a/internal/stackql/internal_data_transfer/internaldto/heirarchy_identifiers.go b/internal/stackql/internal_data_transfer/internaldto/heirarchy_identifiers.go
@@ -10,7 +10,7 @@ import (
 
 var (
 	_                     HeirarchyIdentifiers = &standardHeirarchyIdentifiers{}
-	pgInternalObjectRegex *regexp.Regexp       = regexp.MustCompile(`^pg_.*`) //nolint:revive // prefer declarative
+	pgInternalObjectRegex *regexp.Regexp       = regexp.MustCompile(`^pg_.*`)
 )
 
 type HeirarchyIdentifiers interface {
diff --git a/internal/stackql/planbuilder/entrypoint.go b/internal/stackql/planbuilder/entrypoint.go
@@ -38,7 +38,7 @@ func (pb *standardPlanBuilder) BuildUndoPlanFromContext(_ handler.HandlerContext
 	return nil, nil
 }
 
-//nolint:funlen,gocognit // no big deal
+//nolint:funlen,gocognit,errcheck // no big deal
 func (pb *standardPlanBuilder) BuildPlanFromContext(handlerCtx handler.HandlerContext) (plan.Plan, error) {
 	defer handlerCtx.GetGarbageCollector().Close()
 	tcc, err := internaldto.NewTxnControlCounters(handlerCtx.GetTxnCounterMgr())
diff --git a/internal/stackql/planbuilder/plan_builder.go b/internal/stackql/planbuilder/plan_builder.go
@@ -310,8 +310,8 @@ func (pgb *standardPlanGraphBuilder) handleDescribe(pbi planbuilderinput.PlanBui
 	if err != nil {
 		return err
 	}
-	var extended bool = strings.TrimSpace(strings.ToUpper(node.Extended)) == "EXTENDED" //nolint:revive // acceptable
-	var full bool = strings.TrimSpace(strings.ToUpper(node.Full)) == "FULL"             //nolint:revive // acceptable
+	var extended bool = strings.TrimSpace(strings.ToUpper(node.Extended)) == "EXTENDED"
+	var full bool = strings.TrimSpace(strings.ToUpper(node.Full)) == "FULL"
 	_, isView := md.GetHeirarchyObjects().GetHeirarchyIDs().GetView()
 	if isView {
 		stmtCtx, sOk := primitiveGenerator.GetPrimitiveComposer().GetIndirectDescribeSelectCtx()
diff --git a/internal/stackql/planbuilderinput/deprecated.go b/internal/stackql/planbuilderinput/deprecated.go
@@ -8,7 +8,6 @@ import (
 	"github.com/stackql/stackql/internal/stackql/sqlstream"
 )
 
-//nolint:revive // prefer declarative
 var (
 	multipleWhitespaceRegexp     *regexp.Regexp = regexp.MustCompile(`\s+`)
 	getOidsRegexp                *regexp.Regexp = regexp.MustCompile(`(?i)select\s+t\.oid,\s+(?:NULL|typarray)\s+from.*pg_type`) //nolint:lll // long string
diff --git a/internal/stackql/primitivebuilder/shortcuts.go b/internal/stackql/primitivebuilder/shortcuts.go
@@ -329,6 +329,7 @@ func convertProviderServicesToMap(
 	return retVal
 }
 
+//nolint:errcheck // future proofing
 func filterServices(
 	services map[string]anysdk.ProviderService,
 	tableFilter func(anysdk.ITable) (anysdk.ITable, error),
diff --git a/internal/stackql/primitivegenerator/statement_analyzer.go b/internal/stackql/primitivegenerator/statement_analyzer.go
@@ -37,7 +37,6 @@ import (
 	"github.com/stackql/stackql-parser/go/vt/sqlparser"
 )
 
-//nolint:revive // prefer this way
 var (
 	synonymJSONRegexp *regexp.Regexp = regexp.MustCompile(`^application/[\S]*json[\S]*$`)
 	synonymXMLRegexp  *regexp.Regexp = regexp.MustCompile(`^(?:application|text)/[\S]*xml[\S]*$`)
diff --git a/internal/stackql/provider/generic.go b/internal/stackql/provider/generic.go
diff --git a/internal/stackql/sql_system/postgres.go b/internal/stackql/sql_system/postgres.go
diff --git a/internal/stackql/sql_system/setup_scripts.go b/internal/stackql/sql_system/setup_scripts.go
diff --git a/internal/stackql/sql_system/sql_system.go b/internal/stackql/sql_system/sql_system.go
diff --git a/internal/stackql/sql_system/sqlite.go b/internal/stackql/sql_system/sqlite.go
diff --git a/internal/stackql/typing/generic_typing_config.go b/internal/stackql/typing/generic_typing_config.go
diff --git a/internal/stackql/typing/relayed_column_metadata.go b/internal/stackql/typing/relayed_column_metadata.go
diff --git a/internal/stackql/util/utility.go b/internal/stackql/util/utility.go
diff --git a/internal/test/testobjects/request_payload.go b/internal/test/testobjects/request_payload.go
diff --git a/pkg/mcp_server/backend.go b/pkg/mcp_server/backend.go
diff --git a/pkg/mcp_server/config.go b/pkg/mcp_server/config.go
diff --git a/pkg/mcp_server/dto.go b/pkg/mcp_server/dto.go
diff --git a/pkg/mcp_server/example_backend.go b/pkg/mcp_server/example_backend.go
diff --git a/pkg/mcp_server/server.go b/pkg/mcp_server/server.go
diff --git a/pkg/mcp_server/server_test.go b/pkg/mcp_server/server_test.go
diff --git a/pkg/textutil/textutil.go b/pkg/textutil/textutil.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tsm_physio //nolint:revive,stylecheck // prefer this nomenclature`
	`1`	`+package tsm_physio //nolint:stylecheck,revive // prefer this nomenclature`
`2`	`2`
`3`	`3`	`var (`
`4`	`4`	`_ AccessMethods = (*accessMethods)(nil)`