topological_inventory-providers-common 2.1.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75348e5abd6addefc5c90886fe1b31fc8405239998e030f6f740ebd2b034d726
-  data.tar.gz: 7b6c51b8299d5209587253954d41e8c7898c0f15fcab3fcdbcdfd631d8311aff
+  metadata.gz: 3292228e7688ff8aa1d33e40d3a50a6e30928cc4b8e950166e9d7d82df61ee53
+  data.tar.gz: a1f98d554c706ff3dc37ea9659ac88ddf9b7e7801958a68fbf6b1824e74f32d7
 SHA512:
-  metadata.gz: d2e5ed6d7135c0ace48bcd109c8b757c8b3f93633053bb8878cbcdc69ea13d69b18461db763ca97ad140d729078d15c1b05b59462fdfcc28a9b487fac0a73d24
-  data.tar.gz: 6967cf0f588c7fc477e308f1cc3d9ad9be1487cb8932506fb5cbd7604d372486a33eb3d503d77a21e7eb3a08e5a02dfeba056f1d04336b44b3037cd28a2f81d0
+  metadata.gz: d44938aa30f1002deb30d15f61f6c89d80da94f6387e3985468ca76ac219d64ad3b57a91d7638480c14d32a17610545dae82abe3044a1328b2ef10ea6f5c9773
+  data.tar.gz: fb858ce78c5a5123e78fb55cb69fe01d7d682baa4c83661ed7ab3e665da95cab283992356a89cd73da1e1cd6580e5b18c8b2e480c70b2a8c9b9cf604b06dbefb

data/CHANGELOG.md

@@ -3,6 +3,9 @@ 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).
+## [3.0.0] - 2021-03-08
+Clowder migration #75 
+
 ## [2.1.5] - 2021-01-07
 Include x-rh-id header in Kafka Availability-Status message #73
 
@@ -84,7 +87,9 @@ manageiq-loggers to >= 0.4.2 #20
 ## [1.0.0] - 2020-03-19
 ### Initial release to rubygems.org
 
-[Unreleased]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.5...HEAD
+[Unreleased]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v3.0.0...HEAD
+[3.0.0]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.5...v3.0.0
+[2.1.5]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.4...v2.1.5
 [2.1.5]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.4...v2.1.5
 [2.1.4]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.3...v2.1.4
 [2.1.3]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.2...v2.1.3

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

@@ -0,0 +1,68 @@
+require 'clowder-common-ruby'
+require 'singleton'
+
+module TopologicalInventory
+  module Providers
+    module Common
+      class ClowderConfig
+        include Singleton
+
+        def self.clowder_enabled?
+          ::ClowderCommonRuby::Config.clowder_enabled?
+        end
+
+        def self.instance
+          @instance ||= {}.tap do |options|
+            if clowder_enabled?
+              config                        = ::ClowderCommonRuby::Config.load
+              options["awsAccessKeyId"]     = config.logging.cloudwatch.accessKeyId
+              options["awsRegion"]          = config.logging.cloudwatch.region
+              options["awsSecretAccessKey"] = config.logging.cloudwatch.secretAccessKey
+              broker                        = config.kafka.brokers.first
+              options["kafkaHost"]          = broker.hostname
+              options["kafkaPort"]          = broker.port
+
+              options["kafkaTopics"] = {}.tap do |topics|
+                config.kafka.topics.each do |topic|
+                  topics[topic.requestedName.to_s] = topic.name.to_s
+                end
+              end
+              options["logGroup"]    = config.logging.cloudwatch.logGroup
+              options["metricsPort"] = config.metricsPort
+              options["metricsPath"] = config.metricsPath # not supported by PrometheusExporter
+            else
+              options["awsAccessKeyId"]     = ENV['CW_AWS_ACCESS_KEY_ID']
+              options["awsRegion"]          = 'us-east-1'
+              options["awsSecretAccessKey"] = ENV['CW_AWS_SECRET_ACCESS_KEY']
+              options["kafkaBrokers"]       = ["#{ENV['QUEUE_HOST']}:#{ENV['QUEUE_PORT']}"]
+              options["kafkaHost"]          = ENV['QUEUE_HOST'] || 'localhost'
+              options["kafkaPort"]          = (ENV['QUEUE_PORT'] || '9092').to_i
+              options["kafkaTopics"]        = {}
+              options["logGroup"]           = 'platform-dev'
+              options["metricsPort"]        = (ENV['METRICS_PORT'] || 9394).to_i
+            end
+          end
+        end
+
+        def self.fill_args_operations(args)
+          args[:metrics_port] = instance['metricsPort']
+          args[:queue_host]   = instance['kafkaHost']
+          args[:queue_port]   = instance['kafkaPort']
+          args
+        end
+
+        def self.kafka_topic(name)
+          instance["kafkaTopics"][name] || name
+        end
+      end
+    end
+  end
+end
+
+# ManageIQ Message Client depends on these variables
+ENV["QUEUE_HOST"] = TopologicalInventory::Providers::Common::ClowderConfig.instance["kafkaHost"]
+ENV["QUEUE_PORT"] = TopologicalInventory::Providers::Common::ClowderConfig.instance["kafkaPort"].to_s
+
+# ManageIQ Logger depends on these variables
+ENV['CW_AWS_ACCESS_KEY_ID']     = TopologicalInventory::Providers::Common::ClowderConfig.instance["awsAccessKeyId"]
+ENV['CW_AWS_SECRET_ACCESS_KEY'] = TopologicalInventory::Providers::Common::ClowderConfig.instance["awsSecretAccessKey"]

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

@@ -1,5 +1,6 @@
 require "more_core_extensions/core_ext/module/cache_with_timeout"
 require "manageiq-messaging"
+require "topological_inventory/providers/common/clowder_config"
 
 module TopologicalInventory
   module Providers
@@ -11,8 +12,8 @@ module TopologicalInventory
         attr_accessor :queue_port
 
         def initialize
-          self.queue_host = ENV['QUEUE_HOST'] || 'localhost'
-          self.queue_port = (ENV['QUEUE_PORT'] || 9092).to_i
+          self.queue_host = TopologicalInventory::Providers::Common::ClowderConfig.instance["kafkaHost"]
+          self.queue_port = TopologicalInventory::Providers::Common::ClowderConfig.instance["kafkaPort"].to_i
         end
 
         def self.default

data/lib/topological_inventory/providers/common/operations/source.rb

@@ -17,7 +17,7 @@ module TopologicalInventory
 
           STATUS_AVAILABLE, STATUS_UNAVAILABLE = %w[available unavailable].freeze
           EVENT_AVAILABILITY_STATUS            = "availability_status".freeze
-          SERVICE_NAME                         = "platform.sources.status".freeze
+          KAFKA_TOPIC_NAME                     = "platform.sources.status".freeze
 
           ERROR_MESSAGES = {
             :authentication_not_found          => "Authentication not found in Sources API",
@@ -209,7 +209,7 @@ module TopologicalInventory
 
           def availability_status_message(payload)
             messaging_client.publish_topic(
-              :service => SERVICE_NAME,
+              :service => TopologicalInventory::Providers::Common::ClowderConfig.kafka_topic(KAFKA_TOPIC_NAME),
               :event   => EVENT_AVAILABILITY_STATUS,
               :payload => payload.to_json,
               :headers => identity

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

@@ -1,7 +1,7 @@
 module TopologicalInventory
   module Providers
     module Common
-      VERSION = "2.1.5".freeze
+      VERSION = "3.0.0".freeze
     end
   end
 end

data/spec/support/shared/availability_check.rb

@@ -38,7 +38,7 @@ RSpec.shared_examples "availability_check" do
 
   def kafka_message(resource_type, resource_id, status, error_message = nil)
     res = {
-      :service => described_class::SERVICE_NAME,
+      :service => described_class::KAFKA_TOPIC_NAME,
       :event   => described_class::EVENT_AVAILABILITY_STATUS,
       :payload => {
         :resource_type => resource_type,

data/topological_inventory-providers-common.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activesupport', '~> 5.2.4.3'
+  spec.add_runtime_dependency 'clowder-common-ruby', '~> 0.2.1'
   spec.add_runtime_dependency 'config', '~> 1.7', '>= 1.7.2'
   spec.add_runtime_dependency 'json', '~> 2.3'
   spec.add_runtime_dependency 'manageiq-loggers', '>= 0.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-providers-common
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Martin Slemr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.4.3
+- !ruby/object:Gem::Dependency
+  name: clowder-common-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +318,7 @@ files:
 - bin/console
 - bin/setup
 - lib/topological_inventory/providers/common.rb
+- lib/topological_inventory/providers/common/clowder_config.rb
 - lib/topological_inventory/providers/common/collector.rb
 - lib/topological_inventory/providers/common/collector/inventory_collection_storage.rb
 - lib/topological_inventory/providers/common/collector/inventory_collection_wrapper.rb