kucodiff 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee341354f388e8f3ec330e0a6bdfb8932f930cc22002abeba9231f907ec2757
-  data.tar.gz: 95373625d0a01aaebc3f2b4ad8a0993f1dfc05069def44e478d566f037221b4c
+  metadata.gz: 76444ee014253e7f3336e78ef6ddb39a5b6eb6052964644af058bff8e3fd3531
+  data.tar.gz: a0410e79490633c00e68e3ea263b25dc012154ab3e52b980ab4ce746807c72de
 SHA512:
-  metadata.gz: 246489f2d7f29fee218a1b6924143b736945092e343f91a09e2bcd3a6cdadebb4de875102c74f7c44c9343ee9b58d0b8a8474068604b7c8db99e787bd4584686
-  data.tar.gz: 3ada56f41b856de3ffc0a0e260e5881d53d41c08d77826313ef1ddfd48273fe3ac061cff0d3be0c72ea1c7d81af5cce51c7506a0106e8f23bf463d54ed74d58c
+  metadata.gz: c3223cb54dc70464911e6f01ea8a745a208180a7f659b1ef7397c7091bc1dddd272364495494c67d10dfceba429d301dee185e342e1796bf354f1ddaa7aed089
+  data.tar.gz: ca69382adba297961dc1ccc6c9aa662670e58fd32d64e2bdc584832383680377247cc5f74242c5fbe650821835c3f0c447bd88cace1aa3cc27104085db57652d

data/lib/kucodiff/version.rb

@@ -1,3 +1,3 @@
 module Kucodiff
-  VERSION = "0.3.0"
+  VERSION = "0.6.0"
 end

data/lib/kucodiff.rb

@@ -2,7 +2,7 @@ require 'yaml'
 
 module Kucodiff
   class << self
-    def diff(files, ignore: false, indent_pod: false, expected: {})
+    def diff(files, ignore: false, indent_pod: true, expected: {})
       raise ArgumentError, "Need 2+ files" if files.size < 2
 
       base = files.shift
@@ -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
@@ -42,21 +38,28 @@ module Kucodiff
           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
 
@@ -66,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)
@@ -93,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.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -31,14 +31,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Smart diff for kubernetes configs to ensure symmetric configuration