kuby-core 0.11.11 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78bc9ff66849f7b55046753a84be77fd64af68d28c1746245a463f5f240d0e9e
-  data.tar.gz: '079e0ccccc1ae12a18a2cb459e7a6b1f2b3ef05149d5bf347fed5ba1e6abbb2b'
+  metadata.gz: b8d6ff09e42b41a7c2befcd581413831cfccfcc447de2ce465a51601aed2d957
+  data.tar.gz: 166b2ad8c8c2a4fe38f1756fde0221d4091e7fb3e18f3c70a192cae08fc24805
 SHA512:
-  metadata.gz: f27a9bd4698e6cdcb4c0308c91a78e5c86ac6eccd6dcd8f9ff1b28a73e8c1aa50f79512dc9ad3b5fdb43c024ba5054c1df1844bd74473c5bd9dd3c3cf034c7c4
-  data.tar.gz: fca6952c0bfe4cb5d2e6e9b0f4f50d46483bb43ad32d601dbdfcc14eeccb4070706043e786d18ade2730b9521443f55fb317620334f212fb88cfb92ab8672cb1
+  metadata.gz: 31b2ce8b7bc8c224e068ca7344009b69d602f73608c45ac228d95ccfc556eb0cde034bf2c162e8eef9ba1b855644c1e6abcbaf83a536e2f48123fea800c6a798
+  data.tar.gz: 2ffa9a28da456fb5f7f422315207a82622c739b1539705d3f6086eb44a524bf1233e8fd88df1d8825dc4ab4ef08c142cc2bcf9a12a8c2609a0f4496af9983e3c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.12
+* Revamp Docker URL parsing
+  - Docker URLs shouldn't have a scheme.
+
 ## 0.11.11
 * Add support for a Docker registry running on localhost.
   - Correctly parse and handle URLs with specific ports.

data/kuby-core.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'colorize', '~> 0.8'
-  s.add_dependency 'docker-remote', '~> 0.1'
+  s.add_dependency 'docker-remote', '~> 0.5'
   s.add_dependency 'gli', '~> 2.0'
   s.add_dependency 'helm-cli', '~> 0.3'
   # See: https://github.com/Shopify/krane/pull/720

data/lib/kuby/docker.rb

@@ -14,6 +14,7 @@ module Kuby
     autoload :DevSpec,        'kuby/docker/dev_spec'
     autoload :Distro,         'kuby/docker/distro'
     autoload :Dockerfile,     'kuby/docker/dockerfile'
+    autoload :DockerURI,      'kuby/docker/docker_uri'
     autoload :InlineLayer,    'kuby/docker/inline_layer'
     autoload :Layer,          'kuby/docker/layer'
     autoload :LayerStack,     'kuby/docker/layer_stack'

data/lib/kuby/docker/docker_uri.rb

@@ -0,0 +1,34 @@
+# typed: false
+
+module Kuby
+  module Docker
+    class DockerURI
+      DEFAULT_REGISTRY_HOST = 'index.docker.io'.freeze
+      DEFAULT_REGISTRY_PORT = 443
+
+      def self.parse(url)
+        if idx = url.index('://')
+          url = url[(idx + 3)..-1] || ''
+        end
+
+        host_port, *path = url.split('/')
+        host, port, *path = if host_port =~ /[.:]/
+          hst, prt = host_port.split(':')
+          [hst, prt || DEFAULT_REGISTRY_PORT, *path]
+        else
+          [DEFAULT_REGISTRY_HOST, DEFAULT_REGISTRY_PORT, host_port, *path]
+        end
+
+        new(host, port.to_i, path.join('/'))
+      end
+
+      attr_reader :host, :port, :path
+
+      def initialize(host, port, path)
+        @host = host
+        @port = port
+        @path = path
+      end
+    end
+  end
+end

data/lib/kuby/docker/metadata.rb

@@ -8,8 +8,6 @@ module Kuby
       extend T::Sig
 
       DEFAULT_DISTRO = :debian
-      DEFAULT_REGISTRY_HOST = T.let('https://index.docker.io'.freeze, String)
-      DEFAULT_REGISTRY_SCHEME = T.let('https', String)
       LATEST_TAG = T.let('latest'.freeze, String)
 
       sig { params(image_url: String).void }
@@ -28,7 +26,7 @@ module Kuby
         @image_hostname = T.let(@image_hostname, T.nilable(String))
         @image_repo = T.let(@image_repo, T.nilable(String))
         @distro = T.let(@distro, T.nilable(Symbol))
-        @full_image_uri = T.let(@full_image_uri, T.nilable(URI::Generic))
+        @full_image_uri = T.let(@full_image_uri, T.nilable(DockerURI))
         @default_image_url = T.let(@default_image_url, T.nilable(String))
         @default_tags = T.let(@default_tags, T.nilable(T::Array[String]))
       end
@@ -40,18 +38,12 @@ module Kuby
 
       sig { returns(String) }
       def image_host
-        uri = full_image_uri
-        @image_host ||= "#{uri.scheme}://#{uri.host}:#{uri.port}"
-      end
-
-      sig { returns(String) }
-      def image_hostname
-        @image_hostname ||= T.must(URI(image_host).host)
+        @image_host ||= full_image_uri.host
       end
 
       sig { returns(String) }
       def image_repo
-        @image_repo ||= T.must(full_image_uri.path).sub(/\A[\/]+/, '')
+        @image_repo ||= full_image_uri.path
       end
 
       sig { returns(T::Array[String]) }
@@ -71,15 +63,9 @@ module Kuby
 
       private
 
-      sig { returns(URI::Generic) }
+      sig { returns(DockerURI) }
       def full_image_uri
-        @full_image_uri ||= if image_url.include?('://')
-          URI.parse(image_url)
-        elsif image_url =~ /\A[^.:]+[\.:][^\/]+\//
-          URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{image_url}")
-        else
-          URI.parse("#{DEFAULT_REGISTRY_HOST}/#{image_url.sub(/\A[\/]+/, '')}")
-        end
+        @full_image_uri ||= DockerURI.parse(image_url)
       end
 
       sig { returns(String) }
@@ -94,15 +80,6 @@ module Kuby
           TimestampTag.new(Time.now).to_s, LATEST_TAG
         ]
       end
-
-      sig { params(url: String).returns(URI::Generic) }
-      def parse_url(url)
-        uri = URI.parse(url)
-        return uri if uri.scheme
-
-        # force a scheme because URI.parse won't work properly without one
-        URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{url}")
-      end
     end
   end
 end

data/lib/kuby/tasks.rb

@@ -41,10 +41,10 @@ module Kuby
         fail 'Cannot push Docker images built for the development environment'
       end
 
-      hostname = docker.metadata.image_hostname
+      host = docker.metadata.image_host
 
-      if docker.credentials.username && !docker.cli.auths.include?(hostname)
-        Kuby.logger.info("Attempting to log in to registry at #{hostname}")
+      if docker.credentials.username && !docker.cli.auths.include?(host)
+        Kuby.logger.info("Attempting to log in to registry at #{host}")
 
         begin
           docker.cli.login(
@@ -53,7 +53,7 @@ module Kuby
             password: docker.credentials.password
           )
         rescue Kuby::Docker::LoginError => e
-          Kuby.logger.fatal("Couldn't log in to the registry at #{hostname}")
+          Kuby.logger.fatal("Couldn't log in to the registry at #{host}")
           Kuby.logger.fatal(e.message)
           return
         end

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.11.11'.freeze
+  VERSION = '0.11.12'.freeze
 end

data/spec/docker/metadata_spec.rb

@@ -19,18 +19,18 @@ describe Kuby::Docker::Metadata do
   describe '#image_host' do
     subject { metadata.image_host }
 
-    it { is_expected.to eq("#{described_class::DEFAULT_REGISTRY_HOST}:443") }
+    it { is_expected.to eq(Kuby::Docker::DockerURI::DEFAULT_REGISTRY_HOST) }
 
     context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('https://registry.foo.com:443') }
+      it { is_expected.to eq('registry.foo.com') }
     end
 
-    context 'when the image URL contains an explicit host with scheme' do
+    context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'http://registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('http://registry.foo.com:80') }
+      it { is_expected.to eq('registry.foo.com') }
     end
   end
 
@@ -46,18 +46,6 @@ describe Kuby::Docker::Metadata do
     end
   end
 
-  describe '#image_hostname' do
-    subject { metadata.image_hostname }
-
-    it { is_expected.to eq('index.docker.io') }
-
-    context 'when the image URL contains an explicit host' do
-      let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
-
-      it { is_expected.to eq('registry.foo.com') }
-    end
-  end
-
   describe '#tags' do
     subject { metadata.tags }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/kuby/docker/debian.rb
 - lib/kuby/docker/dev_spec.rb
 - lib/kuby/docker/distro.rb
+- lib/kuby/docker/docker_uri.rb
 - lib/kuby/docker/dockerfile.rb
 - lib/kuby/docker/errors.rb
 - lib/kuby/docker/inline_layer.rb