dapp 0.30.1 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac16a9c84e2d3af89ad9a59a0aa51f7073c09552
-  data.tar.gz: 5efbf94424686ef128e7d3d14e4ec34fd001b8ad
+  metadata.gz: 85e24f5f787e11e46f34a01a946986396ead3830
+  data.tar.gz: 075072783e8d9bb26fcf4545901a637bfb1847c0
 SHA512:
-  metadata.gz: 2ab041b8537358ccc8137f7d737d343ab46debcd7fe128e269f7672f99bb479e4f2aef120d7373dc5d0c013008c46c83bfc2817b554f1a5e03d84cb2fbc67c29
-  data.tar.gz: 65dde18c5f79aa88fc1f3f16af037ab377cb463e4ee5f59a5df7118a026060878033d603d18d7c9ebdab47f2afd05c0c5c635aaebe878d63bc9e450fda29e2a1
+  metadata.gz: 33db546ddeed11f985386d7c55aa48bc3704054745bb83a77e359060eb01d6e7ececf02470933e93776a4b826801fe19702a871d08c7906972ddfa14ae35bcaf
+  data.tar.gz: 25bbfc1a6f66fa507f344939b2e1584f1938f5ad12d62a95cadfe5d4409e894fbcffa9b1e58bbd719f61e65ec43f6c3b6301d169f322e0ca2e694e6760458a94

data/lib/dapp.rb

@@ -133,6 +133,17 @@ require 'dapp/kube/dapp/command/lint'
 require 'dapp/kube/dapp/command/value_get'
 require 'dapp/kube/dapp/dapp'
 require 'dapp/dimg'
+require 'dapp/dimg/error/default'
+require 'dapp/dimg/error/dimg'
+require 'dapp/dimg/error/build'
+require 'dapp/dimg/error/tar_writer'
+require 'dapp/dimg/error/rugged'
+require 'dapp/dimg/error/registry'
+require 'dapp/dimg/error/chef'
+require 'dapp/dimg/error/lock'
+require 'dapp/dimg/exception/base'
+require 'dapp/dimg/exception/introspect_image'
+require 'dapp/dimg/exception/registry'
 require 'dapp/dimg/builder'
 require 'dapp/dimg/builder/base'
 require 'dapp/dimg/builder/chef'
@@ -246,22 +257,12 @@ require 'dapp/dimg/dapp/dimg'
 require 'dapp/dimg/dapp/config_artifact_group'
 require 'dapp/dimg/dapp/dapp'
 require 'dapp/dimg/docker_registry'
+require 'dapp/dimg/docker_registry/error'
 require 'dapp/dimg/docker_registry/base/request'
 require 'dapp/dimg/docker_registry/base/authorization'
 require 'dapp/dimg/docker_registry/base'
 require 'dapp/dimg/docker_registry/dimg'
 require 'dapp/dimg/docker_registry/default'
-require 'dapp/dimg/error/default'
-require 'dapp/dimg/error/dimg'
-require 'dapp/dimg/error/build'
-require 'dapp/dimg/error/tar_writer'
-require 'dapp/dimg/error/rugged'
-require 'dapp/dimg/error/registry'
-require 'dapp/dimg/error/chef'
-require 'dapp/dimg/error/lock'
-require 'dapp/dimg/exception/base'
-require 'dapp/dimg/exception/introspect_image'
-require 'dapp/dimg/exception/registry'
 require 'dapp/dimg/lock/base'
 require 'dapp/dimg/lock/file'
 require 'dapp/dimg/filelock'

data/lib/dapp/dimg/dapp/command/stages/common.rb

@@ -8,11 +8,16 @@ module Dapp
 
             def repo_detailed_dimgs_images(registry)
               repo_dimgs_images(registry).select do |dimg|
-                image_history = registry.image_history(dimg[:tag], dimg[:dimg])
-                dimg[:created_at] = Time.parse(image_history['created']).to_i
-                dimg[:parent] = image_history['container_config']['Image']
-                dimg[:labels] = image_history['config']['Labels'] || {}
-                dimg[:labels]['dapp'] == name
+                begin
+                  image_history = registry.image_history(dimg[:tag], dimg[:dimg])
+                  dimg[:created_at] = Time.parse(image_history['created']).to_i
+                  dimg[:parent] = image_history['container_config']['Image']
+                  dimg[:labels] = image_history['config']['Labels'] || {}
+                  dimg[:labels]['dapp'] == name
+                rescue DockerRegistry::Error::ManifestInvalid => err
+                  log_warning "WARNING: Ignore dimg `#{dimg[:dimg]}` tag `#{dimg[:tag]}`: got manifest-invalid-error from docker registry: #{err.message}"
+                  false
+                end
               end
             end
 
@@ -48,7 +53,13 @@ module Dapp
 
             def delete_repo_image(registry, repo_image)
               log([repo_image[:dimg], repo_image[:tag]].compact.join(':')) if dry_run? || log_verbose?
-              registry.image_delete(repo_image[:tag], repo_image[:dimg])           unless dry_run?
+              unless dry_run?
+                begin
+                  registry.image_delete(repo_image[:tag], repo_image[:dimg])
+                rescue DockerRegistry::Error::NotFound => err
+                  log_warning "WARNING: Ignore dimg `#{repo_image[:dimg]}` tag `#{repo_image[:tag]}`: got not-found-error from docker registry: #{err.message}"
+                end
+              end
             end
 
             def select_dapp_artifacts_ids(labels)

data/lib/dapp/dimg/docker_registry/base.rb

@@ -70,11 +70,29 @@ module Dapp
           url = api_url(*uri)
           request(url, **default_api_options.merge(options))
         rescue Excon::Error::MethodNotAllowed
-          raise Error::Registry, code: :method_not_allowed, data: { url: url, registry: api_url, method: options[:method] }
+          raise DockerRegistry::Error::Base, code: :method_not_allowed, data: { url: url, registry: api_url, method: options[:method] }
         rescue Excon::Error::NotFound
-          raise Error::Registry, code: :page_not_found, data: { url: url, registry: api_url }
+          raise DockerRegistry::Error::ImageNotFound.new(url, api_url)
         rescue Excon::Error::Unauthorized
           user_not_authorized!
+        rescue Excon::Error => err
+          if err.is_a? Excon::Error::BadRequest
+            response_data = (JSON.load(err.response.body) rescue nil)
+            if response_data
+              (response_data["errors"] || []).each do |err_data|
+                if err_data["code"] == "MANIFEST_INVALID"
+                  raise DockerRegistry::Error::ManifestInvalid.new(url, api_url, "#{err.response.status_line.strip}: #{err.response.reason_phrase.strip}: #{err.response.body.strip}")
+                end
+              end
+            end
+          end
+
+          raise(DockerRegistry::Error::Base,
+            code: :unknown_error,
+            data: { url: url,
+                    registry: api_url,
+                    message: "#{err.response.status_line.strip}: #{err.response.reason_phrase.strip}: #{err.response.body.strip}" }
+          )
         end
 
         def api_url(*uri)
@@ -86,7 +104,7 @@ module Dapp
         end
 
         def user_not_authorized!
-          raise Error::Registry, code: :user_not_authorized, data: { registry: api_url }
+          raise DockerRegistry::Error::Base, code: :user_not_authorized, data: { registry: api_url }
         end
       end
     end # DockerRegistry

data/lib/dapp/dimg/docker_registry/base/authorization.rb

@@ -9,7 +9,7 @@ module Dapp
                 when /Bearer/ then { headers: { Authorization: "Bearer #{authorization_token(authenticate_header)}" } }
                 when /Basic/ then { headers: { Authorization: "Basic #{authorization_auth}" } }
                 when nil then {}
-                else raise Error::Registry, code: :authenticate_type_not_supported, data: { registry: api_url }
+                else raise DockerRegistry::Error::Base, code: :authenticate_type_not_supported, data: { registry: api_url }
               end
             end
           end
@@ -19,7 +19,7 @@ module Dapp
             realm = options.delete(:realm)
             begin
               response = raw_request(realm, headers: { Authorization: "Basic #{authorization_auth}" }, query: options, expects: [200])
-            rescue Error::Registry
+            rescue DockerRegistry::Error::Base
               raise unless (response = raw_request(realm, query: options)).status == 200
             end
             JSON.load(response.body)['token']

data/lib/dapp/dimg/docker_registry/dimg.rb

@@ -16,7 +16,7 @@ module Dapp
 
         def tags
           super
-        rescue Error::Registry => e
+        rescue DockerRegistry::Error::Base => e
           raise unless e.net_status[:code] == :page_not_found
           []
         end

data/lib/dapp/dimg/docker_registry/error.rb

@@ -0,0 +1,25 @@
+module Dapp
+  module Dimg
+    module DockerRegistry
+      module Error
+        class Base < ::Dapp::Dimg::Error::Registry
+          def initialize(**net_status)
+            super(**net_status, context: :registry)
+          end
+        end
+
+        class ManifestInvalid < Base
+          def initialize(url, registry, response_body)
+            super(code: :manifest_invalid, data: {url: url, registry: registry, response_body: response_body})
+          end
+        end
+
+        class ImageNotFound < Base
+          def initialize(url, registry)
+            super(code: :page_not_found, data: { url: url, registry: registry })
+          end
+        end
+      end # Error
+    end # DockerRegistry
+  end # Dimg
+end # Dapp

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.30.1"
+  VERSION = "0.30.2"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.30.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -621,6 +621,7 @@ files:
 - lib/dapp/dimg/docker_registry/base/request.rb
 - lib/dapp/dimg/docker_registry/default.rb
 - lib/dapp/dimg/docker_registry/dimg.rb
+- lib/dapp/dimg/docker_registry/error.rb
 - lib/dapp/dimg/error/build.rb
 - lib/dapp/dimg/error/chef.rb
 - lib/dapp/dimg/error/default.rb