dapp 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a752ddf15e0189c19374288fa4c47dde8c51052aa7a341d6c687456510f7d8
-  data.tar.gz: 0646f23204bca59262e9811ea034fe9c7cd6711be864e95901f84c792e7893bd
+  metadata.gz: 767fd53a4c1d7206a3f9e7f94076eea3c21fb99f9221b8d05648f4798736a699
+  data.tar.gz: be17e4e371969d98f96a7d7c1b79768b35bd277e262c0fa0295ce17d0db890f8
 SHA512:
-  metadata.gz: d381c0f3c52d605a5efdfc2af90293cbaec8209d183520b28b1460a3b12c80ed79de53d7fae0dbaa2ca6262fb4e4f3333faaea2bbe66909de93d8dbb17b9e4e6
-  data.tar.gz: c782aaa9b056b70e1575f8c1cdad640782c7f58cf56d9cc83a13fe96c4ba80ad7c2bfb70a421c8a606a9384666105376225634dcdd6af0097fdc9d1d2de4a33a
+  metadata.gz: 6855db575b0ae8392f2c718fc226aa2d7c849623ecce99ca0331b9f7fd1e353ddf894e53345acd3a7e0da48469ea6db2b7168fe6d2c782bcefe35df73b844bcf
+  data.tar.gz: f71e683cb58fc85bfdb96997dfee161dc77e021e8a554ad8bc54f12a59c1a93ce404a747eea85382abd536ef104a679a2af9e6e5ebc3f92013af87c512aff0bd

data/config/en/common.yml

@@ -38,6 +38,7 @@ en:
     state:
       using_cache: '[USING CACHE]'
       not_present: '[NOT PRESENT]'
+      rebuild: '[REBUILD]'
       build: '[BUILD]'
       push: '[PUSH]'
       pull: '[PULL]'

data/config/en/net_status.yml

@@ -14,8 +14,8 @@ en:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
       from_image_required: 'Missing from_image!'
-      image_already_untagged: "Image `%{name}` already untagged!"
-      image_not_exist: "Image `%{name}` not exist!"
+      image_already_untagged: "Image `%{name}` untagged already!"
+      image_not_exist: "Image `%{name}` doesn't exist!"
       built_id_not_defined: '`from.built_id` not defined!'
       from_image_not_found: 'Image `%{name}` not found!'
       unsupported_patch_format: "Unsupported patch format:\n\n%{patch}"
@@ -32,23 +32,24 @@ en:
       secret_key_not_found: "Secret key not found in %{not_found_in}!"
       minikube_not_found: "Minikube not found: install minikube (https://github.com/kubernetes/minikube/releases)!"
       minikube_not_started: "Minikube not started!"
-      project_helm_chart_not_found: "Project helm chart `%{path}` not found!"
       helm_not_found: "Helm not found: install helm (https://github.com/kubernetes/helm/blob/master/docs/install.md)"
-      helm_release_not_exist: "Helm release `%{name}` not exist!"
+      helm_template_plugin_not_installed: "Helm plugin `template` isn't installed: run command `helm plugin install https://github.com/technosophos/helm-template`"
+      helm_release_not_exist: "Helm release `%{name}` doesn't exist!"
+      no_helm_chart_spec_name: "Bad name `%{name}` in helm chart spec %{path}:\n%{raw_spec}"
       file_not_exist: "File `%{path}` doesn't exist!"
       helm_directory_not_exist: "Helm directory doesn't exist in project!"
       values_file_not_found: "Values file `%{path}` not found!"
       secret_file_not_found: "Secret file `%{path}` not found!"
       secret_file_empty: "Secret file `%{path}` can't be empty!"
-      user_containers_detected: "User containers have been using images!\n%{ids}"
+      user_containers_detected: "User containers are using these images:\n%{ids}"
       incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
       editor_not_found: "Editor not found!"
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"
       dappfile_not_found: "Dappfile not found!"
-      cannot_run_ssh_agent: "Cannot run ssh-agent"
-      ssh_key_not_found: "Ssh key `%{path}` not exist!"
+      cannot_run_ssh_agent: "Can't run ssh-agent!"
+      ssh_key_not_found: "Ssh key `%{path}` doesn't exist!"
       docker_not_found: "Docker not found!"
       docker_version: "Required docker version (`%{version}`): `%{min_version}` <= VERSION <= `%{max_version}`!"
       dapp_config_file_incorrect: "%{message}"
@@ -74,13 +75,13 @@ en:
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
       docker_artifact_unsupported_directive: "`artifact.docker` supports only `from` subdirective!"
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
-      stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
+      stage_artifact_double_associate: "Can't use `%{stage}` stage for artifact; already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
       git_artifact_remote_branch_with_commit: "Remote git repo: use `commit` or `branch` directive!"
       artifact_conflict: "Conflict between artifacts paths!"
       scratch_unsupported_directive: "Scratch dimg has unsupported directive `%{directive}`!"
       scratch_artifact_required: "Scratch dimg without artifacts!"
-      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected `before`/`after` attribute!"
+      scratch_artifact_associated: "Scratch artifact can't be associated: not expected `before`/`after` attribute!"
       scratch_artifact_docker_from: "Scratch artifact must have directive `docker.from`!"
       unsupported_scale_value: "Define unsupported scale value `%{value}`!"
       app_name_required: 'App name required!'
@@ -90,8 +91,8 @@ en:
       app_bootstrap_dimg_not_found: "Not found dimg `%{dimg}` for app.bootstrap!"
       app_before_apply_job_dimg_not_defined: "Not defined dimg for app.before_apply_job!"
       app_before_apply_job_dimg_not_found: "Not found dimg `%{dimg}` for app.before_apply_job!"
-      unsupported_port_number: 'Port number `%{number}` doesn`t support!'
-      unsupported_target_number: 'Target number `%{number}` doesn`t support!'
+      unsupported_port_number: "Port number `%{number}` isn't supported!"
+      unsupported_target_number: "Target number `%{number}` isn't supported!"
       app_name_incorrect: "App has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
       namespace_name_incorrect: "Namespace has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
       deployment_bootstrap_dimg_not_defined: "Not defined dimg for deployment.bootstrap!"
@@ -99,13 +100,13 @@ en:
       deployment_before_apply_job_dimg_not_defined: "Not defined dimg for deployment.before_apply_job!"
       deployment_before_apply_job_dimg_not_found: "Not found dimg `%{dimg}` for deployment.before_apply_job!"
     chef:
-      stage_checksum_not_calculated: "Chef stage `%{stage}` checksum is not calculated yet, run build first"
-      stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
+      stage_checksum_not_calculated: "Chef stage `%{stage}` checksum isn't calculated yet, run build first!"
+      stage_path_overlap: "Can't install `%{cookbook}` cookbook's path %{from} into %{to} already exists!"
       builder_cookbook_not_found: "Dapp cookbook directory not found at %{path}"
       berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook `%{cookbook}`, path: `%{path}`)"
     registry:
       no_such_dimg: 'Registry `%{registry}`: no such dimg in registry!'
-      authenticate_type_not_supported: 'Registry `%{registry}`: authenticate type not supported!'
+      authenticate_type_not_supported: 'Registry `%{registry}`: authenticate type is not supported!'
       page_not_found: "Registry `%{registry}`: page `%{url}` not found!"
       user_not_authorized: 'Registry `%{registry}`: user not authorized!'
     rugged:
@@ -118,7 +119,7 @@ en:
       rugged_protocol_not_supported: "Rugged has been compiled without support for `%{protocol}`.\nGit repositories will not be reachable via `%{protocol}` (`%{url}`).\nRugged.features should include `%{protocol}`."
       submodule_not_supported: "Git submodules not supported! (`%{path}`)"
     lock:
-      timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"
+      timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds!"
     app:
       namespace_not_found: "App `%{name}`: namespace `%{namespace}` not found!"
       namespace_not_defined: "App `%{name}`: namespace not defined!"
@@ -132,5 +133,5 @@ en:
       kube_config_not_found: "Kube config `%{path}` not found!"
       kube_server_connection_refused: "Kube server `%{url}` connection refused: %{error}"
     secret:
-      bad_data: "Data `%{data}` can't be decrypted: check encryption key and data."
+      bad_data: "Data `%{data}` can't be decrypted: check encryption key and data!"
       key_length_too_short: "Encryption key isn't valid (required size %{required_size} bytes)!"

data/lib/dapp.rb

@@ -135,6 +135,8 @@ require 'dapp/kube/cli/command/kube/secret_regenerate'
 require 'dapp/kube/cli/command/kube/secret_edit'
 require 'dapp/kube/cli/command/kube/minikube_setup'
 require 'dapp/kube/cli/command/kube/chart_create'
+require 'dapp/kube/cli/command/kube/render'
+require 'dapp/kube/cli/command/kube/lint'
 require 'dapp/kube/cli/cli'
 require 'dapp/kube/dapp/command/common'
 require 'dapp/kube/dapp/command/deploy'
@@ -146,6 +148,8 @@ require 'dapp/kube/dapp/command/secret_regenerate'
 require 'dapp/kube/dapp/command/secret_edit'
 require 'dapp/kube/dapp/command/minikube_setup'
 require 'dapp/kube/dapp/command/chart_create'
+require 'dapp/kube/dapp/command/render'
+require 'dapp/kube/dapp/command/lint'
 require 'dapp/kube/dapp/dapp'
 require 'dapp/dimg'
 require 'dapp/dimg/builder'

data/lib/dapp/dapp/logging/base.rb

@@ -123,6 +123,16 @@ module Dapp
           end
         end
 
+        def service_stream
+          @@service_stream ||= begin
+            fd = IO.sysopen("/tmp/dapp-service.log", "a")
+
+            stream = IO.new(fd)
+            stream.sync = true
+            stream
+          end
+        end
+
         protected
 
         attr_writer :log_indent_size

data/lib/dapp/dimg/build/stage/base.rb

@@ -49,6 +49,7 @@ module Dapp
 
           def build!
             prev_stage.build! if prev_stage
+            renew             if should_be_renewed?
             image_build       unless empty?
             image_introspect  if image_should_be_introspected?
           end
@@ -86,7 +87,7 @@ module Dapp
             image.add_service_change_label dapp: dimg.stage_dapp_label
             image.add_service_change_label 'dapp-version'.to_sym => ::Dapp::VERSION
             image.add_service_change_label 'dapp-cache-version'.to_sym => ::Dapp::BUILD_CACHE_VERSION
-            image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.dev_mode?
+            image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.dev_mode_cache?
 
             if dimg.dapp.ssh_auth_sock
               image.add_volume "#{dimg.dapp.ssh_auth_sock}:/tmp/dapp-ssh-agent"
@@ -189,6 +190,10 @@ module Dapp
             []
           end
 
+          def dependencies_discard
+            @dependencies = nil
+          end
+
           def artifact?
             false
           end
@@ -213,6 +218,22 @@ module Dapp
 
           protected
 
+          def renew
+            dependencies_discard
+            image_reset
+            image_untag! if image_should_be_untagged?
+          end
+
+          def image_reset
+            Image::Stage.image_reset(image_name)
+            @image = nil
+          end
+
+          def image_untag!
+            return if dimg.dapp.dry_run?
+            image.untag!
+          end
+
           def image_build
             prepare_image if image_should_be_prepared?
             log_image_build do
@@ -234,9 +255,33 @@ module Dapp
             (!image.built? && !should_be_not_present? || image_should_be_introspected?) && !dimg.dapp.dry_run?
           end
 
+          def should_be_renewed?
+            current_or_related_image_should_be_untagged?
+          end
+
+          def image_should_be_untagged?
+            image.tagged? && current_or_related_image_should_be_untagged?
+          end
+
+          def current_or_related_image_should_be_untagged?
+            @current_or_related_image_should_be_untagged ||= begin
+              image_should_be_untagged_condition || begin
+                if prev_stage.nil?
+                  false
+                else
+                  prev_stage.current_or_related_image_should_be_untagged?
+                end
+              end
+            end
+          end
+
+          def image_should_be_untagged_condition
+            false
+          end
+
           def should_be_not_present?
             return false if next_stage.nil?
-            next_stage.image.tagged? || next_stage.should_be_not_present?
+            !current_or_related_image_should_be_untagged? && (next_stage.image.tagged? || next_stage.should_be_not_present?)
           end
 
           def image_name

data/lib/dapp/dimg/build/stage/ga_base.rb

@@ -35,6 +35,11 @@ module Dapp
             end
           end
 
+          def renew
+            @commits = {}
+            super
+          end
+
           protected
 
           def should_not_be_detailed?

data/lib/dapp/dimg/build/stage/ga_dependencies_base.rb

@@ -14,6 +14,13 @@ module Dapp
           def empty?
             dimg.git_artifacts.empty? || super
           end
+
+          def image_should_be_untagged_condition
+            return false unless image.tagged?
+            dimg.git_artifacts.any? do |git_artifact|
+              !git_artifact.repo.commit_exists? image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
+            end
+          end
         end # GADependenciesBase
       end # Stage
     end # Build

data/lib/dapp/dimg/build/stage/import_artifact.rb

@@ -8,7 +8,7 @@ module Dapp
           end
 
           def signature
-            @signature ||= hashsum [*dependencies.flatten, change_options]
+            hashsum [*dependencies.flatten, change_options]
           end
 
           def image

data/lib/dapp/dimg/build/stage/mod/logging.rb

@@ -6,9 +6,10 @@ module Dapp
           module Logging
             def log_image_build
               case
-              when image.built?           then log_state(:using_cache)
-              when should_be_not_present? then log_state(:not_present)
-              when dimg.dapp.dry_run?     then log_state(:build, styles: { status: :success })
+              when dimg.dapp.dry_run? && image_should_be_untagged? then log_state(:rebuild, styles: { status: :success })
+              when image.built?                                    then log_state(:using_cache)
+              when should_be_not_present?                          then log_state(:not_present)
+              when dimg.dapp.dry_run?                              then log_state(:build, styles: { status: :success })
               else yield
               end
             ensure

data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb

@@ -21,7 +21,11 @@ module Dapp
 
             def changes_size_since_g_a_pre_setup_patch
               dimg.git_artifacts.map do |git_artifact|
-                git_artifact.patch_size(prev_g_a_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+                if git_artifact.repo.commit_exists? prev_g_a_stage.layer_commit(git_artifact)
+                  git_artifact.patch_size(prev_g_a_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+                else
+                  0
+                end
               end.reduce(0, :+)
             end
           end # GAPostSetupPatchDependencies

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -70,6 +70,11 @@ BANNER
                long: '--use-system-tar',
                boolean: true,
                default: false
+
+        option :force_save_cache,
+               long: '--force-save-cache',
+               boolean: true,
+               default: false
       end
     end
   end

data/lib/dapp/dimg/dimg.rb

@@ -42,7 +42,7 @@ module Dapp
       end
 
       def after_stages_build!
-        return unless last_stage.image.built? || dev_mode?
+        return unless last_stage.image.built? || dev_mode_cache?
         last_stage.save_in_cache!
         artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
       end
@@ -152,8 +152,12 @@ module Dapp
         dapp.dev_mode?
       end
 
+      def dev_mode_cache?
+        dev_mode? || !!dapp.options[:force_save_cache]
+      end
+
       def build_cache_version
-        [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
+        [::Dapp::BUILD_CACHE_VERSION, dev_mode_cache? ? 1 : 0]
       end
 
       def introspect_image!(image:, options:)

data/lib/dapp/dimg/image/docker.rb

@@ -6,8 +6,18 @@ module Dapp
         attr_reader :name
         attr_reader :dapp
 
-        def self.image_by_name(name:, **kwargs)
-          (@images ||= {})[name] ||= new(name: name, **kwargs)
+        class << self
+          def image_by_name(name:, **kwargs)
+            images[name] ||= new(name: name, **kwargs)
+          end
+
+          def image_reset(name)
+            images.delete(name)
+          end
+
+          def images
+            @images ||= {}
+          end
         end
 
         def initialize(name:, dapp:, from: nil)

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

@@ -1,14 +1,14 @@
 module Dapp::Kube::CLI
   module Command
     class Kube < ::Dapp::CLI
-      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret regenerate', 'deploy', 'dismiss', 'secret extract', 'secret edit', 'minikube setup', 'chart create'].freeze
+      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret regenerate', 'deploy', 'dismiss', 'secret extract', 'secret edit', 'minikube setup', 'chart create', 'render', 'lint'].freeze
 
       banner <<BANNER.freeze
 Usage: dapp kube subcommand [subcommand options]
 
 Available subcommands: (for details, dapp kube SUB-COMMAND --help)
 
-  dapp kube deploy [options] REPO
+  dapp kube deploy [options] [REPO]
   dapp kube dismiss [options]
   dapp kube secret key generate [options]
   dapp kube secret generate [FILE_PATH] [options]
@@ -17,6 +17,8 @@ Available subcommands: (for details, dapp kube SUB-COMMAND --help)
   dapp kube secret edit [FILE_PATH] [options]
   dapp kube minikube setup
   dapp kube chart create [options]
+  dapp kube render [options] [REPO]
+  dapp kube lint [options] [REPO]
 
 Options:
 BANNER

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -0,0 +1,53 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class Lint < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube lint [options] [REPO]
+
+Options:
+BANNER
+
+      option :namespace,
+        long: '--namespace NAME',
+        default: nil
+
+      option :image_version,
+        long: '--image-version IMAGE_VERSION',
+        default: 'latest'
+
+      option :helm_set_options,
+        long: '--set STRING_ARRAY',
+        default: [],
+        proc: proc { |v| composite_options(:helm_set) << v }
+
+      option :helm_values_options,
+        long: '--values FILE_PATH',
+        default: [],
+        proc: proc { |v| composite_options(:helm_values) << v }
+
+      option :helm_secret_values_options,
+        long: '--secret-values FILE_PATH',
+        default: [],
+        proc: proc { |v| composite_options(:helm_secret_values) << v }
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          repo = if not cli_arguments[0].nil?
+            self.class.required_argument(self, 'repo')
+          else
+            dapp.name
+          end
+
+          dapp.options[:repo] = repo
+
+          dapp.public_send(run_method)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class Render < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube render [options] [REPO]
+
+Options:
+BANNER
+      option :namespace,
+             long: '--namespace NAME',
+             default: nil
+
+      option :image_version,
+             long: '--image-version IMAGE_VERSION',
+             default: 'latest'
+
+      option :tmp_dir_prefix,
+             long: '--tmp-dir-prefix PREFIX',
+             description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
+
+      option :helm_set_options,
+             long: '--set STRING_ARRAY',
+             default: [],
+             proc: proc { |v| composite_options(:helm_set) << v }
+
+      option :helm_values_options,
+             long: '--values FILE_PATH',
+             default: [],
+             proc: proc { |v| composite_options(:helm_values) << v }
+
+      option :helm_secret_values_options,
+             long: '--secret-values FILE_PATH',
+             default: [],
+             proc: proc { |v| composite_options(:helm_secret_values) << v }
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          repo = if not cli_arguments[0].nil?
+            self.class.required_argument(self, 'repo')
+          else
+            dapp.name
+          end
+
+          dapp.options[:repo] = repo
+
+          dapp.public_send(run_method)
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,138 @@ module Dapp
     module Dapp
       module Command
         module Common
+          def helm_release
+            kube_check_helm!
+            kube_check_helm_template_plugin!
+            kube_check_helm_chart!
+
+            repo = option_repo
+            image_version = options[:image_version]
+            validate_repo_name!(repo)
+            validate_tag_name!(image_version)
+
+            with_kube_tmp_chart_dir do
+              kube_copy_chart
+              kube_helm_decode_secrets
+              kube_generate_helm_chart_tpl
+
+              release = Helm::Release.new(
+                  self,
+                  name: kube_release_name,
+                  repo: repo,
+                  image_version: image_version,
+                  namespace: kube_namespace,
+                  chart_path: kube_chart_path_for_helm,
+                  set: self.options[:helm_set_options],
+                  values: [*kube_values_paths, *kube_tmp_chart_secret_values_paths],
+                  deploy_timeout: self.options[:timeout] || 300
+              )
+
+              yield release
+            end
+          end
+
+          def kube_check_helm_chart!
+            raise Error::Command, code: :helm_directory_not_exist, data: { path: kube_chart_path } unless kube_chart_path.exist?
+          end
+
+          def kube_check_helm_template_plugin!
+            unless shellout!("helm plugin list | awk '{print $1}'").stdout.lines.map(&:strip).any? { |plugin| plugin == 'template' }
+              raise Error::Command, code: :helm_template_plugin_not_installed, data: { path: kube_chart_path }
+            end
+          end
+
+          def kube_copy_chart
+            FileUtils.cp_r("#{kube_chart_path}/.", kube_chart_path_for_helm)
+          end
+
+          def kube_helm_decode_secrets
+            if secret.nil?
+              log_warning(desc: {
+                code: :dapp_secret_key_not_found,
+                data: {not_found_in: secret_key_not_found_in.join(', ')}
+              }) if !kube_secret_values_paths.empty? || kube_chart_secret_path.directory?
+            end
+
+            kube_helm_decode_secret_files
+            kube_helm_decode_secret_values
+          end
+
+          def kube_helm_decode_secret_values
+            kube_secret_values_paths.each_with_index do |secret_values_file, index|
+              decoded_data = kube_helm_decode_json(secret, yaml_load_file(secret_values_file))
+              kube_tmp_chart_secret_values_paths[index].write(decoded_data.to_yaml)
+            end
+          end
+
+          def kube_helm_decode_secret_files
+            return unless kube_chart_secret_path.directory?
+            Dir.glob(kube_chart_secret_path.join('**/*')).each do |entry|
+              next if File.directory?(entry)
+
+              secret_relative_path = Pathname(entry).subpath_of(kube_chart_secret_path)
+
+              if secret.nil?
+                File.open(kube_tmp_chart_secret_path(secret_relative_path), 'wb:ASCII-8BIT', 0600) {|f| f.write ""}
+              else
+                kube_secret_file_validate!(entry)
+                secret_data = secret.extract(IO.binread(entry).chomp("\n"))
+                File.open(kube_tmp_chart_secret_path(secret_relative_path), 'wb:ASCII-8BIT', 0600) {|f| f.write secret_data}
+              end
+            end
+          end
+
+          def kube_generate_helm_chart_tpl
+            cont = <<-EOF
+{{/* vim: set filetype=mustache: */}}
+
+{{- define "dimg" -}}
+{{- if (ge (len (index .)) 2) -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- printf "%v:%v-%v" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
+{{- else -}}
+{{- $context := index . 0 -}}
+{{- printf "%v:%v" $context.Values.global.dapp.repo $context.Values.global.dapp.image_version -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "dapp_secret_file" -}}
+{{- $relative_file_path := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $context.Files.Get (print "#{kube_tmp_chart_secret_path.subpath_of(kube_chart_path_for_helm)}/" $relative_file_path) -}}
+{{- end -}}
+            EOF
+            kube_chart_path_for_helm('templates/_dapp_helpers.tpl').write(cont)
+          end
+
+          def kube_tmp_chart_secret_path(*path)
+            kube_chart_path_for_helm('decoded-secret', *path).tap { |p| p.parent.mkpath }
+          end
+
+          def kube_values_paths
+            self.options[:helm_values_options].map { |p| Pathname(p).expand_path }.each do |f|
+              raise Error::Command, code: :values_file_not_found, data: { path: f } unless f.file?
+            end
+          end
+
+          def kube_tmp_chart_secret_values_paths
+            @kube_tmp_chart_secret_values_paths ||= kube_secret_values_paths.each_with_index.map { |f, i| kube_chart_path_for_helm( "decoded-secret-values-#{i}.yaml") }
+          end
+
+          def kube_secret_values_paths
+            @kube_chart_secret_values_files ||= [].tap do |files|
+              files << kube_chart_secret_values_path if kube_chart_secret_values_path.file?
+              files.concat(options[:helm_secret_values_options].map { |p| Pathname(p).expand_path }.each do |f|
+                kube_secret_file_validate!(f)
+              end)
+            end
+          end
+
+          def kube_chart_secret_values_path
+            kube_chart_path('secret-values.yaml').expand_path
+          end
+
           def kube_check_helm!
             raise Error::Command, code: :helm_not_found if shellout('which helm').exitstatus == 1
           end

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

@@ -4,97 +4,12 @@ module Dapp
       module Command
         module Deploy
           def kube_deploy
-            raise Error::Command, code: :helm_directory_not_exist unless kube_chart_path.exist?
-            kube_check_helm!
-            kube_check_helm_chart!
-
-            repo = option_repo
-            image_version = options[:image_version]
-            validate_repo_name!(repo)
-            validate_tag_name!(image_version)
-
-            # TODO: Перенести код процесса выката в Helm::Manager
-
-            with_kube_tmp_chart_dir do
-              kube_copy_chart
-              kube_helm_decode_secrets
-              kube_generate_helm_chart_tpl
-
-              release = Helm::Release.new(
-                self,
-                name: kube_release_name,
-                repo: repo,
-                image_version: image_version,
-                namespace: kube_namespace,
-                chart_path: kube_chart_path_for_helm,
-                set: self.options[:helm_set_options],
-                values: [*kube_values_paths, *kube_tmp_chart_secret_values_paths],
-                deploy_timeout: self.options[:timeout] || 300
-              )
-
+            helm_release do |release|
               kube_flush_hooks_jobs(release)
               kube_run_deploy(release)
             end
           end
 
-          def kube_copy_chart
-            FileUtils.cp_r("#{kube_chart_path}/.", kube_chart_path_for_helm)
-          end
-
-          def kube_helm_decode_secrets
-            if secret.nil?
-              log_warning(desc: {
-                code: :dapp_secret_key_not_found,
-                data: {not_found_in: secret_key_not_found_in.join(', ')}
-              }) if !kube_secret_values_paths.empty? || kube_chart_secret_path.directory?
-            else
-              kube_helm_decode_secret_files
-            end
-            kube_helm_decode_secret_values
-          end
-
-          def kube_helm_decode_secret_values
-            kube_secret_values_paths.each_with_index do |secret_values_file, index|
-              decoded_data = kube_helm_decode_json(secret, yaml_load_file(secret_values_file))
-              kube_tmp_chart_secret_values_paths[index].write(decoded_data.to_yaml)
-            end
-          end
-
-          def kube_helm_decode_secret_files
-            return unless kube_chart_secret_path.directory?
-            Dir.glob(kube_chart_secret_path.join('**/*')).each do |entry|
-              next if File.directory?(entry)
-              kube_secret_file_validate!(entry)
-              secret_relative_path = Pathname(entry).subpath_of(kube_chart_secret_path)
-              secret_data = secret.extract(IO.binread(entry).chomp("\n"))
-              File.open(kube_tmp_chart_secret_path(secret_relative_path), 'wb:ASCII-8BIT', 0400) {|f| f.write secret_data}
-            end
-          end
-
-          def kube_generate_helm_chart_tpl
-            cont = <<-EOF
-{{/* vim: set filetype=mustache: */}}
-
-{{- define "dimg" -}}
-{{- if (ge (len (index .)) 2) -}}
-{{- $name := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- printf "%v:%v-%v" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
-{{- else -}}
-{{- $context := index . 0 -}}
-{{- printf "%v:%v" $context.Values.global.dapp.repo $context.Values.global.dapp.image_version -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "dapp_secret_file" -}}
-{{- $relative_file_path := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- $context.Files.Get (print "#{kube_tmp_chart_secret_path.subpath_of(kube_chart_path_for_helm)}/" $relative_file_path) -}}
-{{- end -}}
-            EOF
-            kube_chart_path_for_helm('templates/_dapp_helpers.tpl').write(cont)
-          end
-
           def kube_flush_hooks_jobs(release)
             release.hooks.values
               .reject { |job| ['0', 'false'].include? job.annotations["dapp/recreate"].to_s }
@@ -167,41 +82,6 @@ module Dapp
               end
             end
           end
-
-          def kube_check_helm_chart!
-            raise Error::Command, code: :project_helm_chart_not_found, data: { path: kube_chart_path } unless kube_chart_path.exist?
-          end
-
-          def kube_tmp_chart_secret_path(*path)
-            kube_chart_path_for_helm('decoded-secret', *path).tap { |p| p.parent.mkpath }
-          end
-
-          def kube_values_paths
-            self.options[:helm_values_options].map { |p| Pathname(p).expand_path }.each do |f|
-              raise Error::Command, code: :values_file_not_found, data: { path: f } unless f.file?
-            end
-          end
-
-          def kube_tmp_chart_secret_values_paths
-            @kube_tmp_chart_secret_values_paths ||= kube_secret_values_paths.each_with_index.map { |f, i| kube_chart_path_for_helm( "decoded-secret-values-#{i}.yaml") }
-          end
-
-          def kube_secret_values_paths
-            @kube_chart_secret_values_files ||= [].tap do |files|
-              files << kube_chart_secret_values_path if kube_chart_secret_values_path.file?
-              files.concat(options[:helm_secret_values_options].map { |p| Pathname(p).expand_path }.each do |f|
-                kube_secret_file_validate!(f)
-              end)
-            end
-          end
-
-          def kube_chart_secret_values_path
-            kube_chart_path('secret-values.yaml').expand_path
-          end
-
-          def kube_helm_manager
-            @kube_helm_manager ||= Helm::Manager.new(self)
-          end
         end
       end
     end

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

@@ -0,0 +1,79 @@
+module Dapp
+  module Kube
+    module Dapp
+      module Command
+        module Lint
+          def kube_chart_name
+            chart_yaml_path = kube_chart_path.join("Chart.yaml")
+            chart_spec = yaml_load_file(chart_yaml_path)
+
+            if chart_spec["name"].nil? || chart_spec["name"].empty?
+              raise Error::Command, code: :bad_helm_chart_spec_name, data: { name: chart_spec["name"], path: chart_yaml_path, raw_spec: chart_yaml_path.read.strip }
+            end
+
+            chart_spec["name"]
+          end
+
+          def with_kube_tmp_lint_chart_dir(&blk)
+            old_kube_tmp_helm_chart_dir = @kube_tmp_helm_chart_dir
+            unless ENV['DAPP_HELM_CHART_DIR']
+              @kube_tmp_helm_chart_dir = File.join(Dir.mktmpdir('dapp-helm-lint-', tmp_base_dir), kube_chart_name)
+            end
+
+            begin
+              with_kube_tmp_chart_dir(&blk)
+            ensure
+              @kube_tmp_helm_chart_dir = old_kube_tmp_helm_chart_dir
+            end
+          end
+
+          def kube_lint
+            kube_check_helm_chart!
+
+            repo = option_repo
+            image_version = options[:image_version]
+
+            with_kube_tmp_lint_chart_dir do
+              kube_copy_chart
+              kube_generate_helm_chart_tpl
+              kube_helm_decode_secrets
+
+              all_values = {}
+              [kube_chart_path('values.yaml').expand_path, *kube_values_paths, *kube_tmp_chart_secret_values_paths].each do |values_path|
+                all_values = all_values.in_depth_merge(yaml_load_file(values_path))
+              end
+
+              options[:helm_set_options].each do |opt_spec|
+                name, _, value = opt_spec.partition("=")
+                keys = name.split(".")
+
+                values = all_values
+                keys.each_with_index do |key, ind|
+                  if ind == keys.size - 1
+                    values[key] = YAML.load(value)
+                  else
+                    values[key] ||= {}
+                    values = values[key]
+                  end
+                end
+              end
+
+              all_values['global'] = {
+                'namespace' => kube_namespace,
+                'dapp' => {
+                  'repo' => option_repo,
+                  'image_version' => options[:image_version]
+                }
+              }
+
+              kube_chart_path_for_helm.join("values.yaml").write YAML.dump(all_values)
+
+              shellout! "helm lint --strict #{kube_chart_path_for_helm}"
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dapp
+  module Kube
+    module Dapp
+      module Command
+        module Render
+          def kube_render
+            helm_release { |release| release.templates.values.each { |t| puts t } }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/kube/dapp/dapp.rb

@@ -13,6 +13,8 @@ module Dapp
         include Command::SecretEdit
         include Command::MinikubeSetup
         include Command::ChartCreate
+        include Command::Render
+        include Command::Lint
         include Command::Common
       end
     end

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

@@ -58,6 +58,29 @@ module Dapp
         dapp.shellout! "helm upgrade #{args.join(' ')}", verbose: true
       end
 
+      def templates
+        @templates ||= {}.tap do |t|
+          current_template = nil
+          spec = 0
+          evaluation_output.lines.each do |l|
+            if (match = l[/# Source: #{dapp.name}\/templates\/(.*)/, 1])
+              spec = 0
+              t[current_template = match] ||= []
+            end
+
+            if l[/^---$/]
+              spec += 1
+            elsif current_template
+              (t[current_template][spec] ||= []) << l
+            end
+          end
+
+          t.each do |template, specs|
+            t[template] = "---\n#{specs.map(&:join).join("---\n").strip}"
+          end
+        end
+      end
+
       protected
 
       def evaluation_output
@@ -94,10 +117,10 @@ module Dapp
 
       def set_options
         [].tap do |options|
+          options.concat(set.map { |opt| "--set #{opt}" })
           options << "--set global.dapp.repo=#{repo}"
           options << "--set global.dapp.image_version=#{image_version}"
           options << "--set global.namespace=#{namespace}"
-          options.concat(set.map { |opt| "--set #{opt}" })
         end
       end
 

data/lib/dapp/kube/kubernetes/manager/container.rb

@@ -42,7 +42,7 @@ module Dapp
                 sleep 0.1
                 next
               rescue Kubernetes::Client::Error::Base => err
-                dapp.log_warning("Error while fetching pod's #{pod_manager.name} logs: #{err.message}")
+                dapp.log_warning("#{dapp.log_time}Error while fetching pod's #{pod_manager.name} logs: #{err.message}", stream: dapp.service_stream)
                 break
               end
 

data/lib/dapp/kube/kubernetes/manager/deployment.rb

@@ -132,7 +132,7 @@ module Dapp
                           rescue Kubernetes::Client::Error::Pod::ContainerCreating, Kubernetes::Client::Error::Pod::PodInitializing
                             next
                           rescue Kubernetes::Client::Error::Base => err
-                            dapp.log_warning("Error while fetching pod's #{pod.name} logs: #{err.message}")
+                            dapp.log_warning("#{dapp.log_time}Error while fetching pod's #{pod.name} logs: #{err.message}", stream: dapp.service_stream)
                             next
                           end
 
@@ -172,7 +172,7 @@ module Dapp
                         end
                       else
                         dapp.with_log_indent do
-                          dapp.log_warning("Unknown pod readiness condition reason '#{ready_condition['reason']}': #{ready_condition}")
+                          dapp.log_warning("#{dapp.log_time}Unknown pod readiness condition reason '#{ready_condition['reason']}': #{ready_condition}", stream: dapp.service_stream)
                         end
                       end
                     end # with_log_indent

data/lib/dapp/kube/kubernetes/manager/job.rb

@@ -40,7 +40,7 @@ module Dapp
               if job.succeeded?
                 break
               elsif job.failed?
-                dapp.log_warning "Job '#{name}' has been failed: #{job.spec['status']}"
+                dapp.log_warning "#{dapp.log_time}Job '#{name}' has been failed: #{job.spec['status']}", stream: dapp.service_stream
                 break
               end
 
@@ -53,7 +53,7 @@ module Dapp
             begin
               pod_manager.watch_till_done!
             rescue Kubernetes::Client::Error::Pod::NotFound => err
-              dapp.log_warning "Pod '#{pod_manager.name}' has been deleted"
+              dapp.log_warning "#{dapp.log_time}Pod '#{pod_manager.name}' has been deleted", stream: dapp.service_stream
             ensure
               @processed_pods_names << process_pod.name
             end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.18.2'.freeze
+  VERSION = '0.18.3'.freeze
   BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -647,7 +647,9 @@ files:
 - lib/dapp/kube/cli/command/kube/chart_create.rb
 - lib/dapp/kube/cli/command/kube/deploy.rb
 - lib/dapp/kube/cli/command/kube/dismiss.rb
+- lib/dapp/kube/cli/command/kube/lint.rb
 - lib/dapp/kube/cli/command/kube/minikube_setup.rb
+- lib/dapp/kube/cli/command/kube/render.rb
 - lib/dapp/kube/cli/command/kube/secret_edit.rb
 - lib/dapp/kube/cli/command/kube/secret_extract.rb
 - lib/dapp/kube/cli/command/kube/secret_generate.rb
@@ -657,7 +659,9 @@ files:
 - lib/dapp/kube/dapp/command/common.rb
 - lib/dapp/kube/dapp/command/deploy.rb
 - lib/dapp/kube/dapp/command/dismiss.rb
+- lib/dapp/kube/dapp/command/lint.rb
 - lib/dapp/kube/dapp/command/minikube_setup.rb
+- lib/dapp/kube/dapp/command/render.rb
 - lib/dapp/kube/dapp/command/secret_edit.rb
 - lib/dapp/kube/dapp/command/secret_extract.rb
 - lib/dapp/kube/dapp/command/secret_generate.rb
@@ -706,7 +710,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell