topological_inventory-providers-common 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868c8f764cd11d9888ed99698a309cc199fdf92823963f4e5cae71208d506ff7
-  data.tar.gz: 39c352e8b1306bdb87675bf0ccc1fe08f02b0c13555b2466c4c38d7a76979aca
+  metadata.gz: 22571a5f48d3d126fc3fddd2992643b2dddccc6c2bb20b5eb8263901bf6ca148
+  data.tar.gz: 437ce9d295f10ab3e10b2b32ea64c89efecd66ff2538c6152f2d67d38f4a9f39
 SHA512:
-  metadata.gz: c2a8af390114548a89c7dc5bb43f1a6e3784a5a59ebd2ce1c7451c15726015df1353e3dcbc3755d7637d696707b0d6db93e5d4907920a1c4b09d3f6410130a77
-  data.tar.gz: 46e6596954367336de4049f8024da8b5e63e5be4c60636c77f91f22c3e407229b38aca604137907d1f5cd6411201d9c3b57e4ad5bab2cfb749b2c04e9ca8eeab
+  metadata.gz: 4abc37ec7c40eef6bdd0e4555404607228edf396b3c9482b7f735419f1359e68bd13139515d9dc2f0a359e28f23e51f38e39877405c5f3e66f7e414f559fce17
+  data.tar.gz: e2652340645a001205c36f4cfad7fe75f0a0dd18301f27cce72fcf856fb48c4be6b2863c00aa7ed7ae40141f1153096ed1bebae6a478e8854f13a52e8524788f

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.8] - 2020-08-10
+Added refresh-type to save and sweep inventory #45
+Add => to error messages that rubocop missed #44
+
 ## [1.0.7] - 2020-07-27
 Update operations/source model for receptor-enabled availability checks #36
 Add check for Application subresource under a Source during Availability check #40
@@ -43,8 +47,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/v1.0.7...HEAD
-[1.0.6]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.6...v1.0.7
+[Unreleased]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.8...HEAD
+[1.0.8]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.7...v1.0.8
+[1.0.7]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.6...v1.0.7
 [1.0.6]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.5...v1.0.6
 [1.0.5]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.4...v1.0.5
 [1.0.4]: https://github.com/RedHatInsights/topological_inventory-providers-common/compare/v1.0.3...v1.0.4

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

@@ -153,8 +153,9 @@ module TopologicalInventory
 
         def endpoint
           @endpoint ||= api_client.fetch_default_endpoint(source_id)
-        rescue e
+        rescue => e
           logger.availability_check("Failed to fetch Endpoint for Source #{source_id}: #{e.message}", :error)
+          nil
         end
 
         def authentication
@@ -163,14 +164,16 @@ module TopologicalInventory
                               else
                                 api_client.fetch_authentication(source_id, endpoint)
                               end
-        rescue e
+        rescue => e
           logger.availability_check("Failed to fetch Authentication for Source #{source_id}: #{e.message}", :error)
+          nil
         end
 
         def application
           @application ||= api_client.fetch_application(source_id)
-        rescue e
+        rescue => e
           logger.availability_check("Failed to fetch Application for Source #{source_id}: #{e.message}", :error)
+          nil
         end
 
         def check_time

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

@@ -1,7 +1,7 @@
 module TopologicalInventory
   module Providers
     module Common
-      VERSION = "1.0.7"
+      VERSION = "1.0.8"
     end
   end
 end

data/spec/support/shared/availability_check.rb

@@ -42,7 +42,7 @@ RSpec.shared_examples "availability_check" do
       stub_get(:endpoint, list_endpoints_response)
       stub_get(:authentication, list_endpoint_authentications_response)
       stub_get(:password, internal_api_authentication_response)
-      stub_get(:application, "[]")
+      stub_not_found(:application)
 
       # PATCH
       source_patch_body   = {'availability_status' => described_class::STATUS_AVAILABLE, 'last_available_at' => subject.send(:check_time), 'last_checked_at' => subject.send(:check_time)}.to_json
@@ -65,7 +65,7 @@ RSpec.shared_examples "availability_check" do
       stub_get(:endpoint, list_endpoints_response)
       stub_get(:authentication, list_endpoint_authentications_response)
       stub_get(:password, internal_api_authentication_response)
-      stub_get(:application, "[]")
+      stub_not_found(:application)
 
       # PATCH
       connection_error_message = "Some connection error"
@@ -86,8 +86,8 @@ RSpec.shared_examples "availability_check" do
 
     it "updates only Source to 'unavailable' status if Endpoint not found" do
       # GET
-      stub_get(:endpoint, '')
-      stub_get(:application, "[]")
+      stub_not_found(:endpoint)
+      stub_not_found(:application)
 
       # PATCH
       source_patch_body = {'availability_status' => described_class::STATUS_UNAVAILABLE, 'last_checked_at' => subject.send(:check_time)}.to_json
@@ -106,7 +106,7 @@ RSpec.shared_examples "availability_check" do
       # GET
       stub_get(:endpoint, list_endpoints_response)
       stub_get(:authentication, list_endpoint_authentications_response_empty)
-      stub_get(:application, "[]")
+      stub_not_found(:application)
 
       # PATCH
       source_patch_body   = {'availability_status' => described_class::STATUS_UNAVAILABLE, 'last_checked_at' => subject.send(:check_time)}.to_json
@@ -142,7 +142,7 @@ RSpec.shared_examples "availability_check" do
     context "when it is available" do
       it "updates the availability status to available" do
         # GET
-        stub_get(:endpoint, "[]")
+        stub_not_found(:endpoint)
         stub_get(:application, list_applications_response)
         # PATCH
         application_patch_body = {'last_available_at' => subject.send(:check_time), 'last_checked_at' => subject.send(:check_time)}.to_json
@@ -163,7 +163,7 @@ RSpec.shared_examples "availability_check" do
     context "when it is unavailable" do
       it "updates the availability status to unavailable" do
         # GET
-        stub_get(:endpoint, "[]")
+        stub_not_found(:endpoint)
         stub_get(:application, list_applications_unavailable_response)
         # PATCH
         application_patch_body = {'last_checked_at' => subject.send(:check_time)}.to_json
@@ -203,6 +203,27 @@ RSpec.shared_examples "availability_check" do
     end
   end
 
+  def stub_not_found(object_type)
+    case object_type
+    when :endpoint
+      stub_request(:get, "#{sources_api_url}/sources/#{source_id}/endpoints")
+        .with(:headers => headers)
+        .to_return(:status => 404, :body => {}.to_json, :headers => {})
+    when :authentication
+      stub_request(:get, "#{sources_api_url}/endpoints/#{endpoint_id}/authentications")
+        .with(:headers => headers)
+        .to_return(:status => 404, :body => {}.to_json, :headers => {})
+    when :password
+      stub_request(:get, "#{host_url}#{sources_internal_api_path}/authentications/#{authentication_id}?expose_encrypted_attribute%5B%5D=password")
+        .with(:headers => headers)
+        .to_return(:status => 404, :body => {}.to_json, :headers => {})
+    when :application
+      stub_request(:get, "#{sources_api_url}/sources/#{source_id}/applications")
+        .with(:headers => headers)
+        .to_return(:status => 404, :body => {}.to_json, :headers => {})
+    end
+  end
+
   def stub_patch(object_type, data)
     case object_type
     when :source

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-providers-common
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Martin Slemr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport