kubes 0.3.3 → 0.4.2

data/spec/kubes/cli/prune_spec.rb

@@ -0,0 +1,38 @@
+describe Kubes::CLI::Prune do
+  let(:prune) do
+    prune = described_class.new
+    allow(prune).to receive(:sure?)
+    allow(prune).to receive(:capture_items).and_return(capture)
+    allow(prune).to receive(:logger).and_return(null)
+    prune
+  end
+  let(:null) { double(:null).as_null_object }
+
+  let(:fetcher) do
+    fetcher = double(:fetcher).as_null_object
+    allow(fetcher).to receive(:fetch_items).and_return(fetch_items)
+    fetcher
+  end
+  before(:each) do
+    allow(Kubes::Kubectl::Fetch::Base).to receive(:new).and_return(fetcher)
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:md5s).and_return(built_kinds)
+  end
+
+  context("old resources") do
+    let(:fetch_items) { fixture("fetch_items.yaml") }
+    let(:capture) { fixture("capture.yaml") }
+    let(:built_kinds) do
+      {"Secret"=>{"demo-secret"=>"CURRENT111"}}
+    end
+
+    it "run" do
+      allow(Kubes::Kubectl).to receive(:execute)
+      prune.run
+      expect(Kubes::Kubectl).to have_received(:execute).at_least(:once)
+    end
+  end
+
+  def fixture(file)
+    YAML.load_file("spec/fixtures/prune/#{file}")
+  end
+end

data/spec/kubes/compiler/decorator/{resources → post}/deployment_spec.rb

@@ -1,11 +1,14 @@
-describe Kubes::Compiler::Decorator::Resources::Deployment do
+describe Kubes::Compiler::Decorator::Post do
   let(:decorator) { described_class.new(data) }
 
   def fixture(name)
     YAML.load_file("spec/fixtures/decorators/deployment/#{name}.yaml")
   end
   before(:each) do
-    allow(Kubes::Compiler::Decorator).to receive(:fetch).and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("Secret", "demo-secret").and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map").and_return("fakehash-config")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map-2").and_return("fakehash-config2")
   end
 
   context "secret" do
@@ -56,7 +59,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['containers'][0]['envFrom'][0]['configMapRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -66,7 +69,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['containers'][0]['env'][0]['valueFrom']['configMapKeyRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -76,7 +79,7 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
         decorator.run
         data = decorator.data
         name = data['spec']['template']['spec']['volumes'][0]['configMap']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
       end
     end
 
@@ -85,7 +88,50 @@ describe Kubes::Compiler::Decorator::Resources::Deployment do
       it "data" do
         decorator.run
         name = data['spec']['template']['spec']['containers'][0]['envFrom'][0]['configMapRef']['name']
-        expect(name).to eq("demo-config-map-fakehash")
+        expect(name).to eq("demo-config-map-fakehash-config")
+      end
+    end
+  end
+
+  context "both" do
+    describe "envFrom" do
+      let(:data) { fixture("both/envFrom") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        envFrom = data['spec']['template']['spec']['containers'][0]['envFrom']
+        name = envFrom[0]['secretRef']['name']
+        expect(name).to eq("demo-secret-fakehash")
+        name = envFrom[1]['configMapRef']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = envFrom[2]['configMapRef']['name']
+        expect(name).to eq("demo-config-map-2-fakehash-config2")
+      end
+    end
+
+    describe "valueFrom" do
+      let(:data) { fixture("both/valueFrom") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        valueFrom = data['spec']['template']['spec']['containers'][0]['env'][0]['valueFrom']
+        name = valueFrom['configMapKeyRef']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = valueFrom['secretKeyRef']['name']
+        expect(name).to eq("demo-secret-fakehash")
+      end
+    end
+
+    describe "volumes" do
+      let(:data) { fixture("both/volumes") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        volumes = data['spec']['template']['spec']['volumes']
+        name = volumes[0]['configMap']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = volumes[1]['secret']['secretName']
+        expect(name).to eq("demo-secret-fakehash")
       end
     end
   end

data/spec/kubes/compiler/decorator/{resources → post}/pod_spec.rb

@@ -1,11 +1,11 @@
-describe Kubes::Compiler::Decorator::Resources::Pod do
+describe Kubes::Compiler::Decorator::Post do
   let(:decorator) { described_class.new(data) }
 
   def fixture(name)
     YAML.load_file("spec/fixtures/decorators/pod/#{name}.yaml")
   end
   before(:each) do
-    allow(Kubes::Compiler::Decorator).to receive(:fetch).and_return("fakehash")
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).and_return("fakehash")
   end
 
   context("secret") do
@@ -38,15 +38,6 @@ describe Kubes::Compiler::Decorator::Resources::Pod do
         expect(name).to eq("demo-secret-fakehash")
       end
     end
-
-    describe "run" do
-      let(:data) { fixture("secret/envFrom") }
-      it "data" do
-        decorator.run
-        name = data['spec']['containers'][0]['envFrom'][0]['secretRef']['name']
-        expect(name).to eq("demo-secret-fakehash")
-      end
-    end
   end
 
   context "configMap" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kubes_google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -232,13 +246,22 @@ files:
 - docs/README.md
 - docs/Rakefile
 - docs/_config.yml
-- docs/_docs/auto-context.md
 - docs/_docs/ci/cloudbuild.md
 - docs/_docs/config.md
+- docs/_docs/config/args.md
+- docs/_docs/config/args/docker.md
+- docs/_docs/config/args/kubectl.md
 - docs/_docs/config/builder.md
 - docs/_docs/config/docker.md
 - docs/_docs/config/env.md
+- docs/_docs/config/hooks.md
+- docs/_docs/config/hooks/docker.md
+- docs/_docs/config/hooks/kubectl.md
+- docs/_docs/config/hooks/kubes.md
+- docs/_docs/config/hooks/ruby.md
 - docs/_docs/config/kubectl.md
+- docs/_docs/config/reference.md
+- docs/_docs/config/skip.md
 - docs/_docs/contributing.md
 - docs/_docs/dsl.md
 - docs/_docs/dsl/multiple-resources.md
@@ -269,7 +292,6 @@ files:
 - docs/_docs/intro/ordering.md
 - docs/_docs/intro/ordering/custom.md
 - docs/_docs/intro/structure.md
-- docs/_docs/kustomize.md
 - docs/_docs/layering.md
 - docs/_docs/layering/dsl.md
 - docs/_docs/layering/merge.md
@@ -294,15 +316,21 @@ files:
 - docs/_docs/learn/yaml/next-steps.md
 - docs/_docs/learn/yaml/review-project.md
 - docs/_docs/learn/yaml/update.md
+- docs/_docs/misc/auto-context.md
+- docs/_docs/misc/kustomize.md
+- docs/_docs/misc/separate-steps.md
 - docs/_docs/next-steps.md
 - docs/_docs/patterns.md
 - docs/_docs/patterns/clock-web-worker.md
+- docs/_docs/patterns/migrations.md
+- docs/_docs/patterns/secrets.md
 - docs/_docs/resources.md
 - docs/_docs/resources/base.md
 - docs/_docs/resources/role.md
 - docs/_docs/resources/shared.md
 - docs/_docs/yaml.md
 - docs/_includes/commands.html
+- docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
 - docs/_includes/dsl/methods.md
 - docs/_includes/dsl/rolling_deployment.md
@@ -473,19 +501,16 @@ files:
 - lib/kubes/cli/help/exec.md
 - lib/kubes/cli/init.rb
 - lib/kubes/cli/logs.rb
+- lib/kubes/cli/prune.rb
 - lib/kubes/cli/sequence.rb
 - lib/kubes/command.rb
 - lib/kubes/compiler.rb
-- lib/kubes/compiler/decorator.rb
 - lib/kubes/compiler/decorator/base.rb
-- lib/kubes/compiler/decorator/compile.rb
-- lib/kubes/compiler/decorator/resources/base.rb
-- lib/kubes/compiler/decorator/resources/container.rb
-- lib/kubes/compiler/decorator/resources/container/mapping.rb
-- lib/kubes/compiler/decorator/resources/deployment.rb
-- lib/kubes/compiler/decorator/resources/pod.rb
-- lib/kubes/compiler/decorator/resources/secret.rb
-- lib/kubes/compiler/decorator/write.rb
+- lib/kubes/compiler/decorator/hashable.rb
+- lib/kubes/compiler/decorator/hashable/field.rb
+- lib/kubes/compiler/decorator/hashable/storage.rb
+- lib/kubes/compiler/decorator/post.rb
+- lib/kubes/compiler/decorator/pre.rb
 - lib/kubes/compiler/dsl/core/base.rb
 - lib/kubes/compiler/dsl/core/blocks.rb
 - lib/kubes/compiler/dsl/core/fields.rb
@@ -529,20 +554,21 @@ files:
 - lib/kubes/docker/strategy/build/base.rb
 - lib/kubes/docker/strategy/build/docker.rb
 - lib/kubes/docker/strategy/build/gcloud.rb
-- lib/kubes/docker/strategy/hooks.rb
 - lib/kubes/docker/strategy/image_name.rb
 - lib/kubes/docker/strategy/push/base.rb
 - lib/kubes/docker/strategy/push/docker.rb
 - lib/kubes/docker/strategy/push/gcloud.rb
 - lib/kubes/docker/strategy/utils.rb
 - lib/kubes/hooks/builder.rb
+- lib/kubes/hooks/concern.rb
 - lib/kubes/hooks/dsl.rb
+- lib/kubes/hooks/runner.rb
 - lib/kubes/kubectl.rb
 - lib/kubes/kubectl/args/base.rb
 - lib/kubes/kubectl/args/kustomize.rb
 - lib/kubes/kubectl/args/standard.rb
 - lib/kubes/kubectl/batch.rb
-- lib/kubes/kubectl/decider.rb
+- lib/kubes/kubectl/dispatcher.rb
 - lib/kubes/kubectl/fetch/base.rb
 - lib/kubes/kubectl/fetch/deployment.rb
 - lib/kubes/kubectl/fetch/pods.rb
@@ -576,6 +602,9 @@ files:
 - spec/fixtures/artifacts/demo-web/deployment.yaml
 - spec/fixtures/artifacts/demo-web/service.yaml
 - spec/fixtures/blocks/deployments.rb
+- spec/fixtures/decorators/deployment/both/envFrom.yaml
+- spec/fixtures/decorators/deployment/both/valueFrom.yaml
+- spec/fixtures/decorators/deployment/both/volumes.yaml
 - spec/fixtures/decorators/deployment/configMap/envFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/valueFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/volumes.yaml
@@ -601,11 +630,14 @@ files:
 - spec/fixtures/project/.kubes/resources/deployment.rb
 - spec/fixtures/project/.kubes/resources/foobar.rb
 - spec/fixtures/project/.kubes/resources/service.rb
+- spec/fixtures/prune/capture.yaml
+- spec/fixtures/prune/fetch_items.yaml
 - spec/fixtures/services/minimum.rb
 - spec/fixtures/syntax/network_policy.rb
 - spec/fixtures/syntax/pod.rb
-- spec/kubes/compiler/decorator/resources/deployment_spec.rb
-- spec/kubes/compiler/decorator/resources/pod_spec.rb
+- spec/kubes/cli/prune_spec.rb
+- spec/kubes/compiler/decorator/post/deployment_spec.rb
+- spec/kubes/compiler/decorator/post/pod_spec.rb
 - spec/kubes/compiler/strategy/dsl_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb
@@ -645,6 +677,9 @@ test_files:
 - spec/fixtures/artifacts/demo-web/deployment.yaml
 - spec/fixtures/artifacts/demo-web/service.yaml
 - spec/fixtures/blocks/deployments.rb
+- spec/fixtures/decorators/deployment/both/envFrom.yaml
+- spec/fixtures/decorators/deployment/both/valueFrom.yaml
+- spec/fixtures/decorators/deployment/both/volumes.yaml
 - spec/fixtures/decorators/deployment/configMap/envFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/valueFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/volumes.yaml
@@ -670,11 +705,14 @@ test_files:
 - spec/fixtures/project/.kubes/resources/deployment.rb
 - spec/fixtures/project/.kubes/resources/foobar.rb
 - spec/fixtures/project/.kubes/resources/service.rb
+- spec/fixtures/prune/capture.yaml
+- spec/fixtures/prune/fetch_items.yaml
 - spec/fixtures/services/minimum.rb
 - spec/fixtures/syntax/network_policy.rb
 - spec/fixtures/syntax/pod.rb
-- spec/kubes/compiler/decorator/resources/deployment_spec.rb
-- spec/kubes/compiler/decorator/resources/pod_spec.rb
+- spec/kubes/cli/prune_spec.rb
+- spec/kubes/compiler/decorator/post/deployment_spec.rb
+- spec/kubes/compiler/decorator/post/pod_spec.rb
 - spec/kubes/compiler/strategy/dsl_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb

data/lib/kubes/compiler/decorator.rb

@@ -1,17 +0,0 @@
-class Kubes::Compiler
-  module Decorator
-    @@md5s = {}
-    def store(name, md5)
-      @@md5s[name] = md5
-    end
-
-    def fetch(name)
-      @@md5s[name]
-    end
-
-    def md5s
-      @@md5s
-    end
-    extend self
-  end
-end

data/lib/kubes/compiler/decorator/compile.rb

@@ -1,12 +0,0 @@
-module Kubes::Compiler::Decorator
-  class Compile < Base
-    def process(item)
-      case item['kind']
-      when "ConfigMap", "Secret"
-        Resources::Secret.new(item).run
-      else
-        item # pass through
-      end
-    end
-  end
-end

data/lib/kubes/compiler/decorator/resources/base.rb

@@ -1,13 +0,0 @@
-module Kubes::Compiler::Decorator::Resources
-  class Base
-    attr_reader :data
-    def initialize(data)
-      @data = data
-    end
-
-    def run
-      return @data unless Kubes.config.suffix_hash
-      perform
-    end
-  end
-end

data/lib/kubes/compiler/decorator/resources/container.rb

@@ -1,76 +0,0 @@
-module Kubes::Compiler::Decorator::Resources
-  class Container
-    include Mapping
-
-    def initialize(data, kind:, fields_for:)
-      @data = data
-      # These methods are defined in Mapping
-      kind == "Deployment" ? deployment_keys : pod_keys
-      fields_for == "Secret" ? secrets_fields : configMaps_fields
-    end
-
-    def run
-      envFrom!
-      valueFrom!
-      volumes!
-      @data
-    end
-
-    # spec.envFrom.configMapRef
-    # spec.envFrom.secretRef
-    def envFrom!
-      return @data unless containers
-
-      containers.each do |container|
-        next unless envFrom_list = container.dig('envFrom') # intentional assignment
-
-        envFrom_list.each do |envFrom|
-          next unless name = envFrom.dig(@envFrom_field, 'name') # intentional assignment
-
-          md5 = Kubes::Compiler::Decorator.fetch(name)
-          envFrom[@envFrom_field]['name'] = [name, md5].compact.join('-')
-        end
-      end
-    end
-
-    # spec.valueFrom.configMapKeyRef
-    # spec.valueFrom.secretKeyRef
-    def valueFrom!
-      return @data unless containers
-
-      containers.each do |container|
-        next unless env_list = container.dig('env') # intentional assignment
-
-        env_list.each do |env|
-          next unless name = env.dig('valueFrom',@valueFrom_field,'name') # intentional assignment
-
-          md5 = Kubes::Compiler::Decorator.fetch(name)
-          env['valueFrom'][@valueFrom_field]['name'] = [name, md5].compact.join('-')
-        end
-      end
-    end
-
-    # spec.volumes.configMap.name
-    # spec.volumes.secret.secretName
-    def volumes!
-      volumes = @data.dig(*@volumes_key.split('.'))
-      return @data unless volumes
-
-      volumes.each do |volume|
-        # Example:
-        # next unless field = volume.dig('secret') # intentional assignment
-        # next unless name = field['secretName'] # intentional assignment
-        next unless field = volume.dig(@volume_field) # intentional assignment
-        next unless name = field[@volume_field_name] # intentional assignment
-
-        md5 = Kubes::Compiler::Decorator.fetch(name)
-        field[@volume_field_name] = [name, md5].compact.join('-')
-      end
-    end
-
-  private
-    def containers
-      @data.dig(*@containers_key.split('.'))
-    end
-  end
-end