topological_inventory-core 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bafb3cb3b7789833d6fafd71e34da8e172039ae49f7fe03a16fac40cba7be4e
-  data.tar.gz: e642d51826923f406e0a24ca75ea57fea47af01386217b7c1d240e0dad7dded1
+  metadata.gz: 574cd191dd5ad268210d1299a4b8cc71355482eead4316b873836effcb63f0bb
+  data.tar.gz: b8ad635b7f2b2cb052e54c7e3e84ebdd5bb428d8645e847cb707c5922f60d366
 SHA512:
-  metadata.gz: 4728c1a6494e41e969d034f14ad64bd4bdb2ec1b1c2ce16bc61d00d327ae49b4fbde05d23dc313b773bb2b261af791b0882ab4803626b785e069f4e4e5f7bcf1
-  data.tar.gz: ac02e6f01322313ece2855c8876a3ae9224cf23a7c3bf86da66a597df76ee8affcfd43aef48693dc30752a8a9fce5b4df1035df08ba39e7beb9d7e4746b9b347
+  metadata.gz: 03a5c8a8eeca049ddbb546598fdf328859247674e033f370ddf4f339bba856b6011cb0421846f91c66158862fd24490f5fb6af11ed4a5f6d208c3534040cd860
+  data.tar.gz: d4be6b1a789b5be5dbfc1a0296f7e01606dce53731416e477c76445dc8b8e3f23ffa6fd4f35b9878e3c730aadac596c5fb45fa9606405f15bb329feae5a1c41a

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/config/database.yml

@@ -1,20 +1,23 @@
 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_core_development
+  database: topological_inventory_development
   min_messages: notice
 
 test:
   <<: *default
-  database: topological_inventory_core_test
+  database: topological_inventory_test
 
 production:
   <<: *default
-  database: topological_inventory_core_production
+  database: topological_inventory_production

data/db/migrate/20200414123737_extract_tasks_source_ref_from_context.rb

@@ -1,6 +1,11 @@
 class ExtractTasksSourceRefFromContext < ActiveRecord::Migration[5.2]
   def up
     Task.find_each do |task|
+      if task.context.is_a?(String)
+        say "Found legacy data in Task #{task.id}, converting String to Hash..."
+        task.context = JSON.parse(task.context)
+      end
+
       source_ref = task.context&.dig('service_instance', 'source_ref')
       next if source_ref.nil?
 

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/20200428090420_add_request_id_to_task.rb

@@ -0,0 +1,5 @@
+class AddRequestIdToTask < ActiveRecord::Migration[5.2]
+  def change
+    add_column :tasks, :x_rh_insights_request, :string
+  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_14_123737) 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_14_123737) 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_14_123737) 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,6 +1192,7 @@ ActiveRecord::Schema.define(version: 2020_04_14_123737) do
     t.string "target_source_ref"
     t.string "target_type"
     t.bigint "source_id"
+    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"
@@ -1327,6 +1330,7 @@ ActiveRecord::Schema.define(version: 2020_04_14_123737) 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.1'
+    VERSION = '1.1.6'
   end
 end

data/lib/topological_inventory/schema/default.rb

@@ -147,11 +147,11 @@ module TopologicalInventory
         return if src_refs.blank?
 
         # Updating Tasks
-        # service_instance_tasks_update_effective(source)
-        service_instance_tasks_update_ineffective(source, src_refs)
+        # service_instance_tasks_update_by_raw_sql(source)
+        service_instance_tasks_update_by_activerecord(tasks_collection, source, src_refs)
       end
 
-      def task_update_values(svc_instance_id, external_url, status, task_status, finished_timestamp)
+      def task_update_values(svc_instance_id, source_ref, external_url, status, task_status, finished_timestamp, source_id)
         {
           :state  => finished_timestamp.blank? ? 'running' : 'completed',
           :status => task_status,
@@ -159,6 +159,8 @@ module TopologicalInventory
             :service_instance => {
               :id         => svc_instance_id,
               :job_status => status,
+              :source_id  => source_id,
+              :source_ref => source_ref,
               :url        => external_url
             }
           }
@@ -166,24 +168,29 @@ module TopologicalInventory
       end
 
       # This method is updating one by one using ActiveRecord
-      def service_instance_tasks_update_ineffective(source, svc_instances_source_ref)
+      def service_instance_tasks_update_by_activerecord(tasks_collection, source, svc_instances_source_ref)
         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|
           ActiveRecord::Base.transaction do
             group.each do |svc_instance|
-              next if tasks_by_source_ref[svc_instance.source_ref].nil?
+              next if (task = tasks_by_source_ref[svc_instance.source_ref]).nil?
 
-              values = task_update_values(svc_instance.id, svc_instance.external_url, svc_instance.extra['status'], svc_instance.extra['task_status'], svc_instance.extra['finished'])
-              tasks_by_source_ref[svc_instance.source_ref].update(values)
+              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)
+              # 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, :forwardable_headers => task.forwardable_headers)
             end
           end
         end
       end
 
       # This method is bulk updating by raw SQL query
-      def service_instance_tasks_update_effective(source)
+      def service_instance_tasks_update_by_raw_sql(source)
         # Get running tasks
         tasks_source_ref = Task.where(:state => 'running', :target_type => 'ServiceInstance', :source_id => source.id)
                          .pluck(:target_source_ref)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Adam Grare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-08-11 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,7 +268,6 @@ 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
@@ -354,6 +374,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
@@ -385,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 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>