topological_inventory-core 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e1ad6d83dd4100ab40124b8bd6f7425bab0b935779fbc047cc405f3f2320bb
-  data.tar.gz: be6eef02674c9735e82e04eed7963d5c764d8d3b74188e99539b8fe71079573f
+  metadata.gz: e695f0361b4d66ec73f345609275c5184d882b283471b963a802502a3f474bfb
+  data.tar.gz: d3b514bb133871100ec4003041c1605ec203498c9fe995df50260e520324e037
 SHA512:
-  metadata.gz: f121707edcf1e010f07c453e95cf3cb3e8811d499215b8f2fa38d0887a84353bee5f95a16cff2d2a5dbf2c5d9af9d430be42d7f3a79551a76f93094ca3a9b5e8
-  data.tar.gz: 0bd249257ae7fd676f7021291e0fd8eb33a19e85075034872f85fe54c28984e76a7ca570dcef894b7f4c81ebcea5b52390f2b9ef72a85e2e740a7749d1e64752
+  metadata.gz: bfe84074032bf678982d41a3c86c6db7e97981035930a65c533944e8d7fe1a1409e7db7adb6aa2e6045f6f3fc4451ac817c0491b7a17a3810156f702f479fe2e
+  data.tar.gz: f794a8cae67dc978d1b1e538734243421c23b6e39497347fed8f785a61252cb5aa5b82f93bfb4ea7a56b95d35db289eb156c00c345500907af1fbc48070a4ec4

data/README.md

@@ -1,4 +1,4 @@
-# TopologicalInventory
+# Topological Inventory Core
 
 [![Build Status](https://travis-ci.org/RedHatInsights/topological_inventory-core.svg)](https://travis-ci.org/RedHatInsights/topological_inventory-core)
 [![Maintainability](https://api.codeclimate.com/v1/badges/34f9bd9412e35c1a36fd/maintainability)](https://codeclimate.com/github/RedHatInsights/topological_inventory-core/maintainability)

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/20200421141934_add_source_updated_at.rb

@@ -0,0 +1,5 @@
+class AddSourceUpdatedAt < ActiveRecord::Migration[5.2]
+  def change
+    add_column :volumes, :source_updated_at, :timestamp
+  end
+end

data/db/migrate/20200505101547_add_forwardable_headers_remove_request_id_on_task.rb

@@ -0,0 +1,11 @@
+class AddForwardableHeadersRemoveRequestIdOnTask < ActiveRecord::Migration[5.2]
+  def up
+    add_column :tasks, :forwardable_headers, :jsonb
+    remove_column :tasks, :x_rh_insights_request
+  end
+
+  def down
+    add_column :tasks, :x_rh_insights_request, :string
+    remove_column :tasks, :forwardable_headers
+  end
+end

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/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_04_28_090420) do
+ActiveRecord::Schema.define(version: 2020_08_11_154716) 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_04_28_090420) 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_04_28_090420) 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|
@@ -1190,7 +1192,7 @@ ActiveRecord::Schema.define(version: 2020_04_28_090420) do
     t.string "target_source_ref"
     t.string "target_type"
     t.bigint "source_id"
-    t.string "x_rh_insights_request"
+    t.jsonb "forwardable_headers"
     t.index ["source_id"], name: "index_tasks_on_source_id"
     t.index ["target_type", "target_source_ref"], name: "index_tasks_on_target_type_and_target_source_ref"
     t.index ["tenant_id"], name: "index_tasks_on_tenant_id"
@@ -1328,6 +1330,7 @@ ActiveRecord::Schema.define(version: 2020_04_28_090420) do
     t.bigint "orchestration_stack_id"
     t.bigint "subscription_id"
     t.bigint "refresh_state_part_id"
+    t.datetime "source_updated_at"
     t.index ["archived_at"], name: "index_volumes_on_archived_at"
     t.index ["last_seen_at"], name: "index_volumes_on_last_seen_at"
     t.index ["orchestration_stack_id"], name: "index_volumes_on_orchestration_stack_id"

data/lib/topological_inventory/core/version.rb

@@ -1,5 +1,5 @@
 module TopologicalInventory
   module Core
-    VERSION = '1.1.3'
+    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,18 +173,18 @@ 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)
 
               # 2) Saving to updated records (will be published in Kafka)
               # - see topological_inventory-persister:Workflow.send_task_updates_to_queue!
-              tasks_collection.updated_records << values.merge(:id => task.id, :x_rh_insights_request => task.x_rh_insights_request)
+              tasks_collection.updated_records << values.merge(:id => task.id, :forwardable_headers => task.forwardable_headers)
             end
           end
         end
@@ -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.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Adam Grare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -136,20 +136,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.69.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.69.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -174,13 +202,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
@@ -247,9 +268,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
@@ -354,7 +373,10 @@ files:
 - db/migrate/20200317082640_add_tracking_timestamps_to_refresh_state.rb
 - db/migrate/20200403114310_add_target_and_source_to_task.rb
 - db/migrate/20200414123737_extract_tasks_source_ref_from_context.rb
+- 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/schema.rb
 - db/seeds.rb
 - lib/tasks/topological_inventory_tasks.rake
@@ -386,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core Models and Schema for the Topological Inventory Service.

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,23 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: utf8
-  host: 127.0.0.1
-  port: 5432
-  username: root
-  password: buttons
-  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