bosh-gen 0.16.2 → 0.17.0

data/spec/fixtures/releases/s3test-boshrelease/templates/jobs.yml

@@ -0,0 +1,30 @@
+meta:
+  environment: ~
+
+update:
+  canaries: 1
+  max_in_flight: 50
+  canary_watch_time: 1000-30000
+  update_watch_time: 1000-30000
+  serial: false
+
+jobs:
+  - name: s3test_leader_z1
+    template: s3test
+    instances: 0
+    resource_pool: small_z1
+    networks: (( merge ))
+  - name: s3test_z1
+    template: s3test
+    instances: 0
+    resource_pool: small_z1
+    networks: (( merge ))
+    update:
+      canaries: 10
+    properties:
+      s3test:
+        leader_address: (( merge ))
+
+networks: (( merge ))
+
+properties: {}

data/spec/fixtures/releases/s3test-boshrelease/templates/make_manifest

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+infrastructure=$1
+template_prefix="s3test"
+
+if [ "$infrastructure" != "aws-ec2" ] && \
+    [ "$infrastructure" != "warden" ] ; then
+  echo "usage: ./make_manifest <aws-ec2|warden>"
+  exit 1
+fi
+
+shift
+
+BOSH_STATUS=$(bosh status)
+DIRECTOR_UUID=$(echo "$BOSH_STATUS" | grep UUID | awk '{print $2}')
+DIRECTOR_CPI=$(echo "$BOSH_STATUS" | grep CPI | awk '{print $2}')
+DIRECTOR_NAME=$(echo "$BOSH_STATUS" | grep Name | awk '{print $2}')
+NAME=$template_prefix-$infrastructure
+
+if [[ $DIRECTOR_NAME = "warden" ]]; then
+  if [[ $infrastructure != "warden" ]]; then
+    echo "Not targeting bosh-lite with warden CPI. Please use 'bosh target' before running this script."
+    exit 1
+  fi
+fi
+
+if [[ $infrastructure = "aws-ec2" ]]; then
+  if [[ $DIRECTOR_CPI != "aws" ]]; then
+    echo "Not targeting an AWS BOSH. Please use 'bosh target' before running this script."
+    exit 1
+  fi
+fi
+
+templates=$(dirname $0)
+release=$templates/..
+tmpdir=$release/tmp
+
+mkdir -p $tmpdir
+cp $templates/stub.yml $tmpdir/stub-with-uuid.yml
+echo $DIRECTOR_NAME $DIRECTOR_CPI $DIRECTOR_UUID
+perl -pi -e "s/PLACEHOLDER-DIRECTOR-UUID/$DIRECTOR_UUID/g" $tmpdir/stub-with-uuid.yml
+perl -pi -e "s/NAME/$NAME/g" $tmpdir/stub-with-uuid.yml
+
+spiff merge \
+  $templates/deployment.yml \
+  $templates/jobs.yml \
+  $templates/infrastructure-${infrastructure}.yml \
+  $tmpdir/stub-with-uuid.yml \
+  $* > $tmpdir/$NAME-manifest.yml
+
+bosh deployment $tmpdir/$NAME-manifest.yml
+bosh status

data/spec/fixtures/releases/s3test-boshrelease/templates/stub.yml

@@ -0,0 +1,13 @@
+---
+meta:
+  environment: NAME
+  dns_root: microbosh
+  network_name: s3test1
+  security_groups:
+    - s3test
+
+director_uuid: PLACEHOLDER-DIRECTOR-UUID
+
+releases:
+  - name: s3test
+    version: latest

data/spec/generators/deployment_manifest_generator_spec.rb

@@ -1,28 +1,20 @@
 require "spec_helper"
-require "generators/generator_spec_helper"
+require "bosh/gen/generators/deployment_manifest_generator"
 
 # in a tmp folder:
 # * run generator
 # * deployment manifest created
 
 # generates dpeloyment manifest for a target release
-class DeploymentManifestGeneratorSpec < MiniTest::Spec
-  include GeneratorSpecHelper
+describe Bosh::Gen::Generators::DeploymentManifestGenerator do
 
-  def self.pending(name, &block); end
-
-  def setup
-    setup_universe
+  xit "creates deployment manifest with properties" do
     setup_project_release("bosh-sample-release")
-  end
-
-  pending "creates deployment manifest with properties" do
     release_folder = File.expand_path("../../fixtures/releases/bosh-sample-release", __FILE__)
     in_home_folder do
       generate_manifest("wordpress", release_folder)
-      
-      File.exist?("wordpress.yml").must_equal(true, "manifest wordpress.yml not created")
-      
+      expect(File.exist?("wordpress.yml")).to eq(true)
+
       manifest = YAML.load_file("wordpress.yml")
       properties = manifest["properties"]
       properties.wont_be_nil "manifest properties must be set"
@@ -30,4 +22,17 @@ class DeploymentManifestGeneratorSpec < MiniTest::Spec
       properties["mysql"]["password"].must_equal 'mysqlpassword'
     end
   end
-end
+
+  it "checks for numerics in filenames/properties" do
+    release_folder = File.expand_path("../../tmp", __FILE__)
+    setup_project_release("s3test-boshrelease")
+    expect(File.exist?(File.join(@active_project_folder, "jobs/s3test/spec"))).to eq true
+
+    dev = YAML.load_file(File.join(@active_project_folder, "config/dev.yml"))
+    expect(dev).not_to be_nil
+    expect(dev["dev_name"]).to eq "s3test"
+
+    deployment = YAML.load_file(File.join(@active_project_folder, "templates/deployment.yml"))
+    expect(deployment["compilation"]["network"]).to eq("s3test1")
+  end
+end

data/spec/generators/{jobs/webapp_job_generator_spec.rb → job_generator_spec.rb}

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "generators/generator_spec_helper"
+require "bosh/gen/generators/job_generator"
 
 # in a tmp folder:
 # * run generator
@@ -8,21 +8,16 @@ require "generators/generator_spec_helper"
 # * it shouldn't fail
 
 # generates job for a webapp application package
-class WebappGeneratorSpec < MiniTest::Spec
-  include GeneratorSpecHelper
-
-  def self.pending(name, &block); end
-
-  def setup
-    setup_universe
+describe Bosh::Gen::Generators::JobGenerator do
+  before do
     setup_project_release("bosh-sample-release")
   end
 
   it "creates common job files" do
     in_project_folder do
       generate_job("mywebapp")
-      File.exist?("jobs/mywebapp/monit").must_equal(true, "jobs/mywebapp/monit not created")
-      File.exist?("jobs/mywebapp/spec").must_equal(true, "jobs/mywebapp/spec not created")
+      expect(File.exist?("jobs/mywebapp/monit")).to eq(true)
+      expect(File.exist?("jobs/mywebapp/spec")).to eq(true)
       job_template_exists "mywebapp", "bin/mywebapp_ctl",       "bin/mywebapp_ctl"
       job_template_exists "mywebapp", "bin/monit_debugger",     "bin/monit_debugger"
       job_template_exists "mywebapp", "data/properties.sh.erb", "data/properties.sh"
@@ -34,10 +29,10 @@ class WebappGeneratorSpec < MiniTest::Spec
   pending "creates job files with rails & nginx templates" do
     in_project_folder do
       generate_job("mywebapp", "--purpose", "nginx_rack", '-d', 'nginx', 'ruby', 'myapp')
-      File.exist?("jobs/mywebapp/monit").must_equal(true, "jobs/mywebapp/monit not created")
-      File.exist?("jobs/mywebapp/spec").must_equal(true, "jobs/mywebapp/spec not created")
+      expect(File.exist?("jobs/mywebapp/monit")).to eq(true)
+      expect(File.exist?("jobs/mywebapp/spec")).to eq(true)
 
-      job_spec("mywebapp")["packages"].must_equal(%w[nginx ruby myapp], "spec dependencies incorrect")
+      expect(job_spec("mywebapp")["packages"]).to eq(%w[nginx ruby myapp])
 
       job_template_exists "mywebapp", "bin/mywebapp_ctl",       "bin/mywebapp_ctl"
       job_template_exists "mywebapp", "bin/monit_debugger",     "bin/monit_debugger"

data/spec/generators/new_release_generator_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+require "bosh/gen/generators/new_release_generator"
+
+describe Bosh::Gen::Generators::NewReleaseGenerator do
+  include Bosh::Gen::Settings
+
+  it "generates with s3 blobstore" do
+    in_home_folder do
+      self.settings_dir = "redis-boshrelease/config"
+      setting "provider.name", "aws"
+      setting "provider.region", "us-west-2"
+      setting "provider.credentials.aws_access_key_id", "ACCESS"
+      setting "provider.credentials.aws_secret_access_key", "SECRET"
+
+      generate_new_release 'redis'
+      expect(File.directory?("jobs")).to eq(true)
+
+      config = YAML.load_file("config/final.yml")
+      expect(config).to_not be_nil
+      expect(config["blobstore"]).to_not be_nil
+      expect(config["blobstore"]["options"]).to_not be_nil
+      expect(config["blobstore"]["provider"]).to eq("s3")
+      expect(config["blobstore"]["options"].keys).to eq(["bucket_name"])
+      expect(config["blobstore"]["options"]["bucket_name"]).to eq("redis-boshrelease")
+
+      config = YAML.load_file("config/private.yml")
+      expect(config).to_not be_nil
+      expect(config["blobstore"]).to_not be_nil
+      expect(config["blobstore"]["s3"]).to_not be_nil
+      expect(config["blobstore"]["s3"]["access_key_id"]).to eq("ACCESS")
+      expect(config["blobstore"]["s3"]["secret_access_key"]).to eq("SECRET")
+    end
+  end
+
+  # TODO: Fog::Errors::MockNotImplemented: Contributions welcome!
+  xit "generates with swift blobstore" do
+    in_home_folder do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+
+      # TODO: get rid of this prompt from Cyoi::Provider
+      setting "provider.options.boot_from_volume", false
+
+      generate_new_release 'redis'
+      expect(File.directory?("jobs")).to eq(true)
+
+      config = YAML.load_file("config/final.yml")
+      expect(config).to_not be_nil
+      expect(config["blobstore"]).to_not be_nil
+      expect(config["blobstore"]["options"]).to_not be_nil
+      expect(config["blobstore"]["provider"]).to eq("swift")
+      expect(config["blobstore"]["options"].keys).to eq(["container_name", "swift_provider"])
+      expect(config["blobstore"]["options"]["container_name"]).to eq("redis-boshrelease")
+
+      config = YAML.load_file("config/private.yml")
+      expect(config).to_not be_nil
+      expect(config["blobstore"]).to_not be_nil
+      expect(config["blobstore"]["swift"]["openstack"]).to_not be_nil
+      expect(config["blobstore"]["swift"]["openstack"]["openstack_auth_url"]).to eq("http://10.0.0.2:5000/v2.0/tokens")
+      expect(config["blobstore"]["swift"]["openstack"].keys).to eq(["openstack_auth_url", "openstack_username", "openstack_api_key", "openstack_tenant", "openstack_region"])
+    end
+  end
+
+  # generate_new_release 'redis'
+  # generate_new_release 'redis-boshrelease'
+end

data/spec/models/bosh_config_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 require "bosh/gen/models"
 
-class BoshConfigSpec < MiniTest::Spec
+describe Bosh::Gen::Models::BoshConfig do
   it "knows UUID of current target bosh" do
     fake_config = File.expand_path( \
       "../../fixtures/bosh_config/multiple_boshes.yml", __FILE__)
     config = Bosh::Gen::Models::BoshConfig.new(fake_config)
-    config.target_uuid.must_equal "f734ed1f-6892-4d96-9123-018c830a8543"
+    expect(config.target_uuid).to eq "f734ed1f-6892-4d96-9123-018c830a8543"
   end
-end
+end

data/spec/models/deployment_manifest_spec.rb

@@ -1,29 +1,39 @@
 require "spec_helper"
 require "bosh/gen/models"
 
-class DeploymentManifestSpec < MiniTest::Spec
+describe Bosh::Gen::Models::DeploymentManifest do
   it "creates manifest document with 2 jobs, no disk" do
-    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", 
+    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID",
       {"name" => "myrelease", "version" => 2},
       {"instance_type" => "m1.small", "static_ips" => ['1.2.3.4', '6.7.8.9']}, {})
     manifest.jobs = [
       { "name" => "job-with-ips"},
       { "name" => "misc"}
     ]
-    manifest.to_yaml.must_equal fixture_manifest("2_jobs_2_ips_no_disk")
+    expect(manifest.to_yaml).to eq fixture_manifest("2_jobs_2_ips_no_disk")
   end
 
   it "creates manifest document with 2 jobs, with disk" do
-    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", 
+    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID",
       {"name" => "myrelease", "version" => 2},
       {"instance_type" => "m1.small", "persistent_disk" => "8196",  "static_ips" => ['1.2.3.4']}, {})
     manifest.jobs = [
       { "name" => "job-with-ips"},
       { "name" => "misc"}
     ]
-    manifest.to_yaml.must_equal fixture_manifest("2_jobs_1_ip_8196_disk")
+    expect(manifest.to_yaml).to eq fixture_manifest("2_jobs_1_ip_8196_disk")
   end
-  
+  it "creates manifest document with 2 jobs, with disk, numeric in manifest name" do
+    manifest = Bosh::Gen::Models::DeploymentManifest.new("s3test", "UUID",
+      {"name" => "myrelease", "version" => 2},
+      {"instance_type" => "m1.small", "persistent_disk" => "8196",  "static_ips" => ['4.3.2.1']}, {})
+    manifest.jobs = [
+      { "name" => "job-with-ips"},
+      { "name" => "misc"}
+    ]
+    expect(manifest.to_yaml).to eq fixture_manifest("2_jobs_1_ip_8196_disk_with_numeric")
+  end
+
   def fixture_manifest(name)
     File.read(File.expand_path("../../fixtures/deployment_manifests/#{name}.yml", __FILE__))
   end

data/spec/models/release_detection_spec.rb

@@ -1,23 +1,23 @@
 require "spec_helper"
 require "bosh/gen/models"
 
-class ReleaseDetectionSpec < MiniTest::Spec
+describe Bosh::Gen::Models::ReleaseDetection do
   it "detects latest dev release version" do
     detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
     latest_dev_release_version = detector.latest_dev_release_version
-    latest_dev_release_version.must_equal 10
+    expect(latest_dev_release_version).to eq 10
   end
-  
+
   it "creates release properties for deployment manifest" do
     detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
-    detector.latest_dev_release_properties.must_equal({
+    expect(detector.latest_dev_release_properties).to eq({
       "name" => "myrelease",
       "version" => 10
     })
   end
-  
+
   it "returns list of jobs" do
     detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
-    detector.latest_dev_release_job_names.must_equal %w[redis]
+    expect(detector.latest_dev_release_job_names).to eq %w[redis]
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,30 @@
-require "minitest/spec"
-require "minitest-colorize"
+# Copyright (c) 2012-2014 Stark & Wayne, LLC
 
-module FixtureHelpers
-  def fixture_release_path(name)
-    File.expand_path("../fixtures/releases/#{name}/", __FILE__)
-  end
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+
+require "rubygems"
+require "bundler"
+Bundler.setup(:default, :test)
+
+$:.unshift(File.expand_path("../../lib", __FILE__))
+
+require "rspec/core"
+
+require "bosh/gen/settings"
+
+# load all files in spec/support/* (but not lower down)
+Dir[File.dirname(__FILE__) + '/support/*'].each do |path|
+  require path unless File.directory?(path)
+end
+
+def fixture_release_path(name)
+  File.expand_path("../fixtures/releases/#{name}/", __FILE__)
 end
 
-MiniTest::Spec.send(:include, FixtureHelpers)
+RSpec.configure do |c|
+  c.before do
+    extend GeneratorSpecHelper
+    setup_universe
+  end
+  c.color = true
+end

data/spec/support/fog.rb

@@ -0,0 +1,3 @@
+require "fog"
+
+Fog.mock!

data/spec/{generators → support}/generator_spec_helper.rb

@@ -9,7 +9,10 @@ module GeneratorSpecHelper
     FileUtils.rm_rf   @tmp_root
     FileUtils.mkdir_p @home_path
     ENV['HOME'] = @home_path
-    FileUtils.cp_r(@@local_developer_bosh_config, @home_path)
+    if File.exists?(@@local_developer_bosh_config)
+      FileUtils.cp_r(@@local_developer_bosh_config, @home_path)
+    end
+    setup_git
   end
 
   def setup_project_release(name)
@@ -18,6 +21,25 @@ module GeneratorSpecHelper
     @active_project_folder = File.join(@tmp_root, name)
   end
 
+  def setup_git
+    in_home_folder do
+      git config: "--global user.name 'Dr Nic Williams'"
+      git config: "--global user.email 'drnic@starkandwayne.com'"
+    end
+  end
+
+  # generate_new_release 'redis'
+  # generate_new_release 'redis-boshrelease'
+  # generate_new_release 'redis', '--s3'
+  # generate_new_release 'redis', '--swift'
+  def generate_new_release(*args)
+    stdout, stderr = capture_stdios do
+      Bosh::Gen::Command.start(["new", *args])
+    end
+    @stdout = File.expand_path(File.join(@tmp_root, "generate_release.out"))
+    File.open(@stdout, "w") {|f| f << stdout; f << stderr}
+  end
+
   # Runs 'bosh-gen job NAME ...'
   #
   # generate_job 'JOBNAME'
@@ -49,9 +71,9 @@ module GeneratorSpecHelper
       options = args.pop
     end
     path = File.join(["jobs"] + args) # jobs/JOBNAME/monit
-    File.exist?(path).must_equal(true, "#{path} not created")
+    expect(File.exist?(path)).to eq(true)
     if options && options[:executable]
-      File.executable?(path).must_equal(true, "#{path} not executable")
+      expect(File.executable?(path)).to eq(true)
     end
   end
 
@@ -62,10 +84,10 @@ module GeneratorSpecHelper
   #   mywebapp_ctl.erb: bin/mywebapp_ctl
   def job_template_exists(job, template_name, spec_path)
     path = File.join("jobs", job, "templates", template_name)
-    File.exist?(path).must_equal(true, "#{path} not created")
+    expect(File.exist?(path)).to eq(true)
     spec_templates = job_spec(job)["templates"]
-    spec_templates[template_name].wont_be_nil("spec.templates missing #{template_name}")
-    spec_templates[template_name].must_equal(spec_path, "spec.templates must be #{template_name} -> #{spec_path}")
+    expect(spec_templates[template_name]).to_not be_nil
+    expect(spec_templates[template_name]).to eq(spec_path)
   end
 
   def job_spec(job)
@@ -111,4 +133,23 @@ module GeneratorSpecHelper
   def strip_color_codes(text)
     text.gsub(/\e\[\d+m/, '')
   end
+
+  # Run a command in git.
+  #
+  # ==== Examples
+  #
+  #   git :init
+  #   git :add => "this.file that.rb"
+  #   git :add => "onefile.rb", :rm => "badfile.cxx"
+  #
+  def git(commands={})
+    if commands.is_a?(Symbol)
+      `git #{commands}`
+    else
+      commands.each do |cmd, options|
+        `git #{cmd} #{options}`
+      end
+    end
+  end
+
 end