topological_inventory-core 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30dee988592e3a42eb583950140e28c84acc4b2a63d0cf6a37bbc582636be6f
-  data.tar.gz: 49f5130373e785f030006a2bb498e3e4496f3537aa828dae137951e629d2a4d1
+  metadata.gz: e695f0361b4d66ec73f345609275c5184d882b283471b963a802502a3f474bfb
+  data.tar.gz: d3b514bb133871100ec4003041c1605ec203498c9fe995df50260e520324e037
 SHA512:
-  metadata.gz: bef32c25295035fd93eeef616a0419b487da930a8815db4b9228469ec5c8b5df83de0927935e537175c451b7183dc0e11e45369759095c87a4431bc41105826d
-  data.tar.gz: ff4d8355ac873dd466d54043d37030b16baa679fc5884f0026ea0ebf3f70865f14c96cf59c22c5793431006a8705173beec9d8f1a374b3664e8b9b06567fa24c
+  metadata.gz: bfe84074032bf678982d41a3c86c6db7e97981035930a65c533944e8d7fe1a1409e7db7adb6aa2e6045f6f3fc4451ac817c0491b7a17a3810156f702f479fe2e
+  data.tar.gz: f794a8cae67dc978d1b1e538734243421c23b6e39497347fed8f785a61252cb5aa5b82f93bfb4ea7a56b95d35db289eb156c00c345500907af1fbc48070a4ec4

data/lib/topological_inventory/core/version.rb

@@ -1,5 +1,5 @@
 module TopologicalInventory
   module Core
-    VERSION = '1.1.7'
+    VERSION = '1.1.8'
   end
 end

data/lib/topological_inventory/schema/default.rb

@@ -151,14 +151,15 @@ module TopologicalInventory
         service_instance_tasks_update_by_activerecord(tasks_collection, source, src_refs)
       end
 
-      def task_update_values(svc_instance_id, source_ref, external_url, status, task_status, finished_timestamp, source_id)
+      def task_update_values(svc_instance_id, source_ref, external_url, status, artifacts, task_status, finished_timestamp, archived_timestamp, source_id)
         {
-          :state  => finished_timestamp.blank? ? 'running' : 'completed',
-          :status => task_status,
+          :state   => finished_timestamp.blank? && archived_timestamp.blank? ? 'running' : 'completed',
+          :status  => task_status,
           :context => {
             :service_instance => {
               :id         => svc_instance_id,
               :job_status => status,
+              :artifacts  => artifacts,
               :source_id  => source_id,
               :source_ref => source_ref,
               :url        => external_url
@@ -172,12 +173,12 @@ module TopologicalInventory
         service_instances = ServiceInstance.where(:source_id => source.id, :source_ref => svc_instances_source_ref)
         tasks_by_source_ref = Task.where(:state => 'running', :target_type => 'ServiceInstance', :source_id => source.id, :target_source_ref => service_instances.pluck(:source_ref)).index_by(&:target_source_ref)
 
-        service_instances.select(:id, :external_url, :source_ref, :extra).find_in_batches do |group|
+        service_instances.select(:id, :archived_at, :external_url, :source_ref, :extra).find_in_batches do |group|
           ActiveRecord::Base.transaction do
             group.each do |svc_instance|
               next if (task = tasks_by_source_ref[svc_instance.source_ref]).nil?
 
-              values = task_update_values(svc_instance.id, svc_instance.source_ref, svc_instance.external_url, svc_instance.extra['status'], svc_instance.extra['task_status'], svc_instance.extra['finished'], source.id)
+              values = task_update_values(svc_instance.id, svc_instance.source_ref, svc_instance.external_url, svc_instance.extra['status'], svc_instance.extra['artifacts'], svc_instance.extra['task_status'], svc_instance.extra['finished'], svc_instance.archived_at, source.id)
               # 1) Updating Task
               task.update(values)
 
@@ -198,19 +199,20 @@ module TopologicalInventory
 
         # Load saved service instances (IDs needed)
         svc_instances_values = ServiceInstance.where(:source_ref => tasks_source_ref)
-                                 .pluck(:id, :external_url, :source_ref,
-                                        Arel.sql("extra->'finished'"),
-                                        Arel.sql("extra->'status'"),
-                                        Arel.sql("extra->'task_status'"))
+                                              .pluck(:id, :archived_at, :external_url, :source_ref,
+                                                     Arel.sql("extra->'finished'"),
+                                                     Arel.sql("extra->'status'"),
+                                                     Arel.sql("extra->'task_status'"),
+                                                     Arel.sql("extra->'artifacts'"))
         return if svc_instances_values.blank?
 
         sql_update_values = []
 
         # Preparing SQL update values from loaded ServiceInstances
         svc_instances_values.each do |attrs|
-          id, external_url, source_ref, finished_timestamp, status, task_status = attrs[0], attrs[1], attrs[2], attrs[3], attrs[4], attrs[5]
+          id, archived_at, external_url, source_ref, finished_timestamp, status, task_status, artifacts = attrs[0], attrs[1], attrs[2], attrs[3], attrs[4], attrs[5], attrs[6], attrs[7]
 
-          values = task_update_values(id, external_url, status, task_status, finished_timestamp)
+          values = task_update_values(id, source_ref, external_url, status, artifacts, task_status, finished_timestamp, archived_at, source.id)
           sql_update_values << "('#{source_ref}', '#{values[:state]}', '#{values[:status]}', '#{values[:context].to_json}'::json)"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-core
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Adam Grare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant