dapp 0.21.16 → 0.22.0

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -59,14 +59,7 @@ module Dapp
               end
 
               watch_hooks_thr = Thread.new do
-                watch_hooks.each {|job|
-                  begin
-                    Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
-                  rescue ::Exception => e
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
-                    raise
-                  end
-                }
+                watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
               end
 
               deployment_managers = release.deployments.values
@@ -85,7 +78,7 @@ module Dapp
                   deployment_managers.each {|deployment_manager| deployment_manager.watch_till_ready!}
                 end
               rescue ::Timeout::Error
-                raise Error::Base, code: :deploy_timeout
+                raise Kube::Error::Base, code: :deploy_timeout
               end
             end
           end

data/lib/dapp/kube/dapp/command/render.rb

@@ -13,8 +13,8 @@ module Dapp
                       template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm'))
                       template_relative_path_pattern ||= template_path_pattern
 
-                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
-                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+                      File.fnmatch(template_relative_path_pattern, template_path_without_chart_name) ||
+                        File.fnmatch(template_relative_path_pattern, template_path)
                     end
                   end
                 else

data/lib/dapp/kube/error/base.rb

@@ -1,7 +1,11 @@
 module Dapp
   module Kube
     module Error
-      class Base < ::Dapp::Error::Base; end
+      class Base < ::Dapp::Error::Base
+        def initialize(**net_status)
+          super(**net_status, context: :kube)
+        end
+      end
     end
   end
 end

data/lib/dapp/kube/helm/release.rb

@@ -13,10 +13,11 @@ module Dapp
       attr_reader :set
       attr_reader :values
       attr_reader :deploy_timeout
+      attr_reader :without_registry
 
       def initialize(dapp,
         name:, repo:, docker_tag:, namespace:, chart_path:,
-        set: [], values: [], deploy_timeout: nil)
+        set: [], values: [], deploy_timeout: nil, without_registry: nil)
         @dapp = dapp
 
         @name = name
@@ -27,6 +28,7 @@ module Dapp
         @set = set
         @values = values
         @deploy_timeout = deploy_timeout
+        @without_registry = (without_registry.nil? ? false : without_registry)
       end
 
       def jobs
@@ -90,7 +92,7 @@ module Dapp
             "template",
             chart_path,
             additional_values_options,
-            set_options,
+            set_options(without_registry: true),
             ("--namespace #{namespace}" if namespace),
           ].compact.join(" ")
 
@@ -115,11 +117,45 @@ module Dapp
         end
       end
 
-      def set_options
+      def dimg_registry
+        @dimg_registry ||= dapp.dimg_registry(repo)
+      end
+
+      def set_options(without_registry: false)
         [].tap do |options|
           options.concat(set.map { |opt| "--set #{opt}" })
           options << "--set global.dapp.repo=#{repo}"
           options << "--set global.dapp.docker_tag=#{docker_tag}"
+
+          if dapp.nameless_dimg?
+            options << "--set global.dapp.docker_image=#{repo}:#{docker_tag}"
+            if self.without_registry || without_registry
+              options << "--set global.dapp.docker_image_id=\\\"-\\\""
+            else
+              options << "--set global.dapp.docker_image_id=#{dimg_registry.image_id(docker_tag, nil)}"
+            end
+          else
+            dapp.dimgs_names.each do |dimg_name|
+              options << "--set global.dapp.docker_image.#{dimg_name}=#{repo}/#{dimg_name}:#{docker_tag}"
+              if self.without_registry || without_registry
+                options << "--set global.dapp.docker_image_id.#{dimg_name}=\\\"-\\\""
+              else
+                options << "--set global.dapp.docker_image_id.#{dimg_name}=#{dimg_registry.image_id(docker_tag, dimg_name)}"
+              end
+            end
+          end
+
+          is_branch = if ENV["CI_COMMIT_TAG"]
+            false
+          elsif ENV["CI_COMMIT_REF_NAME"]
+            true
+          elsif dapp.git_path and dapp.git_local_repo.branch != "HEAD"
+            true
+          else
+            false
+          end
+          options << "--set global.dapp.is_branch=#{is_branch}"
+
           options << "--set global.namespace=#{namespace}"
         end
       end

data/lib/dapp/kube/kubernetes/client.rb

@@ -218,6 +218,8 @@ module Dapp
 
             client_key_data = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-key-data', nil)
             opts[:client_key_data] = Base64.decode64(client_key_data) if client_key_data
+
+            opts.merge!(excon_parameters)
           end
         end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.21.16'.freeze
-  BUILD_CACHE_VERSION = 24.2
+  VERSION = '0.22.0'.freeze
+  BUILD_CACHE_VERSION = 24
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.16
+  version: 0.22.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -186,34 +186,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: sentry-raven
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-- !ruby/object:Gem::Dependency
-  name: toml-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -461,6 +433,7 @@ files:
 - lib/dapp/core_ext/pathname.rb
 - lib/dapp/dapp.rb
 - lib/dapp/dapp/chef.rb
+- lib/dapp/dapp/command/common.rb
 - lib/dapp/dapp/dapp_config.rb
 - lib/dapp/dapp/dappfile.rb
 - lib/dapp/dapp/deps/base.rb
@@ -473,7 +446,6 @@ files:
 - lib/dapp/dapp/logging/paint.rb
 - lib/dapp/dapp/logging/process.rb
 - lib/dapp/dapp/option_tags.rb
-- lib/dapp/dapp/sentry.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/ssh_agent.rb
@@ -669,7 +641,6 @@ files:
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/tar.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/helper/url.rb
 - lib/dapp/helper/yaml.rb
 - lib/dapp/kube.rb
 - lib/dapp/kube/cli/cli.rb
@@ -741,7 +712,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell

data/lib/dapp/dapp/sentry.rb

@@ -1,112 +0,0 @@
-module Dapp
-  class Dapp
-    module Sentry
-      def sentry_message(msg, **kwargs)
-        return if not ensure_sentry_configured
-        kwargs[:level] ||= "info"
-        Raven.capture_message(msg, _make_sentry_params(**kwargs))
-      end
-
-      def sentry_exception(exception, **kwargs)
-        return if not ensure_sentry_configured
-        (kwargs[:tags] ||= {})['error-code'] = begin
-          net_status = exception.net_status
-          [net_status[:context], net_status[:code]].compact.join('_')
-        end
-        Raven.capture_exception(exception, _make_sentry_params(**kwargs))
-      end
-
-      def ensure_sentry_configured
-        return false unless sentry_settings = settings["sentry"]
-
-        unless @sentry_settings_configured
-          Raven.configure do |config|
-            logger = ::Logger.new(STDOUT)
-            logger.level = ::Logger::WARN
-
-            config.logger = logger
-            config.dsn = sentry_settings["dsn"]
-          end
-
-          @sentry_settings_configured = true
-        end
-
-        return true
-      end
-
-      def _make_sentry_params(level: nil, tags: {}, extra: {}, user: {})
-        {
-          level: level,
-          tags:  _sentry_tags_context.merge(tags),
-          extra: _sentry_extra_context.merge(extra),
-          user:  _sentry_user_context.merge(user),
-        }
-      end
-
-      def _sentry_extra_context
-        @_sentry_extra_context ||= {
-          "pwd" => Dir.pwd,
-          "dapp-dir" => self.work_dir,
-          "options" => self.options,
-          "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
-            "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
-            "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
-            "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
-          },
-        }.tap {|extra|
-          extra["ci-env"] = {"CI" => ENV["CI"]}
-          ENV.select {|k, v| k.start_with?("CI_")}.each do |k, v|
-            extra["ci-env"][k] = v
-          end
-        }
-      end
-
-      def _sentry_tags_context
-        name = options[:name] || 
-        @_sentry_tags_context ||= {
-          "dapp-short-version" => ::Dapp::VERSION.split(".")[0..1].join("."),
-          "dapp-version" => ::Dapp::VERSION,
-          "dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
-          "dapp-command" => self.options[:dapp_command],
-        }.tap {|tags|
-          git_config_path = File.join(Dir.pwd, ".git/config")
-
-          tags["dapp-name"] = options[:name]
-
-          if File.exists? git_config_path
-            cfg = IniFile.load(File.join(Dir.pwd, ".git/config"))
-            remote_origin_cfg = cfg['remote "origin"']
-            remote_origin_url = remote_origin_cfg["url"]
-            if remote_origin_url
-              tags["dapp-name"] ||= begin
-                repo_name = remote_origin_url.split('/').last
-                repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
-                repo_name
-              end
-
-              tags["git-host"] = self.get_host_from_git_url(remote_origin_url)
-
-              git_name = self.git_url_to_name(remote_origin_url)
-
-              tags["git-group"] = git_name.partition("/")[0]
-              tags["git-name"] = git_name
-            end
-          end
-
-          tags["dapp-name"] ||= File.basename(Dir.pwd)
-
-          begin
-            ver = self.class.host_docker_minor_version
-            tags["docker-minor-version"] = ver.to_s
-          rescue ::Exception
-          end
-        }
-      end
-
-      def _sentry_user_context
-        @_sentry_user_context ||= {}
-      end
-    end # Sentry
-  end # Dapp
-end # Dapp

data/lib/dapp/helper/url.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Helper
-    module Url
-      def git_url_to_name(url)
-        url_without_scheme = url.split("://", 2).last
-        # This may be broken, because "@" should delimit creds, not a ":"
-        url_without_creds = url_without_scheme.split(":", 2).last
-        url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
-      end
-
-      def get_host_from_git_url(url)
-        url_without_scheme = url.split("://", 2).last
-        url_without_creds = url_without_scheme.split("@", 2).last
-
-        # Split out part after ":" in this kind of url: github.com:flant/dapp.git
-        url_part = url_without_creds.split(":", 2).first
-
-        # Split out part after first "/": github.com/flant/dapp.git
-        url_part.split("/", 2).first
-      end
-    end # Url
-  end # Helper
-end # Dapp