gitlab-labkit 0.28.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7858d4755aa67f53d9ec232cfba39e8ee1245cea7e19a27a902e37fb3a80fda
-  data.tar.gz: f730b09600a2d855a1391ef7c10538cdaa757838cef2ca7daff2d1a0349be3e3
+  metadata.gz: b4b144027d3b759c387a532a28c949d4551e6af5bc058d886d8a0f15f7156ddd
+  data.tar.gz: 40650117c553316ffb3260ddde7c50005287856ded9dec86339dc33b8c4b73d6
 SHA512:
-  metadata.gz: 878574f3a7c26400e6ea7fcfbc2c4d16fc7f86cec1f9651dfad977d07a1bf203c6ef3ab843a3c996b3c0a6c17bbf5e847d23d7a2ab160c559f7617a24d9d9345
-  data.tar.gz: 4b7aea548f16103da6ac81aa8a9a195efdc952feaa13860415fc50ab028eb0e5ce76c4283d10b7e2f03807573ca2717de2386e9becdd0ec7031c18658495b27b
+  metadata.gz: 19bf82ef843b8bc1ec633d50065c674d95f9ade7c0b3bcc2e9a9764972b650c4497f5741dffb95c9e30df0b5a7b7d68af601007f27396aa875bfe85573df6e26
+  data.tar.gz: 957be0fe6bcc5a00f8565c9c2e55de978032586fc6749ab4b0b2fc1a8ca5a1e92ff547b2a3ea2d489d28c54f77b39eef97ae54eb2e0419afe2b3be04e4e091a5

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+2.7.7

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.7

data/lib/labkit/fips.rb

@@ -18,12 +18,15 @@ module Labkit
       #
       # @return [Boolean]
       def enabled?
-        # Attempt to auto-detect FIPS mode from OpenSSL
-        return true if OpenSSL.fips_mode
+        # Check if it set manually to false
+        return false if %w[0 false no].include?(ENV["FIPS_MODE"])
 
         # Otherwise allow it to be set manually via the env vars
         return true if %w[1 true yes].include?(ENV["FIPS_MODE"])
 
+        # Otherwise, attempt to auto-detect FIPS mode from OpenSSL
+        return true if OpenSSL.fips_mode
+
         false
       end
 

data/lib/labkit/logging/json_logger.rb

@@ -6,6 +6,17 @@ require "json"
 module Labkit
   module Logging
     class JsonLogger < ::Logger
+      INTERNAL_LOG_KEYS = Labkit::Context::RAW_KEYS + [Labkit::Context::LOG_KEY]
+      RESERVED_LOG_KEYS = INTERNAL_LOG_KEYS.map(&:to_sym) + [
+        :environment,
+        :host,
+        :shard,
+        :stage,
+        :subcomponent,
+        :tier,
+        :type,
+      ].freeze
+
       def self.log_level(fallback: ::Logger::DEBUG)
         ENV.fetch("GITLAB_LOG_LEVEL", fallback)
       end
@@ -24,6 +35,7 @@ module Labkit
         when String
           data[:message] = message
         when Hash
+          reject_reserved_log_keys!(message)
           data.merge!(message)
         end
 
@@ -39,6 +51,16 @@ module Labkit
       def dump_json(data)
         JSON.generate(data)
       end
+
+      def reject_reserved_log_keys!(hash)
+        return if ENV["RAILS_ENV"] == "production"
+
+        reserved_keys_used = hash.transform_keys(&:to_sym).slice(*RESERVED_LOG_KEYS)
+        if reserved_keys_used.any?
+          raise "The following log keys used are reserved: #{reserved_keys_used.keys.join(", ")}" +
+                  "\n\nUse key names that are descriptive e.g. by using a prefix."
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -372,6 +372,7 @@ files:
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".rufo"
+- ".tool-versions"
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile