bosh_cli 0.19.6 → 1.0.rc1

data/spec/unit/core_ext_spec.rb

@@ -67,7 +67,7 @@ describe Object do
   it "raises a special exception to signal a premature exit" do
     lambda {
       err("Done")
-    }.should raise_error(Bosh::Cli::CliExit, "Done")
+    }.should raise_error(Bosh::Cli::CliError, "Done")
   end
 
   it "can tell if object is blank" do

data/spec/unit/deployment_manifest_spec.rb

@@ -114,4 +114,40 @@ describe Bosh::Cli::DeploymentHelper do
     }.to raise_error(/manifest has both `release' and `releases'/i)
   end
 
+  it "resolves 'latest' release alias for multiple stemcells" do
+    cmd = make_cmd
+    manifest = {
+      "name" => "mycloud",
+      "director_uuid" => "deadbeef",
+      "release" => {"name" => "appcloud", "version" => 42},
+      "resource_pools" => [
+        {"stemcell" => {"name" => "foo", "version" => "latest"}},
+        {"stemcell" => {"name" => "foo", "version" => 22}},
+        {"stemcell" => {"name" => "bar", "version" => "latest"}},
+      ]
+    }
+
+    manifest_file = Tempfile.new("manifest")
+    YAML.dump(manifest, manifest_file)
+    manifest_file.close
+    director = mock(Bosh::Cli::Director, :uuid => "deadbeef")
+
+    cmd.stub!(:deployment).and_return(manifest_file.path)
+    cmd.stub!(:director).and_return(director)
+
+    stemcells = [
+      {"name" => "foo", "version" => "22.6.4"},
+      {"name" => "foo", "version" => "22"},
+      {"name" => "bar", "version" => "4.0.8"},
+      {"name" => "bar", "version" => "4.1"}
+    ]
+
+    director.should_receive(:list_stemcells).and_return(stemcells)
+
+    manifest = cmd.prepare_deployment_manifest
+    manifest["resource_pools"][0]["stemcell"]["version"].should == "22.6.4"
+    manifest["resource_pools"][1]["stemcell"]["version"].should == 22
+    manifest["resource_pools"][2]["stemcell"]["version"].should == 4.1
+  end
+
 end

data/spec/unit/director_spec.rb

@@ -99,21 +99,27 @@ describe Bosh::Cli::Director do
         with("/info", "application/json").
         and_return([200, JSON.generate({ :version => "0.3.5"})])
       @director.should_receive(:get).
-        with("/tasks?state=processing,cancelling,queued", "application/json").
+        with("/tasks?state=processing,cancelling,queued&verbose=1",
+             "application/json").
         and_return([200, JSON.generate([]), {}])
       @director.list_running_tasks
     end
 
     it "lists recent tasks" do
       @director.should_receive(:get).
-        with("/tasks?limit=30", "application/json").
+        with("/tasks?limit=30&verbose=1", "application/json").
         and_return([200, JSON.generate([]), {}])
       @director.list_recent_tasks
 
       @director.should_receive(:get).
-        with("/tasks?limit=100", "application/json").
+        with("/tasks?limit=100&verbose=1", "application/json").
         and_return([200, JSON.generate([]), {}])
       @director.list_recent_tasks(100000)
+
+      @director.should_receive(:get).
+          with("/tasks?limit=50&verbose=2", "application/json").
+          and_return([200, JSON.generate([]), {}])
+      @director.list_recent_tasks(50, 2)
     end
 
     it "uploads release" do
@@ -124,6 +130,14 @@ describe Bosh::Cli::Director do
       @director.upload_release("/path")
     end
 
+    it "uploads release (with rebase)" do
+      @director.should_receive(:upload_and_track).
+        with(:post, "/releases?rebase=true", "/path",
+             {:content_type => "application/x-compressed"}).
+        and_return(true)
+      @director.rebase_release("/path")
+    end
+
     it "gets release info" do
       @director.should_receive(:get).
         with("/releases/foo", "application/json").

data/spec/unit/job_builder_spec.rb

@@ -375,7 +375,7 @@ describe Bosh::Cli::JobBuilder do
                                 [], true, true, blobstore)
     lambda {
       final_builder.build
-    }.should raise_error(Bosh::Cli::CliExit)
+    }.should raise_error(Bosh::Cli::CliError)
 
     dev_builder = new_builder("foo", [], ["bar", "baz"],
                               [], true, false, blobstore)
@@ -392,7 +392,7 @@ describe Bosh::Cli::JobBuilder do
 
     lambda {
       final_builder3.build
-    }.should raise_error(Bosh::Cli::CliExit)
+    }.should raise_error(Bosh::Cli::CliError)
   end
 
   it "allows template subdirectories" do

data/spec/unit/job_property_collection_spec.rb

@@ -0,0 +1,111 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require "spec_helper"
+
+describe Bosh::Cli::JobPropertyCollection do
+
+  def make_job(properties)
+    mock(Bosh::Cli::JobBuilder, :properties => properties)
+  end
+
+  def make(job_builder, global_properties, job_properties = {}, mappings = {})
+    Bosh::Cli::JobPropertyCollection.new(
+      job_builder, global_properties, job_properties, mappings)
+  end
+
+  it "copies all properties from the manifest if no properties are defined" do
+    manifest_properties = {
+      "cc" => {
+        "token" => "deadbeef",
+        "foo" => %w(bar baz zaz)
+      },
+      "router" => {
+        "token" => "zbb"
+      },
+      "empty" => {}
+    }
+
+    job_properties = {
+      "cc" => {
+        "secret" => "22"
+      },
+      "foo" => "bar"
+    }
+
+    pc = make(make_job({}), manifest_properties, job_properties)
+
+    pc.to_hash.should == {
+      "cc" => {
+        "token" => "deadbeef",
+        "foo" => %w(bar baz zaz),
+        "secret" => "22"
+      },
+      "router" => {
+        "token" =>  "zbb"
+      },
+      "empty" => {},
+      "foo" => "bar"
+    }
+  end
+
+  it "copies only needed properties if job properties are defined" do
+    property_defs = {
+      "cc.foo" => {},
+      "router.token" => {},
+      "router.user" => {"default" => "admin"}
+    }
+
+    manifest_properties = {
+      "cc" => {
+        "token" => "deadbeef",
+        "foo" => %w(bar baz zaz)
+      },
+      "router" => {
+        "token" => "zbb"
+      }
+    }
+
+    job_properties = {
+      "cc" => {"foo" => "bar"}
+    }
+
+    pc = make(make_job(property_defs), manifest_properties, job_properties)
+
+    pc.to_hash.should == {
+      "cc" => {"foo" => "bar"},
+      "router" => {"token" => "zbb", "user" => "admin"}
+    }
+  end
+
+  it "supports property mappings" do
+    property_defs = {
+      "db.user" => {},
+      "db.password" => {},
+      "token" => {}
+    }
+
+    properties = {
+      "ccdb" => {
+        "user" => "admin",
+        "password" => "secret"
+      },
+      "router" => {"token" => "deadbeef"}
+    }
+
+    mappings = {
+      "db" => "ccdb",
+      "token" => "router.token"
+    }
+
+    pc = make(make_job(property_defs), properties, {}, mappings)
+
+    pc.to_hash.should == {
+      "db" => {
+        "user" => "admin",
+        "password" => "secret"
+      },
+      "token" => "deadbeef"
+    }
+  end
+
+end

data/spec/unit/job_property_validator_spec.rb

@@ -0,0 +1,7 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require "spec_helper"
+
+describe Bosh::Cli::JobPropertyValidator do
+
+end

data/spec/unit/job_rename_spec.rb

@@ -29,8 +29,9 @@ describe Bosh::Cli::Command::Base do
       job_rename = Bosh::Cli::Command::JobRename.new
 
       lambda {
-        job_rename.sanity_check_job_rename(new_extra_changes_manifest, "old_job", "new_job")
-      }.should raise_error(Bosh::Cli::CliExit, /cannot have any other changes/)
+        job_rename.sanity_check_job_rename(
+          new_extra_changes_manifest, "old_job", "new_job")
+      }.should raise_error(Bosh::Cli::CliError, /cannot have any other changes/)
     end
 
     it "should raise exception if new manifest removed some properties" do
@@ -42,7 +43,7 @@ describe Bosh::Cli::Command::Base do
 
       lambda {
         job_rename.sanity_check_job_rename(new_manifest_with_some_deletions, "old_job", "new_job")
-      }.should raise_error(Bosh::Cli::CliExit, /cannot have any other changes/)
+      }.should raise_error(Bosh::Cli::CliError, /cannot have any other changes/)
     end
 
     it "should raise exception if deployment is not updated with new job name" do
@@ -50,7 +51,7 @@ describe Bosh::Cli::Command::Base do
 
       lambda {
         job_rename.sanity_check_job_rename(new_missing_new_job, "old_job", "new_job")
-      }.should raise_error(Bosh::Cli::CliExit, /include the new job/)
+      }.should raise_error(Bosh::Cli::CliError, /include the new job/)
     end
 
     it "should raise exception if old job name does not exist in manifest" do
@@ -62,7 +63,7 @@ describe Bosh::Cli::Command::Base do
 
       lambda {
         job_rename.sanity_check_job_rename(new_extra_changes_manifest, "non_existent_job", "new_job")
-      }.should raise_error(Bosh::Cli::CliExit, /non existent job/)
+      }.should raise_error(Bosh::Cli::CliError, /non existent job/)
     end
 
     it "should raise exception if 2 jobs are changed in manifest" do
@@ -74,7 +75,7 @@ describe Bosh::Cli::Command::Base do
 
       lambda {
         job_rename.sanity_check_job_rename(new_extra_job_rename_manifest, "old_job", "new_job")
-      }.should raise_error(Bosh::Cli::CliExit, /Cannot rename more than one job/)
+      }.should raise_error(Bosh::Cli::CliError, /Cannot rename more than one job/)
     end
 
     def old_manifest_yaml

data/spec/unit/package_builder_spec.rb

@@ -410,7 +410,7 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
       { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
     lambda {
       final_builder.build
-    }.should raise_error(Bosh::Cli::CliExit)
+    }.should raise_error(Bosh::Cli::CliError)
 
     builder = make_builder("bar", globs)
     builder.build
@@ -427,7 +427,7 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
       { "name" => "bar", "files" => globs }, @release_dir, true, blobstore)
     lambda {
       final_builder3.build
-    }.should raise_error(Bosh::Cli::CliExit)
+    }.should raise_error(Bosh::Cli::CliError)
   end
 
   it "includes dotfiles in a fingerprint" do

data/spec/unit/release_builder_spec.rb

@@ -80,4 +80,37 @@ describe Bosh::Cli::ReleaseBuilder do
     builder.version.should == "7.1-dev"
   end
 
+  it "has packages and jobs fingerprints in spec" do
+    job = mock(
+      Bosh::Cli::JobBuilder,
+      :name => "job1",
+      :version => "1.1",
+      :new_version? => true,
+      :packages => %w(foo),
+      :fingerprint => "deadbeef",
+      :checksum => "cafebad"
+    )
+
+    package = mock(
+      Bosh::Cli::PackageBuilder,
+      :name => "foo",
+      :version => "42",
+      :new_version? => true,
+      :fingerprint => "deadcafe",
+      :checksum => "baddeed",
+      :dependencies => []
+    )
+
+    builder = Bosh::Cli::ReleaseBuilder.new(@release, [package], [job])
+    builder.should_receive(:copy_jobs)
+    builder.should_receive(:copy_packages)
+
+    builder.build
+
+    manifest = YAML.load_file(builder.manifest_path)
+
+    manifest["jobs"][0]["fingerprint"].should == "deadbeef"
+    manifest["packages"][0]["fingerprint"].should == "deadcafe"
+  end
+
 end

data/spec/unit/release_spec.rb

@@ -77,6 +77,11 @@ describe Bosh::Cli::Release do
       r.blobstore
     end
 
+    it "should detect blobstore secrets for deprecated options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/deprecation"))
+      r.has_blobstore_secret?.should be_true
+    end
+
     it "should merge s3 secrets into options" do
       r = Bosh::Cli::Release.new(spec_asset("config/s3"))
       opts = {
@@ -88,6 +93,11 @@ describe Bosh::Cli::Release do
       r.blobstore
     end
 
+    it "should detect blobstore secrets for s3 options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/s3"))
+      r.has_blobstore_secret?.should be_true
+    end
+
     it "should merge atmos secrets into options" do
       r = Bosh::Cli::Release.new(spec_asset("config/atmos"))
       opts = {
@@ -97,5 +107,49 @@ describe Bosh::Cli::Release do
       Bosh::Blobstore::Client.should_receive(:create).with("atmos", opts)
       r.blobstore
     end
+
+    it "should detect blobstore secrets for atmos options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/atmos"))
+      r.has_blobstore_secret?.should be_true
+    end
+
+    it "should merge swift (HP) secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/swift-hp"))
+      opts = {
+          :container_name => "test",
+          :swift_provider => "hp",
+          :hp => {
+            :hp_account_id => "foo",
+            :hp_secret_key => "bar",
+            :hp_tenant_id => "foo"
+          }
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("swift", opts)
+      r.blobstore
+    end
+
+    it "should detect blobstore secrets for swift (HP) options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/swift-hp"))
+      r.has_blobstore_secret?.should be_true
+    end
+
+    it "should merge swift (Rackspace) secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/swift-rackspace"))
+      opts = {
+          :container_name => "test",
+          :swift_provider => "rackspace",
+          :rackspace => {
+            :rackspace_username => "foo",
+            :rackspace_api_key => "bar"
+          }
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("swift", opts)
+      r.blobstore
+    end
+
+    it "should detect blobstore secrets for swift (Rackspace) options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/swift-rackspace"))
+      r.has_blobstore_secret?.should be_true
+    end
   end
 end

data/spec/unit/release_tarball_spec.rb

@@ -12,15 +12,10 @@ describe Bosh::Cli::ReleaseTarball do
 
     it "verifies repacked release if appropriate option is set" do
       tarball = Bosh::Cli::ReleaseTarball.new(spec_asset("valid_release.tgz"))
-      remote_release = {
-        "packages" => [{ "name" => "mutator", "version" => "2.99.7" }],
-        "jobs" => [{ "name" => "cacher", "version" => "1" },
-                    { "name" => "sweeper", "version" => "1" }]
-      }
       package_matches = ["86bd8b15562cde007f030a303fa64779af5fa4e7"]
-      repacked_tarball_path = tarball.repack(remote_release, package_matches)
+      repacked_tarball_path = tarball.repack(package_matches)
 
-      tarball.skipped.should == 2
+      tarball.skipped.should == 1
 
       repacked_tarball = Bosh::Cli::ReleaseTarball.new(repacked_tarball_path)
       repacked_tarball.valid?.should be_false

data/spec/unit/runner_spec.rb

@@ -3,155 +3,5 @@
 require "spec_helper"
 
 describe Bosh::Cli::Runner do
-
-  before(:all) do
-    @out = StringIO.new
-    Bosh::Cli::Config.output = @out
-  end
-
-  def test_cmd(args, namespace, action, cmd_args = [])
-    runner = Bosh::Cli::Runner.new(args)
-    runner.prepare
-    runner.dispatch
-
-    runner.namespace.should == namespace
-    runner.action.should    == action
-    runner.args.should  == cmd_args
-  end
-
-  it "has a set of default global options" do
-    runner = Bosh::Cli::Runner.new(["do", "some", "stuff"])
-    runner.parse_options!
-    runner.options[:verbose].should  == nil
-    runner.options[:colorize].should == true
-    runner.options[:director_checks].should == true
-    runner.options[:quiet].should == nil
-    runner.options[:non_interactive].should == nil
-  end
-
-  it "allows overriding global options" do
-    runner = Bosh::Cli::Runner.new(["--verbose", "--no-color",
-                                    "--skip-director-checks", "--quiet",
-                                    "--non-interactive", "release",
-                                    "upload", "/path"])
-    runner.parse_options!
-    runner.options[:verbose].should  == true
-    runner.options[:colorize].should == false
-    runner.options[:director_checks].should == false
-    runner.options[:quiet].should == true
-    runner.options[:non_interactive].should == true
-  end
-
-  it "allows specifying target, deployment and credentials via command line" do
-    runner = Bosh::Cli::Runner.new([
-                                     "--target", "foo",
-                                     "--deployment", "bar",
-                                     "--user", "baz",
-                                     "--password", "deadbeef"
-                                   ])
-    runner.parse_options!
-    runner.options[:target].should == "foo"
-    runner.options[:deployment].should == "bar"
-    runner.options[:username].should == "baz"
-    runner.options[:password].should == "deadbeef"
-  end
-
-  it "dispatches commands to appropriate methods (nu school)" do
-    test_cmd(["version"], :misc, :version)
-    test_cmd(["status"], :misc, :status)
-    test_cmd(["alias", "test", "alias"], :misc, :set_alias, ["test", "alias"])
-    test_cmd(["aliases"], :misc, :list_aliases)
-    test_cmd(["target"], :misc, :show_target)
-    test_cmd(["target", "test"], :misc, :set_target, ["test"])
-    test_cmd(["target", "test", "alias"], :misc, :set_target, ["test", "alias"])
-    test_cmd(["targets"], :misc, :list_targets)
-    test_cmd(["deploy"], :deployment, :perform)
-    test_cmd(["deployment"], :deployment, :show_current)
-    test_cmd(["deployment", "test"], :deployment, :set_current, ["test"])
-
-    test_cmd(["delete", "deployment", "foo"], :deployment, :delete, ["foo"])
-    test_cmd(["delete", "stemcell", "a", "1"], :stemcell, :delete, ["a", "1"])
-    test_cmd(["delete", "release", "a"], :release, :delete, ["a"])
-    test_cmd(["delete", "release", "a", "--force"],
-             :release, :delete, ["a", "--force"])
-    test_cmd(["delete", "release", "a", "2.2.1", "--force"],
-             :release, :delete, ["a", "2.2.1", "--force"])
-
-    test_cmd(["create", "user", "admin"], :user, :create, ["admin"])
-    test_cmd(["create", "user", "admin", "12321"],
-             :user, :create, ["admin", "12321"])
-    test_cmd(["create", "release"], :release, :create)
-    test_cmd(["reset", "release"], :release, :reset)
-    test_cmd(["create", "package", "bla"], :package, :create, ["bla"])
-
-    test_cmd(["login", "admin", "12321"], :misc, :login, ["admin", "12321"])
-    test_cmd(["logout"], :misc, :logout)
-    test_cmd(["purge"], :misc, :purge_cache)
-
-    test_cmd(["init", "release"], :release, :init)
-    test_cmd(["init", "release", "/path"], :release, :init, ["/path"])
-
-    test_cmd(["upload", "release", "/path"], :release, :upload, ["/path"])
-    test_cmd(["upload", "release"], :release, :upload)
-    test_cmd(["upload", "stemcell", "/path"], :stemcell, :upload, ["/path"])
-
-    test_cmd(["generate", "package", "foo"], :package, :generate, ["foo"])
-    test_cmd(["generate", "job", "baz"], :job, :generate, ["baz"])
-
-    test_cmd(["verify", "release", "/path"], :release, :verify, ["/path"])
-    test_cmd(["verify", "stemcell", "/path"], :stemcell, :verify, ["/path"])
-
-    test_cmd(["stemcells"], :stemcell, :list)
-    test_cmd(["releases"], :release, :list)
-    test_cmd(["deployments"], :deployment, :list)
-
-    test_cmd(["tasks"], :task, :list_running)
-    test_cmd(["task", "500"], :task, :track, ["500"])
-    test_cmd(["tasks"], :task, :list_running)
-    test_cmd(["tasks", "recent"], :task, :list_recent)
-    test_cmd(["tasks", "recent", "42"], :task, :list_recent, ["42"])
-
-    test_cmd(%w(blobs), :blob_management, :status)
-    test_cmd(%w(add blob foo bar), :blob_management, :add, %w(foo bar))
-    test_cmd(%w(upload blobs), :blob_management, :upload)
-    test_cmd(%w(sync blobs), :blob_management, :sync)
-  end
-
-  it "loads custom plugins" do
-    plugin_path = spec_asset("plugins")
-    $:.unshift(plugin_path)
-
-    begin
-      test_cmd(["banner", "foo"], :echo, :banner, ["foo"])
-      test_cmd(["say", "bar"], :echo, :say_color, ["bar"])
-      test_cmd(["say", "baz", "--color", "red"],
-               :echo, :say_color, ["baz", "--color", "red"])
-
-      test_cmd(["ruby", "version"], :ruby, :ruby_version)
-      test_cmd(["ruby", "config", "arch"], :ruby, :ruby_config, ["arch"])
-    ensure
-      $:.shift.should == plugin_path
-    end
-  end
-
-  describe "command completion" do
-    let(:runner) { r = Bosh::Cli::Runner.new([]); r.prepare; r }
-
-    it "should complete 'cr' to 'create'" do
-      runner.complete("cr").should == %w[create]
-    end
-
-    it "should complete 'create' to 'package, release & user'" do
-      completion = runner.complete("create")
-      completion.should include("package")
-      completion.should include("release")
-      completion.should include("user")
-    end
-
-    it "should complete 'cr' to 'create'" do
-      runner.complete("create u").should == %w[user]
-    end
-
-  end
-
+  pending "needs tests"
 end