foreman_rh_cloud 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677c042a9d55631df79a60651ca098544507487b346ca82645fbf3496f784a9d
-  data.tar.gz: e7b272141151275e15583433d7014d46b97af88d215da7aff3ce068792887373
+  metadata.gz: 40911c61287fcace17eb79713f616515ca463a0c671f2a663b5dca8c4587c0ca
+  data.tar.gz: 5db731e3f022086fc55b9f6dded6917ff4d459c0565aa48fb4742cdcb2adbb0a
 SHA512:
-  metadata.gz: 30697a4e16332a59135af135387de01398c1d992cb83139a49c20b0708b91b4f780009b1899727079e67b07eb43d5e3c85076f4b5f34a4c1184013b53b262a4a
-  data.tar.gz: d1600cfbfc51b6026d672d0f8a38a3523dffc0cd8eba082afdf32d7faf6c4496c07becceac6fbd3489dc341cd0d4a670e5e79260068b54891987112063a691b6
+  metadata.gz: 06c1ac8778b2c119f3594cfec3afec6662b4ab6925a7b591d88cfa3fb80b76f390d38e5e152249f253095a71ca7484e8fe715906294729d71045bcc5d35022d0
+  data.tar.gz: c629a9b8b860600b1c0a180ebf2d057cc3201a3596fa32bbcf650661e4612fdd5612dba787b32ba70cf8b546662af68d49e98e4edd4e77f49deb22b9d681a408

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -27,11 +27,19 @@ module ForemanInventoryUpload
         cloudToken: Setting[:rh_cloud_token],
         excludePackages: Setting[:exclude_installed_packages],
         accounts: accounts,
+        CloudConnectorStatus: cloud_connector_status,
       }, status: :ok
     end
 
     private
 
+    def cloud_connector_status
+      cloud_connector = ForemanRhCloud::CloudConnector.new
+      job = cloud_connector&.latest_job
+      return nil unless job
+      { id: job.id, task: ForemanTasks::Task.where(:id => job.task_id).first }
+    end
+
     def status_for(label, job_class)
       label = job_class.output_label(label)
       ForemanInventoryUpload::Async::ProgressOutput.get(label)&.status

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -29,12 +29,6 @@ module ForemanInventoryUpload
       render json: cloud_connector.install.to_json
     end
 
-    def cloud_connector_status
-      cloud_connector = ForemanRhCloud::CloudConnector.new
-      task_id = cloud_connector.latest_job&.task_id
-      render json: ForemanTasks::Task.where(:id => task_id).first
-    end
-
     def auto_upload
       Setting[:allow_auto_inventory_upload] = auto_upload_params
       render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)

data/app/services/foreman_rh_cloud/cloud_connector.rb

@@ -20,7 +20,8 @@ module ForemanRhCloud
     end
 
     def latest_job
-      feature_id = RemoteExecutionFeature.find_by_label(CLOUD_CONNECTOR_FEATURE).id
+      feature_id = RemoteExecutionFeature.find_by_label(CLOUD_CONNECTOR_FEATURE)&.id
+      return nil unless feature_id
       JobInvocation.where(:remote_execution_feature_id => feature_id).includes(:task).reorder('foreman_tasks_tasks.started_at DESC').first
     end
 

data/config/Gemfile.lock.gh_test

@@ -1,7 +1,8 @@
 PATH
   remote: ../foreman_rh_cloud
   specs:
-    foreman_rh_cloud (3.0.14)
+    foreman_rh_cloud (3.0.15)
+      foreman_ansible
       katello
       redhat_access
 
@@ -86,8 +87,8 @@ GEM
       activesupport (= 6.0.3.4)
     activerecord-import (1.0.7)
       activerecord (>= 3.2)
-    activerecord-nulldb-adapter (0.5.1)
-      activerecord (>= 5.2.0)
+    activerecord-nulldb-adapter (0.7.0)
+      activerecord (>= 5.2.0, < 6.3)
     activerecord-session_store (1.1.3)
       actionpack (>= 4.0)
       activerecord (>= 4.0)
@@ -126,22 +127,22 @@ GEM
     as_deprecation_tracker (1.5.0)
       activesupport (>= 4.2)
       railties (>= 4.2)
-    ast (2.4.1)
-    audited (4.9.0)
-      activerecord (>= 4.2, < 6.1)
-    autoprefixer-rails (10.0.3.0)
+    ast (2.4.2)
+    audited (4.10.0)
+      activerecord (>= 4.2, < 6.2)
+    autoprefixer-rails (10.2.4.0)
       execjs
     bcrypt (3.1.16)
-    benchmark-ips (2.8.3)
-    binding_of_caller (0.8.0)
+    benchmark-ips (2.8.4)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.5.1)
+    bootsnap (1.7.1)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (6.1.0)
+    bullet (6.1.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -167,28 +168,29 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     concurrent-ruby-edge (0.6.0)
       concurrent-ruby (~> 1.1.6)
     connection_pool (2.2.3)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.9.0)
       addressable
     daemons (1.3.1)
-    database_cleaner (1.8.5)
+    database_cleaner (1.99.0)
     deacon (1.0.0)
-    debug_inspector (0.0.3)
+    debug_inspector (1.0.0)
     declarative (0.0.20)
     declarative-option (0.1.0)
     deep_cloneable (3.0.0)
       activerecord (>= 3.1.0, < 7)
-    deface (1.5.3)
+    deface (1.6.1)
       nokogiri (>= 1.6)
       polyglot
-      rails (>= 4.1)
+      rails (>= 5.2)
       rainbow (>= 2.1.0)
-    docile (1.3.2)
+    docile (1.3.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dynflow (1.4.7)
@@ -199,9 +201,9 @@ GEM
       multi_json
       sequel (>= 4.0.0)
     erubi (1.10.0)
-    excon (0.78.0)
+    excon (0.79.0)
     execjs (2.7.0)
-    facter (4.0.46)
+    facter (4.0.50)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     factory_bot (5.2.0)
@@ -209,12 +211,14 @@ GEM
     factory_bot_rails (5.2.0)
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.1)
     fast_gettext (1.8.0)
-    ffi (1.13.1)
-    fog-aws (3.7.0)
+    ffi (1.14.2)
+    fog-aws (3.8.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -233,7 +237,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-libvirt (0.7.0)
+    fog-libvirt (0.8.0)
       fog-core (>= 1.27.4)
       fog-json
       fog-xml (~> 0.1.1)
@@ -249,7 +253,7 @@ GEM
       fog-xml
       ovirt-engine-sdk (>= 4.1.3)
       rbovirt (~> 0.1.5)
-    fog-vsphere (3.4.0)
+    fog-vsphere (3.5.0)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xml (0.1.3)
@@ -258,7 +262,7 @@ GEM
     font-awesome-sass (4.6.2)
       sass (>= 3.2)
     foreman (0.87.2)
-    foreman-tasks (3.0.2)
+    foreman-tasks (3.0.3)
       dynflow (>= 1.2.3)
       foreman-tasks-core
       get_process_mem
@@ -266,7 +270,15 @@ GEM
       sinatra
     foreman-tasks-core (0.3.4)
       dynflow (>= 1.2.0)
-    foreman_remote_execution (4.2.1)
+    foreman_ansible (6.1.1)
+      deface (< 2.0)
+      foreman_remote_execution (>= 4.2.0)
+      ipaddress (>= 0.8.0, < 1.0)
+    foreman_ansible_core (4.0.0)
+      foreman-tasks-core (~> 0.3.2)
+      foreman_remote_execution_core (~> 1.1)
+      net-ssh
+    foreman_remote_execution (4.2.2)
       deface
       dynflow (>= 1.0.2, < 2.0.0)
       foreman-tasks (>= 0.15.1)
@@ -277,12 +289,12 @@ GEM
     formatador (0.2.5)
     friendly_id (5.3.0)
       activerecord (>= 4.0.0)
-    fx (0.6.0)
+    fx (0.6.2)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    gettext (3.3.6)
+    gettext (3.3.7)
       locale (>= 2.0.5)
       text (>= 1.3.0)
     gettext_i18n_rails (1.8.1)
@@ -306,7 +318,7 @@ GEM
       signet (~> 0.12)
     google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
-    googleauth (0.14.0)
+    googleauth (0.15.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -326,7 +338,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -337,13 +349,13 @@ GEM
     journald-native (1.0.12)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.3.1)
+    json (2.5.1)
     jwt (2.2.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    ldap_fluff (0.4.7)
+    ldap_fluff (0.5.0)
       activesupport
-      net-ldap (>= 0.3.1)
+      net-ldap (>= 0.11)
     little-plugger (1.1.4)
     locale (2.1.3)
     logging (2.3.0)
@@ -352,7 +364,7 @@ GEM
     logging-journald (2.1.0)
       journald-logger (~> 3.0)
       logging
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -367,9 +379,9 @@ GEM
     mime-types-data (3.2020.1104)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.10.3)
-    minitest-reporters (1.4.2)
+    minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
@@ -380,8 +392,8 @@ GEM
       minitest (>= 5.0)
       railties (>= 4.1)
     minitest-tags (0.0.5)
-    mocha (1.11.2)
-    msgpack (1.3.3)
+    mocha (1.12.0)
+    msgpack (1.4.2)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
@@ -392,20 +404,21 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (4.2.0)
     netrc (0.11.0)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth (0.5.4)
+    nio4r (2.5.5)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth (0.5.5)
     optimist (3.0.1)
     os (1.1.1)
     ovirt-engine-sdk (4.4.0)
       json (>= 1, < 3)
-    paint (2.2.0)
+    paint (2.2.1)
     parallel (1.20.1)
     parallel_tests (3.4.0)
       parallel
     parse-cron (0.1.4)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     patternfly-sass (3.59.5)
       bootstrap-sass (~> 3.4.0)
@@ -431,8 +444,8 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.5.1)
-      binding_of_caller (~> 0.7)
+    pry-stack_explorer (0.6.0)
+      binding_of_caller (~> 1.0)
       pry (~> 0.13)
     public_suffix (4.0.6)
     pulp_2to3_migration_client (0.5.1)
@@ -441,7 +454,7 @@ GEM
     pulp_ansible_client (0.4.3)
       faraday (>= 0.14.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_certguard_client (1.0.3)
+    pulp_certguard_client (1.1.0)
       faraday (>= 0.14.0)
       json (~> 2.1, >= 2.1.0)
     pulp_container_client (2.1.0)
@@ -466,6 +479,7 @@ GEM
       puma (>= 3.6, < 5)
     rabl (0.14.3)
       activesupport (>= 2.3.14)
+    racc (1.5.2)
     rack (2.2.3)
     rack-cors (1.0.6)
       rack (>= 1.6.0)
@@ -512,7 +526,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -524,7 +538,7 @@ GEM
       json (>= 1.8)
       nokogiri (~> 1.5)
       optimist (~> 3.0)
-    rdoc (6.2.1)
+    rdoc (6.3.0)
     record_tag_helper (1.0.1)
       actionview (>= 5)
     redhat_access (2.2.18)
@@ -554,8 +568,8 @@ GEM
     roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.1.1)
-      railties (>= 5.1, < 6.1)
+    roadie-rails (2.2.0)
+      railties (>= 5.1, < 6.2)
       roadie (>= 3.1, < 5.0)
     robotex (1.0.0)
     robottelo_reporter (0.1.1)
@@ -579,12 +593,12 @@ GEM
       rubocop (>= 0.72.0)
     ruby-libvirt (0.7.1)
     ruby-openid (2.9.2)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.15.0)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
     rubyzip (2.3.0)
     runcible (2.13.1)
@@ -619,8 +633,8 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sequel (5.39.0)
-    sexp_processor (4.15.1)
+    sequel (5.41.0)
+    sexp_processor (4.15.2)
     shoulda-context (1.2.2)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
@@ -631,12 +645,12 @@ GEM
       rack (~> 2.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 4.2)
-    signet (0.14.0)
+    signet (0.14.1)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -664,10 +678,10 @@ GEM
     statsd-instrument (2.9.2)
     stomp (1.4.10)
     text (1.3.1)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (4.2.0)
@@ -676,11 +690,11 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.6.1)
-    uniform_notifier (1.13.0)
+    uniform_notifier (1.13.2)
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
     vcr (3.0.3)
-    webmock (3.10.0)
+    webmock (3.11.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -690,11 +704,11 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
-    wirb (2.2.1)
+    wirb (2.2.2)
       paint (>= 0.9, < 3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.25)
+    yard (0.9.26)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -733,6 +747,7 @@ DEPENDENCIES
   fog-ovirt (~> 1.2.5)
   fog-vsphere (>= 3.3.1, < 4.0)
   foreman
+  foreman_ansible_core
   foreman_rh_cloud!
   friendly_id (>= 5.3.0, < 5.4)
   get_process_mem