dapp 0.13.3 → 0.13.4

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

@@ -19,8 +19,7 @@ module Dapp
               kube_generate_helm_chart_tpl
 
               additional_values = [].tap do |options|
-                options << "--values #{kube_tmp_chart_secret_values_path.exist? ? kube_tmp_chart_secret_values_path : kube_chart_secret_values_path}" if kube_chart_secret_values_path.exist?
-                options.concat(self.options[:helm_values_options].map { |opt| "--values #{opt}" })
+                options.concat((kube_values_paths + kube_tmp_chart_secret_values_paths).map { |p| "--values #{p}" })
               end
 
               set_options = [].tap do |options|
@@ -43,17 +42,21 @@ module Dapp
 
           def kube_helm_decode_secrets
             if secret.nil?
-              log_warning(desc: { code: :dapp_secret_key_not_found }) if kube_chart_secret_values_path.file? || kube_chart_secret_path.directory?
+              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_values
               kube_helm_decode_secret_files
             end
+            kube_helm_decode_secret_values
           end
 
           def kube_helm_decode_secret_values
-            return unless kube_chart_secret_values_path.file?
-            decoded_data = kube_helm_decode_json(YAML::load(kube_chart_secret_values_path.read))
-            kube_tmp_chart_secret_values_path.write(decoded_data.to_yaml)
+            kube_secret_values_paths.each_with_index do |secret_values_file, index|
+              decoded_data = kube_helm_decode_json(YAML::load(secret_values_file.read))
+              kube_tmp_chart_secret_values_paths[index].write(decoded_data.to_yaml)
+            end
           end
 
           def kube_helm_decode_json(json)
@@ -62,7 +65,7 @@ module Dapp
               when Array then value.map { |v| decode_value.call(v) }
               when Hash then kube_helm_decode_json(value)
               else
-                secret.extract(value)
+                secret.nil? ? '' : secret.extract(value)
               end
             end
             json.each { |k, v| json[k] = decode_value.call(v) }
@@ -79,20 +82,24 @@ module Dapp
           end
 
           def kube_generate_helm_chart_tpl
-            secret_directory = secret.nil? ? 'secret' : kube_tmp_chart_secret_path.subpath_of(kube_tmp_chart_path)
             cont = <<-EOF
 {{/* vim: set filetype=mustache: */}}
 
-{{- define "dimg" -}}                                                                               
+{{- define "dimg" -}}
+{{- if (ge (len (index .)) 2) -}}
 {{- $name := index . 0 -}}                                                                          
-{{- $context := index . 1 -}}                                                                       
+{{- $context := index . 1 -}}  
 {{- printf "%s:%s-%s" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
+{{- else -}}
+{{- $context := index . 0 -}}
+{{- printf "%s:%s" $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 "#{secret_directory}/" $relative_file_path) -}}
+{{- $context.Files.Get (print "#{kube_tmp_chart_secret_path.subpath_of(kube_tmp_chart_path)}/" $relative_file_path) -}}
 {{- end -}}
             EOF
             kube_tmp_chart_path('templates/_dapp_helpers.tpl').write(cont)
@@ -115,13 +122,13 @@ module Dapp
             end
 
             args = [kube_release_name, kube_tmp_chart_path, additional_values, set_options, kube_helm_extra_options(dry_run: true)].flatten
-            output = shellout!("helm upgrade #{args.join(' ')}", log_verbose: false).stdout
+            output = shellout!("helm upgrade #{args.join(' ')}").stdout
 
             manifest_start_index = output.lines.index("MANIFEST:\n") + 1
             hook_start_index     = output.lines.index("HOOKS:\n") + 1
             configs = generator.call(output.lines[hook_start_index..manifest_start_index-1].join)
 
-            (configs['Job'] || []).reject do |_, c|
+            (configs['Job'] || {}).reject do |_, c|
               c['metadata'] ||= {}
               c['metadata']['annotations'] ||= {}
               c['metadata']['annotations']['helm.sh/resource-policy'] == 'keep'
@@ -141,10 +148,10 @@ module Dapp
           end
 
           def kube_run_deploy(additional_values, set_options)
-            log_process("Deploy release #{kube_release_name} ", verbose: true) do
+            log_process("Deploy release #{kube_release_name}") do
               args = [kube_release_name, kube_tmp_chart_path, additional_values, set_options, kube_helm_extra_options].flatten
               kubernetes.create_namespace!(kube_namespace) unless kubernetes.namespace?(kube_namespace)
-              shellout! "helm upgrade #{args.join(' ')}", force_log: true
+              shellout! "helm upgrade #{args.join(' ')}", verbose: true
             end
           end
 
@@ -164,19 +171,34 @@ module Dapp
             end
           end
 
-          def kube_tmp_chart_secret_values_path
-            kube_tmp_chart_path('decoded-secret-values.yaml')
-          end
-
           def kube_tmp_chart_secret_path(*path)
             kube_tmp_chart_path('decoded-secret', *path).tap { |p| p.parent.mkpath }
           end
 
           def kube_tmp_chart_path(*path)
-            @kube_tmp_path ||= Dir.mktmpdir('dapp-helm-chart-', options[:tmp_dir_prefix] || '/tmp')
+            @kube_tmp_path ||= Dir.mktmpdir('dapp-helm-chart-', tmp_base_dir)
             make_path(@kube_tmp_path, *path).expand_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.map { |f| kube_tmp_chart_path("#{SecureRandom.uuid}-#{f.basename}") }
+          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|
+                raise Error::Command, code: :secret_values_file_not_found, data: { path: f } unless f.file?
+              end)
+            end
+          end
+
           def kube_chart_secret_values_path
             kube_chart_path('secret-values.yaml').expand_path
           end

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

@@ -6,7 +6,7 @@ module Dapp
           def kube_dismiss
             kube_check_helm!
             kube_check_helm_release!
-            log_process("Delete release #{kube_release_name} ", verbose: true) do
+            log_process("Delete release #{kube_release_name}") do
               with_log_indent do
                 shellout! "helm delete #{kube_release_name} --purge"
                 kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]

data/lib/dapp/{deployment → kube}/dapp/command/minikube_setup.rb

@@ -1,5 +1,5 @@
 module Dapp
-  module Deployment
+  module Kube
     module Dapp
       module Command
         module MinikubeSetup
@@ -9,7 +9,7 @@ module Dapp
             end
           end
 
-          def deployment_minikube_setup
+          def kube_minikube_setup
             _minikube_restart_minikube
 
             # NOTICE: На данный момент выключено из-за непригодной
@@ -33,17 +33,17 @@ module Dapp
           end
 
           def _minikube_restart_minikube
-            log_process(:restart_minikube, verbose: true) do
+            log_process("Restart minikube") do
               raise MinikubeSetupError, code: :minikube_not_found if shellout('which minikube').exitstatus == 1
 
               Process.fork do
                 _minikube_set_original_sudo_caller_process_user!
 
                 begin
-                  if shellout!('minikube status', force_log: true).stdout.split("\n").map(&:strip).first == 'minikubeVM: Running'
-                    shellout! 'minikube stop', force_log: true
+                  if shellout!('minikube status', verbose: true).stdout.split("\n").map(&:strip).first == 'minikubeVM: Running'
+                    shellout! 'minikube stop', verbose: true
                   end
-                  shellout! 'minikube start --insecure-registry localhost:5000', force_log: true
+                  shellout! 'minikube start --insecure-registry localhost:5000', verbose: true
                 rescue ::Dapp::Error::Shellout
                   exit 1
                 end
@@ -93,7 +93,7 @@ module Dapp
           end
 
           def _minikube_run_minikube_persisted_storage_daemon
-            log_process(:run_minikube_persisted_storage_daemon) do
+            log_process("Run minikube persisted storage daemon") do
               _minikube_run_daemon(:minikube_persisted_storage) do
                 _minikube_set_original_sudo_caller_process_user!
 
@@ -109,11 +109,11 @@ module Dapp
           end
 
           def _minikube_wait_till_ready
-            log_process(:wait_till_minikube_ready) do
+            log_process("Wait till minikube ready") do
               600.times do
                 begin
                   return if _minikube_kubernetes.service?('kube-dns')
-                rescue Kubernetes::Error::ConnectionRefused
+                rescue Client::Error::ConnectionRefused
                 end
 
                 sleep 1
@@ -124,7 +124,7 @@ module Dapp
           end
 
           def _minikube_run_registry
-            log_process(:run_registry) do
+            log_process("Run registry") do
               _minikube_kubernetes.with_query(gracePeriodSeconds: 0) do
                 with_log_indent do
                   if _minikube_kubernetes.replicationcontroller? _minikube_registry_replicationcontroller_spec['metadata']['name']
@@ -224,7 +224,7 @@ module Dapp
           end
 
           def _minikube_run_registry_forwarder_daemon
-            log_process(:run_registry_forwarder_daemon) do
+            log_process("Run registry forwarder daemon") do
               registry_port_in_use = begin
                 Socket.tcp('localhost', 5000).close
                 true
@@ -251,7 +251,7 @@ module Dapp
           end
 
           def _minikube_kubernetes
-            @kubernetes ||= Kubernetes.new(namespace: 'kube-system')
+            @_minikube_kubernetes ||= Client.new(namespace: 'kube-system')
           end
 
           def _minikube_registry_replicationcontroller_spec

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

@@ -0,0 +1,46 @@
+module Dapp
+  module Kube
+    module Dapp
+      module Command
+        module SecretExtract
+          def kube_secret_extract(file_path)
+            secret_key_should_exist!
+
+            if file_path.nil?
+              kube_extract_secret
+            else
+              kube_extract_secret_file(file_path)
+            end
+          end
+
+          def kube_extract_secret
+            data = begin
+              if $stdin.tty?
+                print 'Enter secret: '
+                $stdin.noecho(&:gets).tap { print "\n" }
+              else
+                $stdin.read
+              end
+            end
+
+            unless (data = data.to_s.chomp).empty?
+              puts secret.extract(data)
+            end
+          end
+
+          def kube_extract_secret_file(file_path)
+            raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+
+            decrypted_data = secret.extract(IO.binread(file_path).chomp("\n"))
+            if (output_file_path = options[:output_file_path]).nil?
+              puts decrypted_data
+            else
+              FileUtils.mkpath File.dirname(output_file_path)
+              IO.binwrite(output_file_path, "#{decrypted_data}\n")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,42 @@ module Dapp
     module Dapp
       module Command
         module SecretGenerate
-          def kube_secret_generate
-            raise Error::Command, code: :secret_key_not_found if secret.nil?
-            unless (data = $stdin.noecho { |s| s.gets(nil) }).nil?
-              puts unless data.end_with?("\n")
+          def kube_secret_generate(file_path)
+            secret_key_should_exist!
+
+            if file_path.nil?
+              kube_secret
+            else
+              kube_secret_file(file_path)
+            end
+          end
+
+          def kube_secret
+            data = begin
+              if $stdin.tty?
+                print 'Enter secret: '
+                $stdin.noecho(&:gets).tap { print "\n" }
+              else
+                $stdin.read
+              end
+            end
+
+            unless (data = data.to_s.chomp).empty?
               puts secret.generate(data)
             end
           end
+
+          def kube_secret_file(file_path)
+            raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+
+            encrypted_data = secret.generate(IO.binread(file_path))
+            if (output_file_path = options[:output_file_path]).nil?
+              puts encrypted_data
+            else
+              FileUtils.mkpath File.dirname(output_file_path)
+              IO.binwrite(output_file_path, "#{encrypted_data}\n")
+            end
+          end
         end
       end
     end

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

@@ -4,9 +4,10 @@ module Dapp
       module Dapp
         include Command::Deploy
         include Command::Dismiss
-        include Command::SecretGenerate
         include Command::SecretKeyGenerate
-        include Command::SecretFileEncrypt
+        include Command::SecretGenerate
+        include Command::SecretExtract
+        include Command::MinikubeSetup
         include Command::Common
       end
     end

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

@@ -0,0 +1,7 @@
+module Dapp
+  module Kube
+    module Error
+      class Kubernetes < Base; end
+    end
+  end
+end

data/lib/dapp/kube/secret.rb

@@ -77,7 +77,7 @@ module Dapp
         end
       end
 
-      class Error < ::Dapp::Deployment::Error::Base
+      class Error < ::Dapp::Kube::Error::Base
         def initialize(**net_status)
           super(net_status.merge(context: :secret))
         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.3'.freeze
-  BUILD_CACHE_VERSION = 13
+  VERSION = '0.13.4'.freeze
+  BUILD_CACHE_VERSION = 15
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -411,6 +411,7 @@ files:
 - lib/dapp/core_ext/pathname.rb
 - lib/dapp/dapp.rb
 - lib/dapp/dapp/chef.rb
+- lib/dapp/dapp/dapp_config.rb
 - lib/dapp/dapp/dappfile.rb
 - lib/dapp/dapp/deps/base.rb
 - lib/dapp/dapp/deps/gitartifact.rb
@@ -429,7 +430,6 @@ files:
 - lib/dapp/deployment/cli/command/base.rb
 - lib/dapp/deployment/cli/command/deployment.rb
 - lib/dapp/deployment/cli/command/deployment/apply.rb
-- lib/dapp/deployment/cli/command/deployment/minikube_setup.rb
 - lib/dapp/deployment/cli/command/deployment/mrproper.rb
 - lib/dapp/deployment/config/config.rb
 - lib/dapp/deployment/config/directive/app.rb
@@ -446,7 +446,6 @@ files:
 - lib/dapp/deployment/core_ext/hash.rb
 - lib/dapp/deployment/dapp/command/apply.rb
 - lib/dapp/deployment/dapp/command/common.rb
-- lib/dapp/deployment/dapp/command/minikube_setup.rb
 - lib/dapp/deployment/dapp/command/mrproper.rb
 - lib/dapp/deployment/dapp/dapp.rb
 - lib/dapp/deployment/dapp/dappfile.rb
@@ -486,6 +485,7 @@ files:
 - lib/dapp/dimg/build/stage/ga_base.rb
 - lib/dapp/dimg/build/stage/ga_dependencies_base.rb
 - lib/dapp/dimg/build/stage/ga_latest_patch.rb
+- lib/dapp/dimg/build/stage/ga_related_dependencies_base.rb
 - lib/dapp/dimg/build/stage/import_artifact.rb
 - lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb
 - lib/dapp/dimg/build/stage/install/ga_post_install_patch_dependencies.rb
@@ -615,6 +615,7 @@ files:
 - lib/dapp/helper/cli.rb
 - lib/dapp/helper/net_status.rb
 - lib/dapp/helper/sha256.rb
+- lib/dapp/helper/tar.rb
 - lib/dapp/helper/trivia.rb
 - lib/dapp/kube.rb
 - lib/dapp/kube/cli/cli.rb
@@ -622,7 +623,8 @@ files:
 - lib/dapp/kube/cli/command/kube.rb
 - lib/dapp/kube/cli/command/kube/deploy.rb
 - lib/dapp/kube/cli/command/kube/dismiss.rb
-- lib/dapp/kube/cli/command/kube/secret_file_encrypt.rb
+- lib/dapp/kube/cli/command/kube/minikube_setup.rb
+- lib/dapp/kube/cli/command/kube/secret_extract.rb
 - lib/dapp/kube/cli/command/kube/secret_generate.rb
 - lib/dapp/kube/cli/command/kube/secret_key_generate.rb
 - lib/dapp/kube/client.rb
@@ -630,12 +632,14 @@ 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/secret_file_encrypt.rb
+- lib/dapp/kube/dapp/command/minikube_setup.rb
+- lib/dapp/kube/dapp/command/secret_extract.rb
 - lib/dapp/kube/dapp/command/secret_generate.rb
 - lib/dapp/kube/dapp/command/secret_key_generate.rb
 - lib/dapp/kube/dapp/dapp.rb
 - lib/dapp/kube/error/base.rb
 - lib/dapp/kube/error/command.rb
+- lib/dapp/kube/error/kubernetes.rb
 - lib/dapp/kube/secret.rb
 - lib/dapp/prctl.rb
 - lib/dapp/version.rb
@@ -659,7 +663,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell