bosh_common 1.3262.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 187dd3328a19039e185d45ab97eb1c6a3cd9630f
-  data.tar.gz: c7d730f8de38ad42a6e1c813141ff4aa47d7c77d
+SHA256:
+  metadata.gz: '09e3e71a65390e9ed3bbd2ccfa7084d71fc52cb67a6435c46856c0b24eb34306'
+  data.tar.gz: 6f75ab074cc56fbca906d77484811aaf1e7eb349ae7a5ddbe425ad150e9eb0b8
 SHA512:
-  metadata.gz: cef2f3bee24e0d4b6bed8da6795a70c7b94b108d10e5807decc9304e2eea51d1faa3b4f02321a60b839fc434d0c597dfa2e6508cadac44a7cb25912326533fa8
-  data.tar.gz: ab1e233670057e13520342c6e52a673587ea2b67a5e0d0eae990a2210558dc50eca8967b7f7558cd653b4cddbcad9ecf82333c38cb4b26a66c71aaaef31ae16a
+  metadata.gz: b4c087d7d8f757edba148a76589f949b13d6ce946daae280740dcdece123a97c7debaa6030249fd5ba90f3be800cfeb75af9db74f86087b2007fc0d149538033
+  data.tar.gz: b42bc24055ab54b600b00558a28dc42ddfd788a556b21e8318799c0676e6b919bd3a3cf7ed6fc98902a9d4a0e8e98f745cdd290f23dadff2c6fb50453be75e03

data/lib/common/common.rb

@@ -1,4 +1,3 @@
-# Copyright (c) 2012 VMware, Inc.
 require 'common/errors'
 require 'common/retryable'
 

data/lib/common/exec/error.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2012 VMware, Inc.
-
 module Bosh::Exec
 # Raised when there was an error executing the command
   class Error < StandardError

data/lib/common/exec/result.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2012 VMware, Inc.
-
 module Bosh::Exec
   class Result
     # command that generated the result

data/lib/common/exec.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2012 VMware, Inc.
-
 module Bosh; end
 
 require "common/exec/result"

data/lib/common/logging/filters.rb

@@ -0,0 +1,19 @@
+require 'common/logging/regex_filter'
+
+module Bosh::Common::Logging
+  def self.null_query_filter
+    Bosh::Common::Logging::RegexFilter.new(
+      [
+        { /^\(\d+\.\d+s\) \(conn: \d+\) SELECT NULL$/ => nil },
+      ],
+    )
+  end
+
+  def self.query_redaction_filter
+    Bosh::Common::Logging::RegexFilter.new(
+      [
+        { /^(\(\d+\.\d+s\) \(conn: \d+\) (INSERT INTO ("|`).*?("|`)|UPDATE ("|`).*?("|`)|DELETE FROM ("|`).*?("|`))).+/m => '\1 <redacted>' },
+      ],
+    )
+  end
+end

data/lib/common/logging/regex_filter.rb

@@ -0,0 +1,27 @@
+require 'logging/filter'
+
+module Bosh
+  module Common
+    module Logging
+      class RegexFilter < ::Logging::Filter
+        def initialize(filters)
+          @filters = filters
+        end
+
+        def allow(event)
+          @filters.each do |hash|
+            match_pattern, replacement_pattern = hash.first
+
+            if replacement_pattern.nil?
+              return nil if match_pattern.match?(event.data)
+            else
+              event.data = event.data.gsub(match_pattern, replacement_pattern)
+            end
+          end
+
+          event
+        end
+      end
+    end
+  end
+end

data/lib/common/ssl.rb

@@ -39,15 +39,15 @@ module Bosh
       private
 
       def load_or_create_key_and_csr_cert
-        if File.exists?(@key_path) && !File.exists?(@certificate_path)
+        if File.exist?(@key_path) && !File.exist?(@certificate_path)
           raise MatchingFileNotFound, 'The key that matches the given certificate could not be found.'
         end
 
-        if File.exists?(@certificate_path) && !File.exists?(@key_path)
+        if File.exist?(@certificate_path) && !File.exist?(@key_path)
           raise MatchingFileNotFound, 'The certificate that matches the given key could not be found.'
         end
 
-        if File.exists?(@key_path) && File.exists?(@certificate_path)
+        if File.exist?(@key_path) && File.exist?(@certificate_path)
           load_key_and_csr_cert
         else
           create_key_and_csr_cert

data/lib/common/thread_formatter.rb

@@ -1,9 +1,12 @@
 class ThreadFormatter
-  FORMAT = "%s, [%s#%d] [%s] %5s -- %s: %s\n"
+  FORMAT = "%s, [%s#%d] [%s] %5s -- %s: %s\n".freeze
 
   # get pattern layout for Logging::Logger
   def self.layout
-    Logging.layouts.pattern(:pattern => "%.1l, [%d #%p] [%T] %5l -- %c: %m\n")
+    Logging.layouts.pattern(
+      pattern: "%.1l, [%d #%p] [%T] %5l -- %c: %m\n",
+      date_pattern: '%Y-%m-%dT%H:%M:%S.%s',
+    )
   end
 
   attr_accessor :datetime_format
@@ -14,15 +17,14 @@ class ThreadFormatter
 
   def call(severity, time, progname, msg)
     thread_name = Thread.current[:name] || "0x#{Thread.current.object_id.to_s(16)}"
-    FORMAT % [severity[0..0], format_datetime(time), $$, thread_name, severity, progname,
-              msg2str(msg)]
+    format(FORMAT, severity[0..0], format_datetime(time), $$, thread_name, severity, progname, msg2str(msg))
   end
 
   private
 
   def format_datetime(time)
     if @datetime_format.nil?
-      time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
+      time.strftime('%Y-%m-%dT%H:%M:%S.') << format('%06d ', time.usec)
     else
       time.strftime(@datetime_format)
     end
@@ -30,19 +32,18 @@ class ThreadFormatter
 
   def msg2str(msg)
     case msg
-      when ::String
-        msg
-      when ::Exception
-        "#{ msg.message } (#{ msg.class })\n" <<
-            (msg.backtrace || []).join("\n")
-      else
-        msg.inspect
+    when ::String
+      msg
+    when ::Exception
+      "#{msg.message} (#{msg.class})\n" <<
+        (msg.backtrace || []).join("\n")
+    else
+      msg.inspect
     end
   end
 end
 
 module Kernel
-
   def with_thread_name(name)
     old_name = Thread.current[:name]
     Thread.current[:name] = name
@@ -50,5 +51,4 @@ module Kernel
   ensure
     Thread.current[:name] = old_name
   end
-
 end

data/lib/common/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Common
-    VERSION = '1.3262.4.0'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_common
 version: !ruby/object:Gem::Version
-  version: 1.3262.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - VMware
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -30,56 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 description: BOSH common
 email: support@cloudfoundry.com
 executables: []
@@ -92,6 +64,8 @@ files:
 - lib/common/exec.rb
 - lib/common/exec/error.rb
 - lib/common/exec/result.rb
+- lib/common/logging/filters.rb
+- lib/common/logging/regex_filter.rb
 - lib/common/release/release_directory.rb
 - lib/common/retryable.rb
 - lib/common/ssl.rb
@@ -107,9 +81,9 @@ files:
 - lib/common/version/version_list.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,16 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: BOSH common
 test_files: []