bosh_cli 0.19.4 → 0.19.5

data/lib/cli/deployment_helper.rb

@@ -2,6 +2,7 @@
 
 module Bosh::Cli
   module DeploymentHelper
+    include VersionCalc
 
     def prepare_deployment_manifest(options = {})
       # TODO: extract to helper class
@@ -32,7 +33,7 @@ module Bosh::Cli
           properties = director.list_properties(manifest["name"])
         rescue Bosh::Cli::DirectorError
           say("Unable to get properties list from director, " +
-                  "trying without it...")
+              "trying without it...")
         end
 
         say("Compiling deployment manifest...")
@@ -41,33 +42,38 @@ module Bosh::Cli
           hash
         end
 
-        manifest_yaml = compiler.result
-        manifest = YAML.load(manifest_yaml)
+        manifest = YAML.load(compiler.result)
       end
 
       if manifest["name"].blank? || manifest["director_uuid"].blank?
         err("Invalid manifest `#{File.basename(deployment)}': " +
-              "name and director UUID are required")
+            "name and director UUID are required")
+      end
+
+      if director.uuid != manifest["director_uuid"]
+        err("Target director UUID doesn't match UUID from deployment manifest")
       end
 
       if manifest["release"].blank? && manifest["releases"].blank?
         err("Deployment manifest doesn't have release information: '" +
-              "please add 'release' or 'releases' section")
+            "please add 'release' or 'releases' section")
       end
 
-      options[:yaml] ? manifest_yaml : manifest
+      resolve_release_aliases(manifest)
+
+      options[:yaml] ? YAML.dump(manifest) : manifest
     end
 
     # Check if the 2 deployments are different.
     # Print out a summary if "show" is true.
-    def deployment_changed?(current_manifest, manifest, show=true)
+    def deployment_changed?(current_manifest, manifest, show = true)
       diff = Bosh::Cli::HashChangeset.new
       diff.add_hash(normalize_deployment_manifest(manifest), :new)
       diff.add_hash(normalize_deployment_manifest(current_manifest), :old)
       changed = diff.changed?
 
       if changed && show
-        @_diff_key_visited = { }
+        @_diff_key_visited = {}
         diff.keys.each do |key|
           unless @_diff_key_visited[key]
             print_summary(diff, key)
@@ -186,7 +192,7 @@ module Bosh::Cli
       end
 
       diff.changed?
-    rescue Bosh::Cli::DeploymentNotFound
+    rescue Bosh::Cli::ResourceNotFound
       say("Cannot get current deployment information from director, " +
           "possibly a new deployment".red)
       true
@@ -299,5 +305,51 @@ module Bosh::Cli
       end
     end
 
+    # @param [Hash] manifest Deployment manifest (will be modified)
+    # @return [void]
+    def resolve_release_aliases(manifest)
+      if manifest["release"]
+        if manifest["releases"]
+          err("Manifest has both `release' and `releases', please fix it")
+        end
+        releases = [manifest["release"]]
+      else
+        releases = manifest["releases"]
+      end
+
+      unless releases.is_a?(Array)
+        err("Invalid release spec in the deployment manifest")
+      end
+
+      releases.each do |release|
+        if release["version"] == "latest"
+          latest_version = latest_releases[release["name"]]
+          if latest_version.nil?
+            err("Latest version for release `#{release["name"]}' is unknown")
+          end
+          # Avoiding Fixnum -> String noise in diff
+          if latest_version.to_s == latest_version.to_i.to_s
+            latest_version = latest_version.to_i
+          end
+          release["version"] = latest_version
+        end
+      end
+    end
+
+    def latest_releases
+      @_latest_releases ||= begin
+        director.list_releases.inject({}) do |hash, release|
+          unless release["name"].is_a?(String) &&
+            release["versions"].is_a?(Array)
+            err("Invalid director release list format")
+          end
+          hash[release["name"]] = release["versions"].sort { |v1, v2|
+            version_cmp(v2, v1)
+          }.first
+          hash
+        end
+      end
+    end
+
   end
 end

data/lib/cli/director.rb

@@ -5,7 +5,7 @@ module Bosh
     class Director
       include Bosh::Cli::VersionCalc
 
-      DIRECTOR_HTTP_ERROR_CODES = [400, 403, 500]
+      DIRECTOR_HTTP_ERROR_CODES = [400, 403, 404, 500]
 
       API_TIMEOUT = 86400 * 3
       CONNECT_TIMEOUT = 30
@@ -108,17 +108,11 @@ module Bosh
 
       def get_deployment(name)
         status, body = get_json_with_status("/deployments/#{name}")
-        if status == 404
-          raise DeploymentNotFound, "Deployment `#{name}' not found"
-        end
         body
       end
 
       def list_vms(name)
         status, body = get_json_with_status("/deployments/#{name}/vms")
-        if status == 404
-          raise DeploymentNotFound, "Deployment `#{name}' not found"
-        end
         body
       end
 
@@ -488,7 +482,11 @@ module Bosh
         end
 
         if DIRECTOR_HTTP_ERROR_CODES.include?(response.code)
-          raise DirectorError, parse_error_message(response.code, body)
+          if response.code == 404
+            raise ResourceNotFound, parse_error_message(response.code, body)
+          else
+            raise DirectorError, parse_error_message(response.code, body)
+          end
         end
 
         headers = response.headers.inject({}) do |hash, (k, v)|

data/lib/cli/errors.rb

@@ -27,7 +27,7 @@ module Bosh::Cli
   class AuthError            < DirectorError; error_code(202); end
   class MissingTask          < DirectorError; error_code(203); end
   class TaskTrackError       < DirectorError; error_code(204); end
-  class DeploymentNotFound   < DirectorError; error_code(205); end
+  class ResourceNotFound     < DirectorError; error_code(205); end
 
   class CliExit              < CliError; error_code(400); end
   class GracefulExit         < CliExit;  error_code(401); end

data/lib/cli/package_builder.rb

@@ -216,28 +216,46 @@ module Bosh::Cli
 
     # @return Array<GlobMatch>
     def resolve_globs
-      matches = Set.new
+      all_matches = Set.new
 
       @globs.each do |glob|
+        # Glob like core/dea/**/* might not yield anything in alt source even
+        # when `src_alt/core' exists. That's error prone, so we don't lookup
+        # in `src' if `src_alt' contains any part of the glob hierarchy.
+        top_dir = glob.split(File::SEPARATOR)[0]
+        alt_only = top_dir && File.exists?(File.join(@alt_sources_dir, top_dir))
+
+        matches = Set.new
         # Alternative source dir completely shadows the source dir, there can be
         # no partial match of a particular glob in both.
-        found = false
+        if File.directory?(@alt_sources_dir)
+          alt_matches = Dir.chdir(@alt_sources_dir) do
+            resolve_glob_in_cwd(glob)
+          end
+        else
+          alt_matches = []
+        end
 
-        [@alt_sources_dir, @sources_dir].each do |dir|
-          next unless File.directory?(dir)
+        if alt_matches.size > 0
+          matches += alt_matches.map do |path|
+            GlobMatch.new(@alt_sources_dir, path)
+          end
+        end
 
-          Dir.chdir(dir) do
-            dir_matches = resolve_glob_in_cwd(glob)
+        normal_matches = Dir.chdir(@sources_dir) do
+          resolve_glob_in_cwd(glob)
+        end
 
-            unless dir_matches.empty?
-              matches += dir_matches.map do |path|
-                GlobMatch.new(dir, path)
-              end
-              found = true
-            end
-          end
+        if alt_only && alt_matches.empty? && !normal_matches.empty?
+          raise InvalidPackage, "Package `#{name}' has a glob that " +
+            "doesn't match in `#{File.basename(@alt_sources_dir)}' " +
+            "but matches in `#{File.basename(@sources_dir)}'. " +
+            "However `#{File.basename(@alt_sources_dir)}/#{top_dir}' " +
+            "exists, so this might be an error."
+        end
 
-          break if found
+        matches += normal_matches.map do |path|
+          GlobMatch.new(@sources_dir, path)
         end
 
         # Blobs directory is a little bit different: whatever matches a blob
@@ -251,19 +269,19 @@ module Bosh::Cli
               blob_matches.each do |path|
                 matches << GlobMatch.new(@blobs_dir, path)
               end
-
-              found = true
             end
           end
         end
 
-        unless found
-          raise InvalidPackage, "`#{name}' has a glob that " +
+        if matches.empty?
+          raise InvalidPackage, "Package `#{name}' has a glob that " +
             "resolves to an empty file list: #{glob}"
         end
+
+        all_matches += matches
       end
 
-      matches.sort
+      all_matches.sort
     end
 
     def resolve_glob_in_cwd(glob)

data/lib/cli/runner.rb

@@ -192,6 +192,12 @@ module Bosh::Cli
         route :misc, :set_alias
       end
 
+      command :list_aliases do
+        usage "aliases"
+        desc  "Show the list of available command aliases"
+        route :misc, :list_aliases
+      end
+
       command :target do
         usage "target [<name>] [<alias>]"
         desc  "Choose director to talk to (optionally creating an alias). " +
@@ -201,6 +207,12 @@ module Bosh::Cli
         end
       end
 
+      command :list_targets do
+        usage "targets"
+        desc  "Show the list of available targets"
+        route :misc, :list_targets
+      end
+
       command :deployment do
         usage "deployment [<name>]"
         desc  "Choose deployment to work with " +
@@ -546,7 +558,7 @@ module Bosh::Cli
       end
 
       command :cloudcheck do
-        usage  "cloudcheck"
+        usage  "cloudcheck [<deployment>]"
         desc   "Cloud consistency check and interactive repair"
         option "--auto", "resolve problems automatically " +
             "(not recommended for production)"
@@ -615,7 +627,11 @@ module Bosh::Cli
           @options[:colorize] = false
         end
         opts.on("-d", "--debug") { @options[:debug] = true }
-        opts.on("-v", "--version") { dispatch(find_command(:version)); }
+        opts.on("--target URL") { |target| @options[:target] = target }
+        opts.on("--user USER") { |user| @options[:username] = user }
+        opts.on("--password PASSWORD") { |pass| @options[:password] = pass }
+        opts.on("--deployment FILE") { |file| @options[:deployment] = file }
+        opts.on("-v", "--version") { dispatch(find_command(:version)) }
       end
 
       @args = opts_parser.order!(@args)

data/lib/cli/templates/help_message.erb

@@ -61,8 +61,11 @@ Misc
 <%= command_usage(:status) %>
 <%= command_usage(:list_vms) %>
 <%= command_usage(:target) %>
+<%= command_usage(:list_targets) %>
 <%= command_usage(:login) %>
 <%= command_usage(:logout) %>
+<%= command_usage(:alias) %>
+<%= command_usage(:list_aliases) %>
 <%= command_usage(:purge) %>
 
 Remote access

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19.4"
+    VERSION = "0.19.5"
   end
 end

data/spec/assets/biff/ip_out_of_range.yml

@@ -0,0 +1,63 @@
+---
+name: ben-cloud
+director_uuid: a8f335a4-30f0-4a92-ab88-5c3feb55577a
+
+networks:
+
+- name: default
+  subnets:
+  - reserved:
+    - 172.31.4.2 - 172.31.4.9
+    - 172.31.7.245 - 172.31.7.254
+    static:
+    - 172.31.4.10 - 172.31.4.11
+    range: 172.31.4.0/32
+    gateway: 172.31.4.1
+    dns:
+    - 172.30.22.153
+    - 172.30.22.154
+    cloud_properties:
+      name: VLAN2004
+- name: lb
+  subnets:
+  - static:
+    - 172.28.6.241 - 172.28.6.242
+    range: 172.28.6.240/28
+    dns:
+    - 172.30.22.153
+    - 172.30.22.154
+    cloud_properties:
+      name: VLAN3121
+
+jobs:
+
+- name: debian_nfs_server
+  template: debian_nfs_server
+  instances: 1
+  resource_pool: infrastructure
+  persistent_disk: 8192
+  networks:
+  - name: default
+    static_ips:
+    - 172.31.4.10
+
+- name: syslog_aggregator
+  template: syslog_aggregator
+  instances: 1
+  resource_pool: infrastructure
+  persistent_disk: 600
+  networks:
+  - name: default
+    static_ips:
+    - 172.31.4.13
+
+properties:
+  domain: appcloud23.dev.mozycloud.com
+
+  nfs_server:
+    address: 172.31.4.10
+    network: 172.31.4.0/22
+
+  syslog_aggregator:
+    address: 172.31.4.13
+    port: 54321

data/spec/unit/base_command_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 describe Bosh::Cli::Command::Base do
 
   before :each do
-    @config    = File.join(Dir.mktmpdir, "bosh_config")
+    @config = File.join(Dir.mktmpdir, "bosh_config")
     @cache_dir = Dir.mktmpdir
   end
 
@@ -15,9 +15,9 @@ describe Bosh::Cli::Command::Base do
     end
   end
 
-  def make_command(options = { })
-    Bosh::Cli::Command::Base.new({ :config => @config,
-                                   :cache_dir => @cache_dir }.merge(options))
+  def make_command(options = {})
+    Bosh::Cli::Command::Base.new({:config => @config,
+                                  :cache_dir => @cache_dir}.merge(options))
   end
 
   it "can access configuration and respects options" do
@@ -32,10 +32,36 @@ describe Bosh::Cli::Command::Base do
     cmd.password.should == nil
   end
 
+  it "looks up target, deployment and credentials in a right order" do
+    cmd = make_command
+    cmd.username.should be_nil
+    cmd.password.should be_nil
+    old_user = ENV["BOSH_USER"]
+    old_password = ENV["BOSH_PASSWORD"]
+
+    begin
+      ENV["BOSH_USER"] = "foo"
+      ENV["BOSH_PASSWORD"] = "bar"
+      cmd.username.should == "foo"
+      cmd.password.should == "bar"
+      other_cmd = make_command(:username => "new", :password => "baz")
+      other_cmd.username.should == "new"
+      other_cmd.password.should == "baz"
+    ensure
+      ENV["BOSH_USER"] = old_user
+      ENV["BOSH_PASSWORD"] = old_password
+    end
+
+    add_config("target" => "localhost:8080", "deployment" => "test")
+    cmd2 = make_command(:target => "foo", :deployment => "bar")
+    cmd2.target.should == "foo"
+    cmd2.deployment.should == "bar"
+  end
+
   it "instantiates director when needed" do
     add_config("target" => "localhost:8080", "deployment" => "test")
 
-    cmd = make_command()
+    cmd = make_command
     cmd.director.director_uri.should == "localhost:8080"
   end
 
@@ -51,7 +77,7 @@ describe Bosh::Cli::Command::Base do
 
   it "can redirect to other commands " +
      "(effectively exiting after running them)" do
-    cmd     = make_command
+    cmd = make_command
     new_cmd = mock(Object)
 
     Bosh::Cli::Command::Misc.should_receive(:new).and_return(new_cmd)