topological_inventory-providers-common 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022a317ceef535823e38291efad54d0a498905a6149e9fe75e5fc3ee036b7277
-  data.tar.gz: ade50e0e3fc05c34ec151673c076e9b521bd7d3426fd82480dc2c30e00406d7c
+  metadata.gz: 76ba202072a52538f20a377fcf8f85923ba04e2ad745d64dc59c95c0332e6474
+  data.tar.gz: 74664f658d5299244d9276a964ac9c2a8c15a96840c0d6749dac09b567e3b968
 SHA512:
-  metadata.gz: a9e7f2af5e8affba2ae20513a0cc802aef9bdbdcefbac6ab3aff174fc4ee7cbf4fcafb3138845bcf90a9a11b8e4e363b605b549bf3cfefe90c847be842b04a63
-  data.tar.gz: 2c41976bc692984a032847e5b2e24fa7c30ec4c0f9da14032fc31e9dbf69da0ebad0c33d88ea08f7dee700c9a84f5e174b682073ae7a6f9e9cfb021230bbe88f
+  metadata.gz: bfd655f70da56219cb312d4c5b46403b71b6401ac9dd47e2ed6827f079a4df7d6edc5e89e33c293438a7c2dcbdbc024382605917b9ec8e5ec3a75d9553cd6eb5
+  data.tar.gz: 642ea847c5f186e62983a7df70bc39feaf7aa8a841d07ef5f0dcaf9a7cdb59866eace13dcbc9730712bbc8b7f2761f51b1df79befc357fc58f02ef16fab192b5

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2020-05-15
+### Changed
+
+Extend logger with common logging phrases #22
+Security update: JSON 2.3, ActiveSupport 5.2.4.3 #23
+
 ## [1.0.1] - 2020-05-06
 ### Changed
 
@@ -15,5 +21,6 @@ manageiq-loggers to >= 0.4.2 #20
 ### Initial release to rubygems.org
 
 [Unreleased]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.1...HEAD
+[1.0.2]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/RedHatInsights/topological_inventory-providers-common/releases/v1.0.0

data/Gemfile

@@ -10,6 +10,6 @@ gem "sources-api-client", "~> 1.0"
 gem "topological_inventory-ingress_api-client", "~> 1.0"
 
 group :development, :test do
-  gem 'rake', '~> 12.0.0'
+  gem 'rake', '>= 12.3.3'
   gem 'pry-byebug'
 end

data/README.md

@@ -1,3 +1,8 @@
 # TopologicalInventory::Providers::Common
 
+[![Build Status](https://travis-ci.org/RedHatInsights/topological_inventory-providers-common.svg?branch=master)](https://travis-ci.org/RedHatInsights/topological_inventory-providers-common)
+[![Maintainability](https://api.codeclimate.com/v1/badges/df747492b802bfea3c83/maintainability)](https://codeclimate.com/github/RedHatInsights/topological_inventory-providers-common/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/df747492b802bfea3c83/test_coverage)](https://codeclimate.com/github/RedHatInsights/topological_inventory-providers-common/test_coverage)
+[![security](https://hakiri.io/github/RedHatInsights/topological_inventory-providers-common/master.svg)](https://hakiri.io/github/RedHatInsights/topological_inventory-providers-common/master)
+
 Common code for topological-inventory collectors and Operation workers.

data/lib/topological_inventory/providers/common/logging.rb

@@ -3,13 +3,38 @@ require "manageiq/loggers"
 module TopologicalInventory
   module Providers
     module Common
+      module LoggingFunctions
+        def collecting(status, source, entity_type, refresh_state_uuid, total_parts = nil)
+          msg = "[#{status.to_s.upcase}] Collecting #{entity_type}"
+          msg += ", :total parts => #{total_parts}" if total_parts.present?
+          msg += ", :source_uid => #{source}, :refresh_state_uuid => #{refresh_state_uuid}"
+          info(msg)
+        end
+
+        def collecting_error(source, entity_type, refresh_state_uuid, exception)
+          msg = "[ERROR] Collecting #{entity_type}, :source_uid => #{source}, :refresh_state_uuid => #{refresh_state_uuid}"
+          msg += ":message => #{exception.message}\n#{exception.backtrace.join("\n")}"
+          error(msg)
+        end
+
+        def sweeping(status, source, sweep_scope, refresh_state_uuid)
+          msg = "[#{status.to_s.upcase}] Sweeping inactive records, :sweep_scope => #{sweep_scope}, :source_uid => #{source}, :refresh_state_uuid => #{refresh_state_uuid}"
+          info(msg)
+        end
+      end
+
+      class Logger < ManageIQ::Loggers::CloudWatch
+        def self.new(*args)
+          super.tap { |logger| logger.extend(TopologicalInventory::Providers::Common::LoggingFunctions) }
+        end
+      end
+
       class << self
         attr_writer :logger
       end
 
       def self.logger
-        @logger ||= ManageIQ::Loggers::Container.new
-        @logger
+        @logger ||= TopologicalInventory::Providers::Common::Logger.new
       end
 
       module Logging

data/lib/topological_inventory/providers/common/version.rb

@@ -1,7 +1,7 @@
 module TopologicalInventory
   module Providers
     module Common
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

data/topological_inventory-providers-common.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'activesupport', '~> 5.2.4.3'
   spec.add_runtime_dependency 'config', '~> 1.7', '>= 1.7.2'
-  spec.add_runtime_dependency "activesupport", "~> 5.2.2"
+  spec.add_runtime_dependency 'json', '~> 2.3'
   spec.add_runtime_dependency "manageiq-loggers", ">= 0.4.2"
-  spec.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.add_runtime_dependency "topological_inventory-api-client", "~> 3.0", ">= 3.0.1"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-providers-common
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Martin Slemr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -31,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: manageiq-loggers
   requirement: !ruby/object:Gem::Requirement
@@ -58,26 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: topological_inventory-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -116,16 +110,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement