smart_proxy_container_gateway 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fcdcfa36eed1f6e070503c159281e5c72e07cfd2b78c7fd08fc67e852b2eadb
-  data.tar.gz: 834e6422b299d6e434c0cddd2923c3fa2d548109655221d8f259ff45e3becb0f
+  metadata.gz: 271e1e6cb4519a3267a367bcfb454ff673031b470be686f4442906ff8d522326
+  data.tar.gz: b7d8d2610a9a7bb307b198bdc8e25e4d476fcee2c5e95e9d5d0aba35612448fa
 SHA512:
-  metadata.gz: 7ef2a0fe40e712fa60e3222a707cac996b279efab0410763191cf69e24679f6cfff5ea2c07263bcb5d7bdefc196706e502d67e52c5411411bf7172a446736634
-  data.tar.gz: 622dacf9d030aec24a60d3581bcb2dbf769bc9beb6d42a2544d0068dd70c10cddc176afe1241df22a8a34cfa29bc6db98b6a8bee650969678af2364c56786e77
+  metadata.gz: edadb66c3f7a9633d1e20f423d2d34a23dfac78085b1d23ed0add423bb1d1b564698e24401d3eeacf650a36d25f180d4a10158175f6590b1315d432dcf75c2ae
+  data.tar.gz: 880574aea904a3b8fe068b3c35250c47572ef47193be75687efdd4407c4d71dbc00a2e48b964746b5b3295f54f47858ea2c86a6c24ac107a078065690f44d068

data/lib/smart_proxy_container_gateway/foreman_api.rb

@@ -1,27 +1,18 @@
-require 'uri'
-require 'openssl'
+require 'proxy/request'
 
 module Proxy
   module ContainerGateway
-    class ForemanApi
+    class ForemanApi < ::Proxy::HttpRequest::ForemanRequest
       def registry_request(auth_header, params, suffix, uuid: '', cert: false)
-        uri = URI.join(Proxy::SETTINGS.foreman_url, Proxy::ContainerGateway::Plugin.settings.katello_registry_path, suffix)
-        uri.query = process_params(params)
+        path = "#{Proxy::ContainerGateway::Plugin.settings.katello_registry_path}#{suffix}"
+        query = params.slice('scope', 'account').compact
 
-        req = Net::HTTP::Get.new(uri)
-        req.add_field('Authorization', auth_header) unless cert
-        req.add_field('Accept', 'application/json')
-        req.add_field('HostUUID', uuid) if cert
-        req.content_type = 'application/json'
-        http = Net::HTTP.new(uri.hostname, uri.port)
-        http.use_ssl = true
+        headers = {}
+        headers['Authorization'] = auth_header unless cert
+        headers['HostUUID'] = uuid if cert
 
-        http.request(req)
-      end
-
-      def process_params(params_in)
-        params = params_in.slice('scope', 'account').compact
-        URI.encode_www_form(params)
+        req = request_factory.create_get(path, query, headers)
+        send_request(req)
       end
 
       def fetch_token(auth_header, params)

data/lib/smart_proxy_container_gateway/sequel_migrations/006_bigint_ids.rb

@@ -0,0 +1,69 @@
+# rubocop:disable Metrics/BlockLength
+Sequel.migration do
+  up do
+    # SQLite's INTEGER type already supports 64-bit integers, skip for SQLite
+    # database_type returns the database adapter type (e.g., :sqlite, :postgres, :mysql)
+    unless database_type.to_s.include?('sqlite')
+      alter_table(:repositories) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:users) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:hosts) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:authentication_tokens) do
+        set_column_type :id, :bigint
+        set_column_type :user_id, :bigint
+      end
+
+      alter_table(:repositories_users) do
+        set_column_type :repository_id, :bigint
+        set_column_type :user_id, :bigint
+      end
+
+      alter_table(:hosts_repositories) do
+        set_column_type :host_id, :bigint
+        set_column_type :repository_id, :bigint
+      end
+    end
+  end
+
+  down do
+    # SQLite's INTEGER type already supports 64-bit integers, skip for SQLite
+    # database_type returns the database adapter type (e.g., :sqlite, :postgres, :mysql)
+    unless database_type.to_s.include?('sqlite')
+      alter_table(:hosts_repositories) do
+        set_column_type :host_id, :integer
+        set_column_type :repository_id, :integer
+      end
+
+      alter_table(:repositories_users) do
+        set_column_type :repository_id, :integer
+        set_column_type :user_id, :integer
+      end
+
+      alter_table(:authentication_tokens) do
+        set_column_type :user_id, :integer
+        set_column_type :id, :integer
+      end
+
+      alter_table(:hosts) do
+        set_column_type :id, :integer
+      end
+
+      alter_table(:users) do
+        set_column_type :id, :integer
+      end
+
+      alter_table(:repositories) do
+        set_column_type :id, :integer
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/BlockLength

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '4.0.0'.freeze
+    VERSION = '4.0.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Ian Ballou
@@ -96,6 +96,7 @@ files:
 - lib/smart_proxy_container_gateway/sequel_migrations/003_authorization_reorg.rb
 - lib/smart_proxy_container_gateway/sequel_migrations/004_users_repositories_cascade_delete.rb
 - lib/smart_proxy_container_gateway/sequel_migrations/005_host_repositories.rb
+- lib/smart_proxy_container_gateway/sequel_migrations/006_bigint_ids.rb
 - lib/smart_proxy_container_gateway/version.rb
 - settings.d/container_gateway.yml.example
 homepage: https://github.com/Katello/smart_proxy_container_gateway