ky 0.4.3 → 0.5.0debug

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e1439327b6aed61becdad4564dba6d626bc279
-  data.tar.gz: b9bc624a510108032079a2d5a53766e10e6ecc0a
+  metadata.gz: c3e900e99fbe794371a6194de65233955fa778c3
+  data.tar.gz: 29d2ec6a95bd09685859d6df7804d00e5da03bb9
 SHA512:
-  metadata.gz: 2fb56300523159011c8af092522a9590ceb4cae1493a63e10f843a17a88ac714815e2fb7c402803a27a0a64db19c4cc8c63cf83ef98787a40472a458b2d43e7e
-  data.tar.gz: eccefe9f0eb273c22ac337e4178bbf0c9941fa25080aa247f7fbc148905ad0919d712ef81dc7259133fe9a5e053fb043ad935e84c6ae602eb868d61883558a2a
+  metadata.gz: bef037f6e81299d4f489ea1677ca509d5bf73f7f193d71c86aa8cbb9e8491d7e85eaebbc9794205cbe8caf4a35781320df390e5dd7dbd2034998b2cd83372b8d
+  data.tar.gz: 640d8f96713fcabb7066419a3e234ce0ae1d5528eb19e87b63d8bc46b591d9f8623216a36660a1e83c4ba58861279a4556623021bcf523eb79b313ce5b8f0179

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/ky.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Kubernetes Yaml utilities and lubricant'
   s.rubyforge_project = 'ky'
   s.require_paths = ['lib']
+  s.add_development_dependency 'rake', '~> 11.3'
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_runtime_dependency 'thor', '~> 0.19'

data/lib/ky/env_generation.rb

@@ -25,12 +25,16 @@ module KY
     def initialize(input1, input2, configuration = Configuration.new)
       input_hashes = YAML.load(input1.read).with_indifferent_access, YAML.load(input2.read).with_indifferent_access
       @configuration = configuration
+      @config_hsh = input_hashes.find {|h| h[kind] == config_map }
+      @secret_hsh = input_hashes.find {|h| h[kind] == secret }
+      secret_project = secret_hsh[metadata][name]
+      config_project = config_hsh[metadata][name]
       input_hashes.each do |env_hsh|
         env_hsh[:metadata][:namespace] = configuration[:namespace]
+        env_hsh[:metadata][:name] = immutable_project_name
       end
-      @config_hsh = input_hashes.find {|h| h[kind] == config_map }
-      @secret_hsh = input_hashes.find {|h| h[kind] == secret }
-      raise ConflictingProjectError.new("Config and Secret metadata names do not agree") unless secret_hsh[metadata][name] == project
+
+      raise ConflictingProjectError.new("Config and Secret metadata names do not agree") unless secret_project == config_project
     end
 
     def to_h
@@ -38,11 +42,23 @@ module KY
     end
 
     def project
-       config_hsh[metadata][name]
+       @name ||= config_hsh[metadata][name]
     end
 
     private
 
+    def immutable_project_name
+      project + env_sha
+    end
+
+    def env_sha
+      sha = Digest::SHA1.new
+      sha.update config_hsh[data].to_json
+      sha.update secret_hsh[data].to_json
+      sha.digest
+      "-#{sha.hexdigest}"
+    end
+
     def force_config
       return [] unless configuration[:force_configmap_apply]
       [inline_env_map(config_map_key_ref, "force-configmap-apply", SecureRandom.hex)]
@@ -72,7 +88,7 @@ module KY
 
     def env_map(type, kebab_version)
       puts "WARNING: #{kebab_version} format appears incorrect, format as #{kebab_version.dasherize.downcase}" unless kebab_version == kebab_version.dasherize.downcase
-      {name => kebab_version.underscore.upcase, value_from => { type => {name => project, key => kebab_version }}}
+      {name => kebab_version.underscore.upcase, value_from => { type => {name => immutable_project_name, key => kebab_version }}}
     end
 
     def output_hash(env_array)

data/lib/ky/version.rb

@@ -1,3 +1,3 @@
 module KY
-  VERSION = "0.4.3"
+  VERSION = "0.5.0debug"
 end

data/spec/support/web-env.yml

@@ -13,10 +13,10 @@ spec:
         - name: DATABASE_URL
           valueFrom:
             secretKeyRef:
-              name: test
+              name: test-eef44890a5e5a7eb49214ac9c3992a4ace8888bb
               key: database-url
         - name: PII_ENCRYPTION_KEY
           valueFrom:
             secretKeyRef:
-              name: test
+              name: test-eef44890a5e5a7eb49214ac9c3992a4ace8888bb
               key: pii-encryption-key

data/spec/support/web-merged.yml

@@ -31,10 +31,10 @@ spec:
         - name: DATABASE_URL
           valueFrom:
             secretKeyRef:
-              name: test
+              name: test-eef44890a5e5a7eb49214ac9c3992a4ace8888bb
               key: database-url
         - name: PII_ENCRYPTION_KEY
           valueFrom:
             secretKeyRef:
-              name: test
+              name: test-eef44890a5e5a7eb49214ac9c3992a4ace8888bb
               key: pii-encryption-key

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ky
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0debug
 platform: ruby
 authors:
 - Brian Glusman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - bin/ky
 - examples/.ky.yml
 - examples/deployment_base.yml
@@ -137,12 +152,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ky
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Kubernetes Yaml utilities and lubricant