dapp 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d181fb38e748b19b264a4915a3a6fb3e6667d2c1
-  data.tar.gz: 38223cc898561220d439c6aadc61e41eebd3cf7e
+  metadata.gz: 71be83fae4a7b73eb9fc99e8ade1d01fe3c2e065
+  data.tar.gz: 9398756ccdbb05b3b974004acee399ecc0bcdc06
 SHA512:
-  metadata.gz: 266c75c205201e46cfdf8a0c3056b22cf883cceb1afcf5eddd68eb3139545249f561984afd6bbf933e9f79f5734fd04a4a9a0fb0c4ca6d31f94a10babdce0b63
-  data.tar.gz: 0ce677db9c3c6a93558f67853174bd2f54a919f794eb3da8cee28f1a4542cb0a20f8df9b7400d237996cd2f4b34a493b268a6f02d12590d76cea4a67327165df
+  metadata.gz: a9d9c45d50fb53df425bc48525dec384a2d9a5de6f707d79735d41e9c0549ca4a56cca60da49906b28fcdac7685b9839a7fe8496d1558947aba5f1faea91b1ea
+  data.tar.gz: 81245d82a56f9dd15bff96a5121d8ff17f91b03b338516a94e8e71a241afab55d58195cd925ec56314575e2d86fb23402438eca41f6182915660ec3cab2cdb59

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

@@ -34,10 +34,8 @@ module Dapp
                       deep_delete_if_key_not_exist(encoded_values, updated_decoded_values)
 
                       modified_decoded_values = deep_select_modified_keys(updated_decoded_values, decoded_values)
-                      encoded_values.in_depth_merge(kube_helm_encode_json(secret, modified_decoded_values))
-                        .sort
-                        .to_h
-                        .to_yaml
+                      updated_encoded_values = encoded_values.in_depth_merge(kube_helm_encode_json(secret, modified_decoded_values))
+                      deep_sort_by_same_structure(updated_encoded_values, updated_decoded_values).to_yaml
                     else
                       kube_secret_file(tmp_file_path)
                     end
@@ -90,6 +88,14 @@ module Dapp
               end
             end
           end
+
+          def deep_sort_by_same_structure(hash1, hash2)
+            hash1.sort_by { |k, _| hash2.keys.index(k) }.to_h.tap do |h|
+              h.select { |_, v| v.is_a?(Hash) }.each do |k, _|
+                h[k] = deep_sort_by_same_structure(h[k], hash2[k])
+              end
+            end
+          end
         end
       end
     end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.3'.freeze
+  VERSION = '0.14.4'.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.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout