dapp 0.14.6 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee0f2f7ee5e578d580869bfc319b4af1ae4b16f
-  data.tar.gz: cb5c44af2606334738cbe16fc3d2eb7554c72729
+  metadata.gz: c3e4aaab14d65724ea60299ceadd6e9b7c7af8ef
+  data.tar.gz: 09ddd9cf4d499ad1afe387d935e7338371f7f6f1
 SHA512:
-  metadata.gz: e0a945624dfd7e3eeec6cad93d278043d87856d19a425f2320924a767ac1d3bbc4c682b1272fde7f0ff3ef3d6aa3ead8c59c1f64ced73e8d3850deb19c9f390a
-  data.tar.gz: 49fd0b79fb89443b69d84fff5c9e57cf0cbb9a0d67fc67e9b4cd766ebae45756a0b68983234302b53e54c5bb5618a9bcd1bf0dde3467e8d9fa2577f29c6a20b9
+  metadata.gz: bc13b2da565927801e877745305c7f8b8ce24c3fbe7b8ecd5a116a33dcfe9f74c68bab163597f9822017b6398938d81275ab31ed30da3c75bb795624ff408e13
+  data.tar.gz: 8a7dce36cf64f25f11cc4f57a6edf0c7aee1e061c56f77f4fdfb8af00764e388487b5a98ff85c2b5f8556eb1f71edaf045f8b2fc886313730b0c5be8db3cc19e

data/config/en/net_status.yml

@@ -38,7 +38,8 @@ en:
       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_values_file_not_found: "Secret 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}"
       incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
       editor_not_found: "Editor not found!"

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

@@ -8,35 +8,32 @@ module Dapp
           end
 
           def kube_release_name
-            "#{name}-#{kube_namespace}"
+            "#{name}-#{kube_namespace}".slugify
           end
 
           def kube_namespace
             kubernetes.namespace
           end
 
-          def kube_helm_encode_json(secret, json)
-            encode_json = proc do |value|
-              case value
-              when Array then value.map { |v| encode_json.call(v) }
-              when Hash then kube_helm_encode_json(secret,value)
-              else
-                secret.nil? ? '' : secret.generate(value)
+          { encode: :generate, decode: :extract }.each do |type, secret_method|
+            define_method "kube_helm_#{type}_json" do |secret, json|
+              change_json_value = proc do |value|
+                case value
+                when Array then value.map { |v| change_json_value.call(v) }
+                when Hash then send(:"kube_helm_#{type}_json", secret, value)
+                when '' then ''
+                else
+                  secret.nil? ? '' : secret.public_send(secret_method, value)
+                end
+
+                json.each { |k, v| json[k] = change_json_value.call(v) }
               end
             end
-            json.each { |k, v| json[k] = encode_json.call(v) }
           end
 
-          def kube_helm_decode_json(secret, json)
-            decode_value = proc do |value|
-              case value
-              when Array then value.map { |v| decode_value.call(v) }
-              when Hash then kube_helm_decode_json(secret,value)
-              else
-                secret.nil? ? '' : secret.extract(value)
-              end
-            end
-            json.each { |k, v| json[k] = decode_value.call(v) }
+          def kube_secret_file_validate!(file_path)
+            raise Error::Command, code: :secret_file_not_found, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+            raise Error::Command, code: :secret_file_empty, data: { path: File.expand_path(file_path) } if File.read(file_path).strip.empty?
           end
 
           def secret_key_should_exist!

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

@@ -63,7 +63,8 @@ module Dapp
           def kube_helm_decode_secret_files
             return unless kube_chart_secret_path.directory?
             Dir.glob(kube_chart_secret_path.join('**/*')).each do |entry|
-              next unless File.file?(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}
@@ -189,7 +190,7 @@ module Dapp
             @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?
+                kube_secret_file_validate!(f)
               end)
             end
           end

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

@@ -8,7 +8,7 @@ module Dapp
 
             with_kube_tmp_chart_dir do
               decoded_data = begin
-                raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+                kube_secret_file_validate!(file_path)
 
                 if options[:values]
                   kube_extract_secret_values(file_path)

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

@@ -8,7 +8,7 @@ module Dapp
 
             data = begin
               if file_path
-                raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+                kube_secret_file_validate!(file_path)
 
                 if options[:values]
                   kube_extract_secret_values(file_path)

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

@@ -8,7 +8,7 @@ module Dapp
 
             data = begin
               if file_path
-                raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+                kube_secret_file_validate!(file_path)
 
                 if options[:values]
                   kube_secret_values(file_path)

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

@@ -8,12 +8,13 @@ module Dapp
 
             secret_values_paths << kube_chart_path('secret-values.yaml') if kube_chart_path('secret-values.yaml').file?
             secret_values_paths.each do |file_path|
-              raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+              kube_secret_file_validate!(file_path)
               regenerated_data[file_path] = kube_regenerate_secret_values(file_path)
             end
 
             Dir.glob(kube_chart_secret_path('**/*'), File::FNM_DOTMATCH).each do |file_path|
               next if File.directory?(file_path)
+              kube_secret_file_validate!(file_path)
               regenerated_data[file_path] = kube_regenerate_secret_file(file_path)
             end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.6'.freeze
+  VERSION = '0.14.7'.freeze
   BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.14.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -166,6 +166,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: slugify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -686,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell