bosh-workspace 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095b4cec01561a415d908bc83c6a86e5a6861bac
-  data.tar.gz: 3038bc5ecd5756cf3672bbdc15405eee574a39c1
+  metadata.gz: 3f29b754b572e4d5ed8dec967631ad55ad4c1aaf
+  data.tar.gz: ef6635245f5b889dce32d237cbc729d757b0e488
 SHA512:
-  metadata.gz: 835a7af3d529d8264b273157ce4c2f80e5cdbe73ed3c8b817f469edebd874e730ff64110942b2f2aeb962930ac4fb0a3c39ef62445d9e0bb4c5ebbc04f32876c
-  data.tar.gz: 75e12938c90cea7260a8c2d16a6098d6c189bf9569431bf889e5cce7b23c70b57fafe297aa396b205e70cc54dc40adba7f47ec755007a9408cb60e3cd78bbd7d
+  metadata.gz: f6d369889fcadf43fd158cdbeef13bceca9352acd375b6f7471f7530e9febaab0368a1689a6866ec2db504bfde8c922fe7e091503ad473c2c79a9e34293727ae
+  data.tar.gz: d76958a05172e80c8ee96ee84010827cfaab34d94f0b8fe36cfb6917f36f98c9cd959a9af21a0508b4a7552b8993d49948534182392bc82bc4b0c8bfc91ffcd2

data/.travis.yml

@@ -3,6 +3,10 @@ cache: bundler
 sudo: false
 rvm:
   - 2.0
+before_script:
+  - wget https://github.com/cloudfoundry-incubator/spiff/releases/download/v1.0.7/spiff_linux_amd64.zip -O /tmp/spiff.zip
+  - unzip /tmp/spiff.zip && mkdir bin && mv spiff bin && chmod +x bin/spiff
+  - export PATH=$PATH:$PWD/bin
 addons:
   code_climate:
     repo_token:

data/bosh-workspace.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "bosh_cli", ">= 1.2905.0"
   spec.add_runtime_dependency "bosh_common", ">= 1.2905.0"
-  spec.add_runtime_dependency "bosh-template", ">= 1.2905.0"
   spec.add_runtime_dependency "semi_semantic", "~> 1.1.0"
   spec.add_runtime_dependency "membrane", "~> 1.1.0"
   spec.add_runtime_dependency "hashdiff", "~> 0.2.1"

data/lib/bosh/workspace/project_deployment.rb

@@ -1,9 +1,11 @@
 module Bosh::Workspace
   class ProjectDeployment
     include Bosh::Cli::Validation
-    attr_writer :director_uuid
+    attr_writer :director_uuid, :stub
     attr_reader :file
 
+    STUB_WHITELIST = %w(name director_uuid meta)
+
     def initialize(file)
       @file = file
       err("Deployment file does not exist: #{file}") unless File.exist?(@file)
@@ -33,8 +35,10 @@ module Bosh::Workspace
 
     def manifest
       return @manifest unless @manifest.nil?
-      renderer = Bosh::Template::Renderer.new(context: stub.to_json)
-      @manifest = Psych.load(renderer.render(file))
+      @manifest = Psych.load(ERB.new(File.read(file)).result)
+      validate_stub! unless stub.empty?
+      @manifest = recursive_merge(@manifest, stub) unless stub.empty?
+      @manifest
     end
 
     def stub
@@ -51,6 +55,12 @@ module Bosh::Workspace
 
     private
 
+    def validate_stub!
+      return unless stub.keys.any? { |k| !STUB_WHITELIST.include?(k) }
+      offending_keys = stub.keys - STUB_WHITELIST
+      err "Key: '#{offending_keys.first}' not allowed in stub file"
+    end
+
     def file_basename
       File.basename(@file)
     end
@@ -58,5 +68,15 @@ module Bosh::Workspace
     def file_dirname
       File.dirname(@file)
     end
+
+    def recursive_merge(source, target)
+      source.merge(target) do |_, old_value, new_value|
+        if old_value.class == Hash && new_value.class == Hash
+          recursive_merge(old_value, new_value)
+        else
+          new_value
+        end
+      end
+    end
   end
 end

data/lib/bosh/workspace/rspec.rb

@@ -0,0 +1,2 @@
+require_relative 'rspec/shared_workspace_examples'
+require_relative 'rspec/manifest_matcher'

data/lib/bosh/workspace/rspec/manifest_matcher.rb

@@ -0,0 +1,19 @@
+RSpec::Matchers.define :match_manifest do |expected|
+  match do |actual|
+    @diff = Bosh::Cli::HashChangeset.new
+    @diff.add_hash(normalize_and_load_deployment_manifest(actual), :new)
+    @diff.add_hash(normalize_and_load_deployment_manifest(expected), :old)
+    !@diff.changed?
+  end
+
+  failure_message do |actual|
+    @diff.summary.join("\n")
+  end
+
+  private
+
+  def normalize_and_load_deployment_manifest(manifest_file)
+    manifest_hash = YAML.load_file manifest_file
+    Bosh::Cli::DeploymentManifest.new(manifest_hash).normalize
+  end
+end

data/lib/bosh/workspace/rspec/shared_workspace_examples.rb

@@ -0,0 +1,46 @@
+require "common/exec"
+require "yaml"
+require 'semi_semantic/version'
+require 'bosh/workspace'
+require 'cli'
+
+desc = "behaves as bosh-workspace deployment"
+RSpec.shared_examples desc do |deployment_file, result_file, stub_file|
+  let(:workdir) { File.expand_path(File.join(deployment_file, '../..')) }
+  let(:stub) do
+    result = {} unless File.exist?(stub_file)
+    result ||= YAML.load_file(stub_file) || {}
+    result.merge({'director_uuid' => '00000000-0000-0000-0000-000000000000'})
+  end
+
+  subject do
+    Bosh::Workspace::ProjectDeployment.new(deployment_file).tap do |d|
+      d.stub = stub
+      d.validate
+    end
+  end
+
+  it "is a valid deployment manifest" do
+    expect(subject.errors).to eq []
+  end
+
+  def merge_templates(deployment, workdir)
+    Bosh::Workspace::ManifestBuilder.build(deployment, workdir)
+  end
+
+  def prepare_templates(deployment, workdir)
+    releases_dir = File.join(workdir, '.releases')
+    callback = Bosh::Workspace::GitCredentialsProvider
+               .new(File.join(workdir, '.credentials.yml')).callback
+
+    deployment.releases.each do |release|
+      Bosh::Workspace::Release.new(release, releases_dir, callback).update_repo
+    end
+  end
+
+  it "successfully merges deployment templates" do
+    expect { prepare_templates(subject, workdir) }.to_not raise_error
+    expect { merge_templates(subject, workdir) }.to_not raise_error
+    expect(subject.merged_file).to match_manifest result_file
+  end
+end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

data/spec/assets/manifests-repo/deployments/foo.yml

@@ -3,4 +3,3 @@ name: foo
 templates:
   - foo/bar.yml
 meta: {}
-stub_value: <%= p('stub.value') %>

data/spec/assets/manifests-repo/stubs/foo.yml

@@ -1,4 +1,4 @@
 ---
-properties:
+meta:
   stub:
     value: value

data/spec/integration/shared_workspace_examples_spec.rb

@@ -0,0 +1,45 @@
+require 'bosh/workspace/rspec'
+
+describe "rspec shared bosh-workspace example" do
+  deployment = {
+    'name' => 'foo',
+    'releases' => [],
+    'stemcells' => [],
+    'templates' => [
+      'deployment.yml'
+    ],
+    'meta' => {
+      'foo' => 'bar'
+    }
+  }
+  deployment_template = {
+    'director_uuid' => '(( merge ))',
+    'name' => '(( merge ))',
+    'releases' => '(( merge ))',
+    'jobs' => []
+  }
+  stub = { 'name' => 'bar' }
+
+  result = {
+    'director_uuid' => '00000000-0000-0000-0000-000000000000',
+    'name' => 'bar',
+    'releases' => [],
+    'jobs' => []
+  }
+
+  deployment_file = get_tmp_yml_file_path(deployment).tap do |d|
+    templates_path = File.expand_path('../../templates', d)
+    FileUtils.mkdir_p templates_path
+    IO.write(
+      File.join(templates_path, 'deployment.yml'),
+      deployment_template.to_yaml
+    )
+  end
+
+  include_examples(
+    "behaves as bosh-workspace deployment",
+    deployment_file,
+    get_tmp_yml_file_path(result),
+    get_tmp_yml_file_path(stub)
+  )
+end

data/spec/project_deployment_spec.rb

@@ -24,24 +24,31 @@ module Bosh::Workspace
       end
 
       context 'with stub file' do
-        let(:manifest) { { 'director_uuid' => '<%= p("stub.value") %>' } }
-        let(:stub_content) { "---\nproperties:\n  stub:\n    value: litmus\n" }
+        let(:manifest) { { 'director_uuid' => 'DIRECTOR_UUID' } }
+        let(:stub_content) do
+          {
+            'name' => 'bar',
+            'director_uuid' => 'foo-uuid',
+            'meta' => { 'foo' => 'bar' }
+          }.to_yaml
+        end
+
         before do
           allow(File).to receive(:exist?).with(stub_file).and_return(true)
           allow(File).to receive(:read).with(stub_file).and_return(stub_content)
         end
 
-        it 'reads manifest using bosh-template render' do
-          expect(subject.manifest['director_uuid']).to eq('litmus')
+        it 'merges stub with manifest' do
+          expect(subject.manifest['director_uuid']).to eq('foo-uuid')
         end
 
-        context 'with missing properties' do
-          let(:stub_content) { "---\nproperties:\n  stub: litmus\n" }
-          it 'raises error' do
-            expect { subject.manifest }.to raise_error /Can't find property/
+        context 'stub with releases' do
+          let(:stub_content) { { 'releases' => [] }.to_yaml }
+
+          it 'raises an error' do
+            expect{ subject.manifest }.to raise_error /releases.+not allowed/
           end
         end
-
       end
 
       context 'without stub file' do

data/spec/spec_helper.rb

@@ -65,6 +65,10 @@ def in_home_dir(&block)
   FileUtils.chdir(home_file, &block)
 end
 
+def get_tmp_yml_file_path(content)
+  get_tmp_file_path(content.to_yaml)
+end
+
 def get_tmp_file_path(content, file_name="tmp")
   tmp_file = File.open(File.join(Dir.mktmpdir, file_name), "w")
   tmp_file.write(content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2905.0
-- !ruby/object:Gem::Dependency
-  name: bosh-template
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2905.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: semi_semantic
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +198,9 @@ files:
 - lib/bosh/workspace/merge_tool.rb
 - lib/bosh/workspace/project_deployment.rb
 - lib/bosh/workspace/release.rb
+- lib/bosh/workspace/rspec.rb
+- lib/bosh/workspace/rspec/manifest_matcher.rb
+- lib/bosh/workspace/rspec/shared_workspace_examples.rb
 - lib/bosh/workspace/schemas/credentials.rb
 - lib/bosh/workspace/schemas/deployment_patch.rb
 - lib/bosh/workspace/schemas/project_deployment.rb
@@ -258,6 +247,7 @@ files:
 - spec/helpers/project_deployment_helper_spec.rb
 - spec/helpers/release_helper_spec.rb
 - spec/helpers/stemcell_helper_spec.rb
+- spec/integration/shared_workspace_examples_spec.rb
 - spec/manifest_builder_spec.rb
 - spec/merge_tool_spec.rb
 - spec/project_deployment_spec.rb
@@ -334,6 +324,7 @@ test_files:
 - spec/helpers/project_deployment_helper_spec.rb
 - spec/helpers/release_helper_spec.rb
 - spec/helpers/stemcell_helper_spec.rb
+- spec/integration/shared_workspace_examples_spec.rb
 - spec/manifest_builder_spec.rb
 - spec/merge_tool_spec.rb
 - spec/project_deployment_spec.rb