kucodiff 0.0.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da8aef200dbbf8a83f7772181b035549cc929450
-  data.tar.gz: 529ad277ad8cc3dcfcdc4c433d62df20faa19c25
+SHA256:
+  metadata.gz: 7ee341354f388e8f3ec330e0a6bdfb8932f930cc22002abeba9231f907ec2757
+  data.tar.gz: 95373625d0a01aaebc3f2b4ad8a0993f1dfc05069def44e478d566f037221b4c
 SHA512:
-  metadata.gz: 70500ca39f992dfa03d986c9c9aa4ec01b9c3dda9fac3be0284b7c1943f12b966db39a4f19e9cce560c0b1f72e321ae5203304f817cffcc72fc8c07e280111c0
-  data.tar.gz: bd7581ffeec22db708ec87e293f8331746b202744f3b27afea5c151977a065b9cf7d570f6a9be10640bdb47090e3c8b6eee66b993e75f36c59eb9d4f027a2218
+  metadata.gz: 246489f2d7f29fee218a1b6924143b736945092e343f91a09e2bcd3a6cdadebb4de875102c74f7c44c9343ee9b58d0b8a8474068604b7c8db99e787bd4584686
+  data.tar.gz: 3ada56f41b856de3ffc0a0e260e5881d53d41c08d77826313ef1ddfd48273fe3ac061cff0d3be0c72ea1c7d81af5cce51c7506a0106e8f23bf463d54ed74d58c

data/lib/kucodiff.rb

@@ -2,13 +2,20 @@ require 'yaml'
 
 module Kucodiff
   class << self
-    def diff(files, ignore: false, expected: {})
+    def diff(files, ignore: false, indent_pod: false, expected: {})
       raise ArgumentError, "Need 2+ files" if files.size < 2
 
       base = files.shift
       base_template = read(base)
+
       diff = files.each_with_object({}) do |other, all|
-        result = different_keys(base_template, read(other))
+        other_template = read(other)
+        result =
+          if indent_pod
+            different_keys_pod_indented(base_template, other_template)
+          else
+            different_keys(base_template, other_template)
+          end
         result.reject! { |k| k =~ ignore } if ignore
         all["#{base}-#{other}"] = result.sort
       end
@@ -24,18 +31,26 @@ module Kucodiff
     private
 
     def read(file)
-      content = if file.end_with?('.yml', '.yaml')
-        YAML.load_stream(File.read(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)
+      hashify_required_env!(content)
 
-      hashify_container_env(content)
       flat_hash(content)
     end
 
-    # make env compareable
-    def hashify_container_env(content)
-      containers = content.fetch('spec', {}).fetch('template', {}).fetch('spec', {}).fetch('containers', [])
+    # 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|
@@ -45,6 +60,30 @@ module Kucodiff
       end
     end
 
+    def hashify_required_env!(content)
+      key = 'samson/required_env'
+      annotations = template(content).fetch('metadata', {}).fetch('annotations', {})
+      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] }]
+        else
+          template
+        end
+      end
+
+      diff = different_keys(*templates)
+      diff.select! { |k| k.start_with?(prefix) } if ignore_unindented
+      diff
+    end
+
     def different_keys(a, b)
       (a.keys + b.keys).uniq.select { |k| a[k] != b[k] }
     end
@@ -53,6 +92,10 @@ module Kucodiff
       a + b - (a & b)
     end
 
+    def template(content)
+      content['kind'] == "Pod" ? content : content.fetch('spec', {}).fetch('template', {})
+    end
+
     # http://stackoverflow.com/questions/9647997/converting-a-nested-hash-into-a-flat-hash
     def flat_hash(input, base = nil, all = {})
       if input.is_a?(Array)

data/lib/kucodiff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kucodiff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2020-06-29 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.5.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.3
 signing_key: 
 specification_version: 4
 summary: Smart diff for kubernetes configs to ensure symmetric configuration