kucodiff 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc7a9fee577353c9b0d12160b0a00cc6f8b6325a
-  data.tar.gz: 81cda8035f50ca59908f88064fe3b7f273128679
+SHA256:
+  metadata.gz: 626cbfd398f264adaf284a4842ea250babe4d8bcb506f1700cb1629c2cfb3e3e
+  data.tar.gz: d3d33300480d745da896131cb1dba9881358b3d478e91ff516a3446661e33313
 SHA512:
-  metadata.gz: f18b565c6e64ccc715de6a87b24bd48592cff258b234f0b829c2906bc010759dfc39c9f1ac27c3ed7807f229159b47606ca82811dd8ed5301aa2b539dfbb2888
-  data.tar.gz: 4f1a87766ba6afe954bd774266d9b26217efa76e29622b174587f6793af1371d16f170ec28c18d4a1b91956ed581e66cacc158fe12235195ea19f067856a2ab9
+  metadata.gz: 2a87916da814015b02fcb1e5fa9b8027702eeab15a6104e3c9af2bb682daf98763d4260416962b70dda6b5b23f5e97bdfb7bc0877fb3989c1acf871f72b0c9fd
+  data.tar.gz: a4f29440331c0eae9a2447751e6c3b6653019d1f3f0198e591915ea8888495bf8667aa961097c5b23bd3a31c63c9f3b69a4313677c837376d8b1098f16b36256

data/lib/kucodiff/version.rb

@@ -1,3 +1,3 @@
 module Kucodiff
-  VERSION = "0.2.1"
+  VERSION = "0.5.0"
 end

data/lib/kucodiff.rb

@@ -10,12 +10,8 @@ module Kucodiff
 
       diff = files.each_with_object({}) do |other, all|
         other_template = read(other)
-        result =
-          if indent_pod
-            different_keys_pod_indented(base_template, other_template)
-          else
-            different_keys(base_template, other_template)
-          end
+        pod_indented!(base_template, other_template) if indent_pod
+        result = different_keys(base_template, other_template)
         result.reject! { |k| k =~ ignore } if ignore
         all["#{base}-#{other}"] = result.sort
       end
@@ -31,26 +27,39 @@ module Kucodiff
     private
 
     def read(file)
-      content = if file.end_with?('.yml', '.yaml')
-        YAML.load_stream(File.read(file), file) # TODO: test need for stream
-      else raise ArgumentError, "unknown file format in #{file}"
-      end.first
+      content =
+        if file.end_with?('.yml', '.yaml')
+          if RUBY_VERSION >= "2.6.0"
+            YAML.load_stream(File.read(file), filename: file) # uncovered
+          else
+            YAML.load_stream(File.read(file), file) # uncovered
+          end
+        else
+          raise ArgumentError, "unknown file format in #{file}"
+        end.first
 
-      hashify_container_env!(content)
+      template = template(content)
+      template.dig("spec", "containers")&.each do |container|
+        hashify_named_array!(container, "env", first: true)
+        hashify_named_array!(container, "volumeMounts", first: false)
+      end
+      hashify_named_array!(template["spec"], "volumes", first: false)
       hashify_required_env!(content)
 
       flat_hash(content)
     end
 
-    # make env comparable
-    def hashify_container_env!(content)
-      containers = template(content).fetch('spec', {}).fetch('containers', [])
-      containers.each do |container|
-        next unless container['env']
-        container['env'] = container['env'].each_with_object({}) do |v, h|
-          value_key = (v.keys - ['name']).first
-          h[v.fetch('name')] = v.fetch(value_key)
-        end
+    def hashify_named_array!(object, key, first:)
+      return if !object || !(array = object[key])
+      object[key] = array.to_h do |v|
+        keep = (v.keys - ['name'])
+        value =
+          if first
+            v.fetch(keep.first)
+          else
+            v.slice(*keep)
+          end
+        [v.fetch('name'), value]
       end
     end
 
@@ -60,22 +69,23 @@ module Kucodiff
       annotations[key] = Hash[annotations[key].strip.split(/[\s,]/).map { |k| [k, true] }] if annotations[key]
     end
 
-    def different_keys_pod_indented(*templates)
-      ignore_unindented = false
-      prefix = "spec.template."
-
-      templates.map! do |template|
-        if template["kind"] == "Pod"
-          ignore_unindented = true
-          Hash[template.map { |k,v| [prefix + k, v] }]
+    # templates are flat hashes already
+    def pod_indented!(*templates)
+      kinds = templates.map { |t| t["kind"] }
+      return if (kinds & ["Pod", "PodTemplate"]).empty? || kinds.uniq.size == 1
+
+      templates.each do |template|
+        case template["kind"]
+        when "Pod"
+          # all good
+        when "PodTemplate"
+          template.select! { |k, _| k.start_with?("template.") }
+          template.transform_keys! { |k| k.sub("template.", "") }
         else
-          template
+          template.select! { |k, _| k.start_with?("spec.template.") }
+          template.transform_keys! { |k| k.sub("spec.template.", "") }
         end
       end
-
-      diff = different_keys(*templates)
-      diff.select! { |k| k.start_with?(prefix) } if ignore_unindented
-      diff
     end
 
     def different_keys(a, b)
@@ -87,7 +97,11 @@ module Kucodiff
     end
 
     def template(content)
-      content['kind'] == "Pod" ? content : content.fetch('spec', {}).fetch('template', {})
+      case content['kind']
+      when "Pod" then content
+      when "PodTemplate" then content.fetch('template')
+      else content.dig('spec', 'template') || {}
+      end
     end
 
     # http://stackoverflow.com/questions/9647997/converting-a-nested-hash-into-a-flat-hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kucodiff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -31,15 +31,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Smart diff for kubernetes configs to ensure symmetric configuration