topological_inventory-core 1.1.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2335e206b9eba3ab955c62d29422156bb4053e737cd9aece9a5b91748b76ea
-  data.tar.gz: 163c7d564a74402c23b5001b885c2e83795263547592f83032c7514f771300a0
+  metadata.gz: ecf54fde41844a8514ee76d28e48f00c320db19dd611deae8558651d1eb8a00f
+  data.tar.gz: 3cd41ad2eba32e8cf42ef78739078e85c7092bd52ee9b732a8366e618668bc2b
 SHA512:
-  metadata.gz: c16a6361df474d38fc189a159f27a33ee3dd4b21d17cc0ae256128ae8ac6db0eb67d64b4e4103fff64fc8905169b7b86e1448e84df6d3ebf1391960fa721b8e0
-  data.tar.gz: 35e182d151981fa96c604c630c87686d3c0a1a65fc061789be277602c0b1b91e73d74e2fc3f5171b3754af0bf2cfba81a45bba20cbc6b9bd01579a222744fca2
+  metadata.gz: 6ff09bf2432c59e6120cd285d31e780d738f0e4efef355a0d04adcf31d9a5f40826bd3517327bee505d1b896a93954f0c9bb0d0ead24369d7ef8d7892a30b8cc
+  data.tar.gz: 4c4287841a0ea473368029963f8630d269cdffce00f848503c67bfb69a1824c37452533fb8fb269b8fbf352287dac6fbe76bed832f61843388c9b4d5618eacf9

data/README.md

@@ -1,6 +1,6 @@
 # Topological Inventory Core
 
-[![Build Status](https://travis-ci.org/RedHatInsights/topological_inventory-core.svg)](https://travis-ci.org/RedHatInsights/topological_inventory-core)
+[![Build Status](https://travis-ci.com/RedHatInsights/topological_inventory-core.svg)](https://travis-ci.com/RedHatInsights/topological_inventory-core)
 [![Maintainability](https://api.codeclimate.com/v1/badges/34f9bd9412e35c1a36fd/maintainability)](https://codeclimate.com/github/RedHatInsights/topological_inventory-core/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/34f9bd9412e35c1a36fd/test_coverage)](https://codeclimate.com/github/RedHatInsights/topological_inventory-core/test_coverage)
 [![Security](https://hakiri.io/github/RedHatInsights/topological_inventory-core/master.svg)](https://hakiri.io/github/RedHatInsights/topological_inventory-core/master)

data/app/models/refresh_state.rb

@@ -1,4 +1,6 @@
 class RefreshState < ActiveRecord::Base
+  require 'acts_as_tenant'
+
   belongs_to :source
   belongs_to :tenant
   has_many :refresh_state_parts

data/app/models/refresh_state_part.rb

@@ -1,4 +1,6 @@
 class RefreshStatePart < ActiveRecord::Base
+  require 'acts_as_tenant'
+
   belongs_to :refresh_state
   belongs_to :tenant
 

data/db/migrate/20200811154716_add_index_to_refresh_state_parts.rb

@@ -0,0 +1,6 @@
+class AddIndexToRefreshStateParts < ActiveRecord::Migration[5.2]
+  def change
+    add_index :refresh_state_parts, :uuid
+    add_index :refresh_states, :uuid
+  end
+end

data/db/migrate/20210106143551_add_guest_info_to_vms.rb

@@ -0,0 +1,5 @@
+class AddGuestInfoToVms < ActiveRecord::Migration[5.2]
+  def change
+    add_column :vms, :guest_info, :string
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_05_05_101547) do
+ActiveRecord::Schema.define(version: 2021_01_06_143551) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -622,6 +622,7 @@ ActiveRecord::Schema.define(version: 2020_05_05_101547) do
     t.datetime "updated_at", null: false
     t.index ["refresh_state_id", "uuid"], name: "index_refresh_state_parts_on_refresh_state_id_and_uuid", unique: true
     t.index ["tenant_id"], name: "index_refresh_state_parts_on_tenant_id"
+    t.index ["uuid"], name: "index_refresh_state_parts_on_uuid"
   end
 
   create_table "refresh_states", force: :cascade do |t|
@@ -639,6 +640,7 @@ ActiveRecord::Schema.define(version: 2020_05_05_101547) do
     t.datetime "finished_at"
     t.index ["source_id", "uuid"], name: "index_refresh_states_on_source_id_and_uuid", unique: true
     t.index ["tenant_id"], name: "index_refresh_states_on_tenant_id"
+    t.index ["uuid"], name: "index_refresh_states_on_uuid"
   end
 
   create_table "reservation_tags", id: :serial, force: :cascade do |t|
@@ -1258,6 +1260,7 @@ ActiveRecord::Schema.define(version: 2020_05_05_101547) do
     t.bigint "subscription_id"
     t.bigint "host_id"
     t.bigint "refresh_state_part_id"
+    t.string "guest_info"
     t.index ["archived_at"], name: "index_vms_on_archived_at"
     t.index ["flavor_id"], name: "index_vms_on_flavor_id"
     t.index ["host_id"], name: "index_vms_on_host_id"

data/lib/topological_inventory/core/version.rb

@@ -1,5 +1,5 @@
 module TopologicalInventory
   module Core
-    VERSION = '1.1.5'
+    VERSION = '1.2.1'
   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.5
+  version: 1.2.1
 platform: ruby
 authors:
 - Adam Grare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: manageiq-password
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.69.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.69.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -202,13 +216,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/config/topological_inventory_manifest.js
-- app/assets/javascripts/topological_inventory/application.js
-- app/assets/stylesheets/topological_inventory/application.css
-- app/controllers/topological_inventory/application_controller.rb
-- app/helpers/topological_inventory/application_helper.rb
-- app/jobs/topological_inventory/application_job.rb
-- app/mailers/topological_inventory/application_mailer.rb
 - app/models/application_record.rb
 - app/models/availability.rb
 - app/models/cluster.rb
@@ -275,9 +282,7 @@ files:
 - app/models/volume.rb
 - app/models/volume_attachment.rb
 - app/models/volume_type.rb
-- app/views/layouts/topological_inventory/application.html.erb
 - config/database.dev.yml
-- config/database.yml
 - db/migrate/20180919170553_add_sources_and_endpoints.rb
 - db/migrate/20180927171624_add_container_models.rb
 - db/migrate/20180927205317_add_service_catalog_models.rb
@@ -385,6 +390,8 @@ files:
 - db/migrate/20200421141934_add_source_updated_at.rb
 - db/migrate/20200428090420_add_request_id_to_task.rb
 - db/migrate/20200505101547_add_forwardable_headers_remove_request_id_on_task.rb
+- db/migrate/20200811154716_add_index_to_refresh_state_parts.rb
+- db/migrate/20210106143551_add_guest_info_to_vms.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/tasks/topological_inventory_tasks.rake

data/app/assets/config/topological_inventory_manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../javascripts/topological_inventory .js
-//= link_directory ../stylesheets/topological_inventory .css

data/app/assets/javascripts/topological_inventory/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/app/assets/stylesheets/topological_inventory/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/controllers/topological_inventory/application_controller.rb

@@ -1,5 +0,0 @@
-module TopologicalInventory
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
-  end
-end

data/app/helpers/topological_inventory/application_helper.rb

@@ -1,4 +0,0 @@
-module TopologicalInventory
-  module ApplicationHelper
-  end
-end

data/app/jobs/topological_inventory/application_job.rb

@@ -1,4 +0,0 @@
-module TopologicalInventory
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/mailers/topological_inventory/application_mailer.rb

@@ -1,6 +0,0 @@
-module TopologicalInventory
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end

data/app/views/layouts/topological_inventory/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Topological inventory</title>
-  <%= stylesheet_link_tag    "topological_inventory/application", media: "all" %>
-  <%= javascript_include_tag "topological_inventory/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/config/database.yml

@@ -1,22 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: utf8
-  host: localhost
-  port: 5432
-  username: root
-  pool: 5
-  wait_timeout: 5
-  min_messages: warning
-
-development:
-  <<: *default
-  database: topological_inventory_development
-  min_messages: notice
-
-test:
-  <<: *default
-  database: topological_inventory_test
-
-production:
-  <<: *default
-  database: topological_inventory_production