diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index 61b94f60ce98..c4e23bb0cbd6 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -2002,12 +2002,16 @@ linters-settings: # Enforce using key-value pairs only (overrides no-mixed-args, incompatible with attr-only). # Default: false kv-only: true - # Enforce not using global loggers. - # Default: default - no-global: all # Enforce using attributes only (overrides no-mixed-args, incompatible with kv-only). # Default: false attr-only: true + # Enforce not using global loggers. + # Values: + # - "": disabled + # - "all": report all global loggers + # - "default": report only the default slog logger + # Default: "" + no-global: "all" # Enforce using methods that accept a context. # Default: false context-only: true diff --git a/.golangci.reference.yml b/.golangci.reference.yml index 61b94f60ce98..c4e23bb0cbd6 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -2002,12 +2002,16 @@ linters-settings: # Enforce using key-value pairs only (overrides no-mixed-args, incompatible with attr-only). # Default: false kv-only: true - # Enforce not using global loggers. - # Default: default - no-global: all # Enforce using attributes only (overrides no-mixed-args, incompatible with kv-only). # Default: false attr-only: true + # Enforce not using global loggers. + # Values: + # - "": disabled + # - "all": report all global loggers + # - "default": report only the default slog logger + # Default: "" + no-global: "all" # Enforce using methods that accept a context. # Default: false context-only: true diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json index fb5c2a468cde..f411de6cbe3a 100644 --- a/jsonschema/golangci.jsonschema.json +++ b/jsonschema/golangci.jsonschema.json @@ -2317,8 +2317,8 @@ }, "no-global": { "description": "Enforce not using global loggers.", - "enum": ["all", "default"], - "default": "default" + "enum": ["", "all", "default"], + "default": "" }, "no-mixed-args": { "description": "Enforce not mixing key-value pairs and attributes.", diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json index fb5c2a468cde..f411de6cbe3a 100644 --- a/jsonschema/golangci.next.jsonschema.json +++ b/jsonschema/golangci.next.jsonschema.json @@ -2317,8 +2317,8 @@ }, "no-global": { "description": "Enforce not using global loggers.", - "enum": ["all", "default"], - "default": "default" + "enum": ["", "all", "default"], + "default": "" }, "no-mixed-args": { "description": "Enforce not mixing key-value pairs and attributes.",