foreman_scc_manager 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96e9a75d883e70453b301cfc95ccdcb3906204f9ae87b5c8abec1f1970bef49f
-  data.tar.gz: 9b5b2d8a57b2a0da65631603bb77f5b3503353aa0095267ffe7bb4724c93049d
+  metadata.gz: bd1877e55ef5915c8b11be58c142ee73292f450a0681cabfe0d4b0d410a977b3
+  data.tar.gz: 93678d164b05f4a4fa6a6f5a31ea17f43200acf071a0de58a8266e470b1c90ae
 SHA512:
-  metadata.gz: ea1ba3bbdfb6215d48a99ef89a241cf1735de4c085df7e0ee16b849e1bbd786a5734e9b1bfbd79c18ea78d42e2d0440ffbf263e94401b44689a8ef7742b04428
-  data.tar.gz: 6ef467fe3c5deead9ccc7555a30ac4b96257a8ec269f333d3826b5e28e366def180a5940f1f932be8329719cb488e06d0184ee533c0fb862b915ad135bbf5595
+  metadata.gz: d6e11f9a75def00e1752330fcb7288081f1d2730ac6f0ae865b6ddb711ea545ccfd2db98094d9b71ba7d234669b2cb1491fd688dc34d4feca28cd1ad4bb11e5a
+  data.tar.gz: 4ff67012a62baf789859ccc57f9b450a49446e185dda4520c4ecac387b8b9755f69ffc30a43a93196d15500efc88b9ffd56627c56f2c4d698f881a6449c4cd41

data/app/controllers/scc_accounts_controller.rb

@@ -1,6 +1,6 @@
 class SccAccountsController < ApplicationController
-  before_filter :find_organization
-  before_filter :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
+  before_action :find_organization
+  before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
   include Api::TaxonomyScope
   include Foreman::Controller::AutoCompleteSearch
 

data/app/controllers/scc_products_controller.rb

@@ -1,5 +1,5 @@
 class SccProductsController < ApplicationController
-  before_filter :find_resource, only: %i[show subscribe unsubscribe]
+  before_action :find_resource, only: %i[show subscribe unsubscribe]
   include Api::TaxonomyScope
   include Foreman::Controller::AutoCompleteSearch
 

data/app/models/scc_account.rb

@@ -64,8 +64,13 @@ class SccAccount < ApplicationRecord
     end
     # delete repositories beeing removed upstream (Active record seems to be wrong here...)
     # scc_repositories.where.not(scc_id: upstream_repo_ids).delete_all
-    upstream_repo_ids_str = upstream_repo_ids.map{ |id| ActiveRecord::Base.sanitize(id) }.join(',')
-    ActiveRecord::Base.connection.execute("delete from scc_repositories where scc_repositories.scc_account_id = #{ActiveRecord::Base.sanitize(id)} and scc_repositories.scc_id not in (#{upstream_repo_ids_str});")
+    if upstream_repo_ids.empty?
+      urid_query_fragment = ''
+    else
+      upstream_repo_ids_str = upstream_repo_ids.map{ |id| ActiveRecord::Base.connection.quote(id) }.join(',')
+      urid_query_fragment = " and scc_repositories.scc_id not in (#{upstream_repo_ids_str})"
+    end
+    ActiveRecord::Base.connection.execute("delete from scc_repositories where scc_repositories.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{urid_query_fragment};")
   end
 
   def update_scc_products(upstream_products)
@@ -86,8 +91,13 @@ class SccAccount < ApplicationRecord
     end
     # delete products beeing removed upstream (Active record seems to be wrong here...)
     # scc_products.where.not(scc_id: upstream_product_ids).delete_all
-    upstream_product_ids_str = upstream_product_ids.map{ |id| ActiveRecord::Base.sanitize(id) }.join(',')
-    ActiveRecord::Base.connection.execute("delete from scc_products where scc_products.scc_account_id = #{ActiveRecord::Base.sanitize(id)} and scc_products.scc_id not in (#{upstream_product_ids_str});")
+    if upstream_product_ids.empty?
+      upid_query_fragment = ''
+    else
+      upstream_product_ids_str = upstream_product_ids.map{ |id| ActiveRecord::Base.connection.quote(id) }.join(',')
+      upid_query_fragment = " and scc_products.scc_id not in (#{upstream_product_ids_str})"
+    end
+    ActiveRecord::Base.connection.execute("delete from scc_products where scc_products.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{upid_query_fragment};")
     # rewire product to product relationships
     upstream_products.each do |up|
       extensions = scc_products.where(scc_id: up['extensions'].map { |ext| ext['id'] })

data/db/migrate/20170221100619_create_scc_accounts.rb

@@ -1,4 +1,4 @@
-class CreateSccAccounts < ActiveRecord::Migration
+class CreateSccAccounts < ActiveRecord::Migration[4.2]
   def change
     create_table :scc_accounts do |t|
       t.string :login, limit: 255

data/db/migrate/20170227103408_create_scc_products.rb

@@ -1,4 +1,4 @@
-class CreateSccProducts < ActiveRecord::Migration
+class CreateSccProducts < ActiveRecord::Migration[4.2]
   def change
     create_table :scc_products do |t|
       t.references :scc_account, index: true, foreign_key: true

data/db/migrate/20170301131641_create_scc_repositories.rb

@@ -1,4 +1,4 @@
-class CreateSccRepositories < ActiveRecord::Migration
+class CreateSccRepositories < ActiveRecord::Migration[4.2]
   def change
     create_table :scc_repositories do |t|
       t.references :scc_account, index: true, foreign_key: true

data/db/migrate/20170301141330_create_scc_products_scc_repositories_join_table.rb

@@ -1,4 +1,4 @@
-class CreateSccProductsSccRepositoriesJoinTable < ActiveRecord::Migration
+class CreateSccProductsSccRepositoriesJoinTable < ActiveRecord::Migration[4.2]
   def change
     create_join_table :scc_products, :scc_repositories do |t|
       # t.index [:scc_product_id, :scc_repository_id]

data/db/migrate/20170301163451_add_product_type_to_scc_product.rb

@@ -1,4 +1,4 @@
-class AddProductTypeToSccProduct < ActiveRecord::Migration
+class AddProductTypeToSccProduct < ActiveRecord::Migration[4.2]
   def change
     add_column :scc_products, :product_type, :string, limit: 63
   end

data/db/migrate/20170302082912_remove_repositories_from_scc_products.rb

@@ -1,4 +1,4 @@
-class RemoveRepositoriesFromSccProducts < ActiveRecord::Migration
+class RemoveRepositoriesFromSccProducts < ActiveRecord::Migration[4.2]
   def change
     remove_column :scc_products, :repositories, :string
   end

data/db/migrate/20170302121542_create_scc_extendings.rb

@@ -1,4 +1,4 @@
-class CreateSccExtendings < ActiveRecord::Migration
+class CreateSccExtendings < ActiveRecord::Migration[4.2]
   def change
     create_table :scc_extendings do |t|
       t.references :scc_product, index: true, foreign_key: false, null: false

data/db/migrate/20170303085304_add_organization_to_scc_account.rb

@@ -1,4 +1,4 @@
-class AddOrganizationToSccAccount < ActiveRecord::Migration
+class AddOrganizationToSccAccount < ActiveRecord::Migration[4.2]
   class SccAccount < ApplicationRecord
     belongs_to :organization
   end

data/db/migrate/20170303131704_add_product_id_to_scc_product.rb

@@ -1,4 +1,4 @@
-class AddProductIdToSccProduct < ActiveRecord::Migration
+class AddProductIdToSccProduct < ActiveRecord::Migration[4.2]
   def change
     add_column :scc_products, :product_id, :integer, index: true, null: true
     add_foreign_key :scc_products, :katello_products, column: :product_id, on_delete: :nullify

data/db/migrate/20170307092057_add_synced_to_scc_account.rb

@@ -1,4 +1,4 @@
-class AddSyncedToSccAccount < ActiveRecord::Migration
+class AddSyncedToSccAccount < ActiveRecord::Migration[4.2]
   def change
     add_column :scc_accounts, :synced, :datetime, default: nil
   end

data/db/migrate/20170418132648_add_name_to_scc_account.rb

@@ -1,4 +1,4 @@
-class AddNameToSccAccount < ActiveRecord::Migration
+class AddNameToSccAccount < ActiveRecord::Migration[4.2]
   def change
     add_column :scc_accounts, :name, :string, limit: 255
   end

data/db/migrate/20170505063726_add_sync_status_to_scc_account.rb

@@ -1,4 +1,4 @@
-class AddSyncStatusToSccAccount < ActiveRecord::Migration
+class AddSyncStatusToSccAccount < ActiveRecord::Migration[4.2]
   def change
     add_column :scc_accounts, :sync_status, :string
   end

data/db/migrate/20180321000000_change_sync_status_to_sync_task.rb

@@ -1,4 +1,4 @@
-class ChangeSyncStatusToSyncTask < ActiveRecord::Migration
+class ChangeSyncStatusToSyncTask < ActiveRecord::Migration[4.2]
   def change
     remove_column :scc_accounts, :sync_status, :string
     add_column :scc_accounts, :sync_task_id, :uuid, null: true

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
+        version: '5.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement