topological_inventory-providers-common 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d5e54970be70204d7ac119fdd23e0a68bbc01a3e1d3c64520ce3fc6129cfe7
-  data.tar.gz: 624c68af0b57940bc5436099f1a4238eb5405a9e9b87706911278b5c3fcf44e0
+  metadata.gz: ecc26cbace6fd3e43de690666e17f8c7d27e153efb05a2d48fb281712f073e8c
+  data.tar.gz: 0221166156a11b5f75da12b3fc1bb861b8594a058823fa2771c62a529ea165f5
 SHA512:
-  metadata.gz: ac55e0263630b78533d49b061d972beab29e249911f785f536a8acbb3cada1d88e3935849d089791f9be001b87a0f3100b4e44bc3595527d169107ef14a5e9b0
-  data.tar.gz: df3b8288f73292d647a77629d5f5ae78a21dad4eeb206e6b1e4e2d077ffd475c60c705f0365311b374fd88544a81943403484089f829aa3611919e95d2ee734f
+  metadata.gz: ce5b60dd2047b2b316fa8e0add3b114664f707feae697afd45febf1abd265af96990b89c32ba53e6084f5abfb0a177cdc5ea2eb8c1f9437fdd3791e2dd19b2f0
+  data.tar.gz: d5ebb51170ffb18b7aaba271f5361742c1a2d849c96b181274b7f2562e67e4cb29bf94f83067ca41e26c51ff01a5ccf595fa4c776135a3b4cd1b154a7b3fea97

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.2] - 2021-08-24
+Support PSK headers in sources api client #78
+
 ## [3.0.1] - 2021-04-30
 More generic activesupport dependency #77
 
@@ -90,7 +93,8 @@ 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/v3.0.1.freeze...HEAD
+[Unreleased]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v3.0.2.freeze...HEAD
+[3.0.2]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v3.0.1.freeze...v3.0.2.freeze
 [3.0.1]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v3.0.0.freeze...v3.0.1.freeze
 [3.0.0]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.5.freeze...v3.0.0.freeze
 [2.1.5]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v2.1.4.freeze...v2.1.5.freeze

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

@@ -15,10 +15,27 @@ module TopologicalInventory
         end
 
         def init_default_api
-          default_headers.merge!(identity) if identity.present?
+          # TODO: remove this once PSK is set up everywhere.
+          if identity.present?
+            if psk
+              parsed_identity = JSON.parse(Base64.decode64(identity.fetch('x-rh-identity')))
+
+              default_headers.merge!(
+                "x-rh-sources-psk"            => psk,
+                "x-rh-sources-account-number" => parsed_identity['identity']['account_number']
+              )
+            else
+              default_headers.merge!(identity)
+            end
+          end
+
           ::SourcesApiClient::DefaultApi.new(self)
         end
 
+        def psk
+          @psk ||= ENV.fetch("SOURCES_PSK", nil)
+        end
+
         def fetch_default_endpoint(source_id)
           endpoints = api.list_source_endpoints(source_id)&.data || []
           endpoints.find(&:default)

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

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

data/spec/support/shared/availability_check.rb

@@ -9,7 +9,8 @@ RSpec.shared_examples "availability_check" do
   let(:external_tenant) { '11001' }
   let(:kafka_client) { TopologicalInventory::Providers::Common::MessagingClient.default.client }
   let(:identity) { {'x-rh-identity' => Base64.strict_encode64({'identity' => {'account_number' => external_tenant, 'user' => {'is_org_admin' => true}}}.to_json)} }
-  let(:headers) { {'Content-Type' => 'application/json'}.merge(identity) }
+  let(:identity_with_psk) { { "x-rh-sources-account-number" => external_tenant, "x-rh-sources-psk" => '1234' } }
+  let(:headers) { ENV['SOURCES_PSK'] ? {'Content-Type' => 'application/json'}.merge(identity_with_psk) : {'Content-Type' => 'application/json'}.merge(identity)  }
   let(:status_available) { described_class::STATUS_AVAILABLE }
   let(:status_unavailable) { described_class::STATUS_UNAVAILABLE }
   let(:error_message) { 'error_message' }

data/spec/topological_inventory/providers/common/operations/source_spec.rb

@@ -1,5 +1,15 @@
 require "topological_inventory/providers/common/operations/source"
 
 RSpec.describe TopologicalInventory::Providers::Common::Operations::Source do
+  context "PSK" do
+    around do |example|
+      ENV['SOURCES_PSK'] = '1234'
+      example.run
+      ENV['SOURCES_PSK'] = nil
+    end
+
+    it_behaves_like "availability_check"
+  end
+
   it_behaves_like "availability_check"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-providers-common
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Martin Slemr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport