bosh_cli 1.3001.0 → 1.3003.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f21a6d034215d86da7746b2ce276bf08be43b72
-  data.tar.gz: 058c7ec3e9f97e5178a3087e6a851a8c8bef4ed8
+  metadata.gz: ce5adb0bf07eb205144b59a5503f2831cd6c4706
+  data.tar.gz: 9d39b975d52d3183e8c636a7c5d72cd4f185c76a
 SHA512:
-  metadata.gz: a870aed8adc35d7fd4e8893f7736a7245130bfc9a7dca6ba5fd65dd6b2bb72af939ccd4a348bc9d0617f90e3c02dac29145c150d5afb9d2a408d712a570e4327
-  data.tar.gz: 8c545256e4df5ddb77fc838fa8cf90432c77e86dbc5d6585d9d0d1d46e74a3c3fa11fba95ae5ef5bd1916a82e302121337f35d2bbad57c3670b147281f085df6
+  metadata.gz: 3cb26f22b9460558b5382088276075387f8b1d09a5595b06caf258a011b1c1bd87d3ded85ccb937d4865e1e0b2db6369e3541bfd483903edf432f225e0dabb70
+  data.tar.gz: 272037c9bfe1d1ca829d7a1af260604f070b773000417d7bbe3a862a8283dc603dc9083ee78dcc463b880c389dd1fa8605a0536d941bf168aea40010eb01d823

data/lib/cli.rb

@@ -56,6 +56,7 @@ require 'cli/glob_match'
 require 'cli/yaml_helper'
 require 'cli/dependency_helper'
 require 'cli/deployment_manifest'
+require 'cli/manifest'
 require 'cli/manifest_warnings'
 require 'cli/deployment_helper'
 require 'cli/validation'

data/lib/cli/base_command.rb

@@ -122,6 +122,14 @@ module Bosh::Cli
       File.join(Dir.home, '.bosh', 'cache')
     end
 
+    def show_current_state(deployment_name=nil)
+      user_desc = auth_info.client_auth? ? 'client' : 'user'
+      msg = "Acting as #{user_desc} '#{credentials.username.to_s.make_green}'"
+      msg += " on deployment '#{deployment_name.make_green}'" if deployment_name
+      msg += " on '#{target_name.make_green}'" if target_name
+      say(msg)
+    end
+
     protected
 
     def auth_info
@@ -187,14 +195,6 @@ module Bosh::Cli
       say("Current deployment is #{deployment.make_green}")
     end
 
-    def show_current_state(deployment_name=nil)
-      user_desc = auth_info.client_auth? ? 'client' : 'user'
-      msg = "Acting as #{user_desc} '#{credentials.username.to_s.make_green}'"
-      msg += " on deployment '#{deployment_name.make_green}'" if deployment_name
-      msg += " on '#{target_name.make_green}'" if target_name
-      say(msg)
-    end
-
     def no_track_unsupported
       if @options.delete(:no_track)
         say('Ignoring `' + '--no-track'.make_yellow + "' option")
@@ -232,8 +232,8 @@ module Bosh::Cli
       end
     end
 
-    def valid_index_for(job, index, options = {})
-      index = '0' if job_unique_in_deployment?(job)
+    def valid_index_for(manifest_hash, job, index, options = {})
+      index = '0' if job_unique_in_deployment?(manifest_hash, job)
       err('You should specify the job index. There is more than one instance of this job type.') if index.nil?
       index = index.to_i if options[:integer_index]
       index

data/lib/cli/client/uaa/client.rb

@@ -39,7 +39,7 @@ module Bosh
           end
 
           def refresh(access_info)
-            with_save { @token_issuer.refresh(access_info) }
+            @token_issuer.refresh(access_info)
           rescue CF::UAA::TargetError
             nil
           end

data/lib/cli/commands/cloudcheck.rb

@@ -13,12 +13,12 @@ module Bosh::Cli::Command
            "don't attempt to resolve problems"
     def perform(deployment_name = nil)
       auth_required
-      show_current_state(deployment_name)
-      
       no_track_unsupported
       @auto_mode = options[:auto]
       @report_mode = options[:report]
 
+      deployment_name ||= prepare_deployment_manifest(show_state: true).name
+
       if non_interactive? && !(@report_mode || @auto_mode)
         err ("Cloudcheck cannot be run in non-interactive mode\n" +
              "Please use `--auto' flag if you want automated resolutions " +
@@ -29,8 +29,8 @@ module Bosh::Cli::Command
         err("Can't use --auto and --report mode together")
       end
 
+
       say("Performing cloud check...")
-      deployment_name ||= prepare_deployment_manifest["name"]
 
       status, task_id = director.perform_cloud_scan(deployment_name)
 

data/lib/cli/commands/deployment.rb

@@ -23,7 +23,7 @@ module Bosh::Cli::Command
       end
 
       unless manifest["target"].blank?
-        err(manifest_target_upgrade_notice)
+        err(Bosh::Cli::Manifest::MANIFEST_TARGET_UPGRADE_NOTICE)
       end
 
       if manifest["director_uuid"].blank?
@@ -86,27 +86,24 @@ module Bosh::Cli::Command
       recreate = !!options[:recreate]
       redact_diff = !!options[:redact_diff]
 
-      manifest = prepare_deployment_manifest(resolve_properties: true)
-      manifest_yaml = Psych.dump(manifest)
+      manifest = prepare_deployment_manifest(resolve_properties: true, show_state: true)
 
       inspect_deployment_changes(
-        Psych.load(manifest_yaml),
+        manifest.hash,
         interactive: interactive?,
         redact_diff: redact_diff
       )
       say('Please review all changes carefully'.make_yellow) if interactive?
 
       header('Deploying')
-      deployment_name = manifest['name']
-      show_current_state(deployment_name)
 
       unless confirmed?('Are you sure you want to deploy?')
         cancel_deployment
       end
 
-      status, task_id = director.deploy(manifest_yaml, :recreate => recreate)
+      status, task_id = director.deploy(manifest.yaml, :recreate => recreate)
 
-      task_report(status, task_id, "Deployed `#{deployment_name.make_green}' to `#{target_name.make_green}'")
+      task_report(status, task_id, "Deployed `#{manifest.name.make_green}' to `#{target_name.make_green}'")
     end
 
     # bosh delete deployment
@@ -142,14 +139,14 @@ module Bosh::Cli::Command
          "deployment manifest as the source of properties"
     def validate_jobs
       check_if_release_dir
-      manifest = prepare_deployment_manifest(:resolve_properties => true)
+      manifest = prepare_deployment_manifest(:resolve_properties => true, show_state: true)
 
-      if manifest["release"]
-        release_name = manifest["release"]["name"]
-      elsif manifest["releases"].count > 1
+      if manifest.hash["release"]
+        release_name = manifest.hash["release"]["name"]
+      elsif manifest.hash["releases"].count > 1
         err("Cannot validate a deployment manifest with more than 1 release")
       else
-        release_name = manifest["releases"].first["name"]
+        release_name = manifest.hash["releases"].first["name"]
       end
       if release_name == release.dev_name || release_name == release.final_name
         nl
@@ -169,7 +166,7 @@ module Bosh::Cli::Command
       )
 
       say(" - validating properties")
-      validator = Bosh::Cli::JobPropertyValidator.new(jobs, manifest)
+      validator = Bosh::Cli::JobPropertyValidator.new(jobs, manifest.hash)
       validator.validate
 
       unless validator.jobs_without_properties.empty?

data/lib/cli/commands/errand.rb

@@ -38,8 +38,7 @@ module Bosh::Cli::Command
 
     private
     def perform_run_errand(errand_name)
-      deployment_name = prepare_deployment_manifest['name']
-      show_current_state(deployment_name)
+      deployment_name = prepare_deployment_manifest(show_state: true).name
 
       errands_client = Bosh::Cli::Client::ErrandsClient.new(director)
       status, task_id, errand_result = errands_client.run_errand(deployment_name, errand_name, options[:keep_alive] || FALSE)

data/lib/cli/commands/job_management.rb

@@ -48,9 +48,11 @@ module Bosh::Cli
       private
 
       def change_job_state(state, job, index = nil)
-        check_arguments(state, job)
-        index = valid_index_for(job, index)
-        vm_state = VmState.new(self, force?)
+        auth_required
+        manifest = parse_manifest(state, job)
+
+        index = valid_index_for(manifest.hash, job, index)
+        vm_state = VmState.new(self, manifest, force?)
         job_state = JobState.new(self, vm_state)
         status, task_id, completion_desc = job_state.change(state, job, index)
         task_report(status, task_id, completion_desc)
@@ -68,10 +70,9 @@ module Bosh::Cli
         options[:force]
       end
 
-      def check_arguments(operation, job)
-        auth_required
-        job_must_exist_in_deployment(job)
-        show_current_state(prepare_deployment_manifest['name'])
+      def parse_manifest(operation, job)
+        manifest = prepare_deployment_manifest(show_state: true)
+        job_must_exist_in_deployment(manifest.hash, job)
 
         if hard? && soft?
           err('Cannot handle both --hard and --soft options, please choose one')
@@ -80,6 +81,8 @@ module Bosh::Cli
         if !hard_and_soft_options_allowed?(operation) && (hard? || soft?)
           err("--hard and --soft options only make sense for `stop' operation")
         end
+
+        manifest
       end
 
       def hard_and_soft_options_allowed?(operation)

data/lib/cli/commands/job_rename.rb

@@ -7,9 +7,7 @@ module Bosh::Cli::Command
     option "--force", "Ignore errors"
     def rename(old_name, new_name)
       auth_required
-      manifest_yaml = prepare_deployment_manifest(:yaml => true)
-      manifest = Psych.load(manifest_yaml)
-      show_current_state(manifest['name'])
+      manifest = prepare_deployment_manifest(show_state: true)
 
       force = options[:force]
       say("You are about to rename `#{old_name.make_green}' to `#{new_name.make_green}'")
@@ -20,18 +18,17 @@ module Bosh::Cli::Command
         exit(0)
       end
 
-      sanity_check_job_rename(manifest_yaml, old_name, new_name)
+      sanity_check_job_rename(manifest, old_name, new_name)
 
       status, task_id = director.rename_job(
-        manifest["name"], manifest_yaml, old_name, new_name, force)
+        manifest.name, manifest.yaml, old_name, new_name, force)
 
       task_report(status, task_id, "Rename successful")
     end
 
-    def sanity_check_job_rename(manifest_yaml, old_name, new_name)
+    def sanity_check_job_rename(manifest, old_name, new_name)
       # Makes sure the new deployment manifest contains the renamed job
-      manifest = Psych.load(manifest_yaml)
-      new_jobs = manifest["jobs"].map { |job| job["name"] }
+      new_jobs = manifest.hash["jobs"].map { |job| job["name"] }
       unless new_jobs.include?(new_name)
         err("Please update your deployment manifest to include the " +
             "new job name `#{new_name}'")
@@ -43,7 +40,7 @@ module Bosh::Cli::Command
       end
 
       # Make sure that the old deployment manifest contains the old job
-      current_deployment = director.get_deployment(manifest["name"])
+      current_deployment = director.get_deployment(manifest.name)
       if current_deployment["manifest"].nil?
         err("Director could not find manifest for deployment " +
             "`#{manifest["name"]}'")
@@ -96,8 +93,7 @@ module Bosh::Cli::Command
       end
 
       # Now the manifests should be the same
-      manifest = Psych.load(manifest_yaml)
-      if deployment_changed?(current_manifest.dup, manifest.dup)
+      if deployment_changed?(current_manifest.dup, manifest.hash.dup)
         err("You cannot have any other changes to your manifest during " +
             "rename. Please revert the above changes and retry.")
       end

data/lib/cli/commands/log_management.rb

@@ -12,17 +12,20 @@ module Bosh::Cli::Command
     option '--all', 'deprecated'
 
     def fetch_logs(job, index = nil)
-      index = valid_index_for(job, index)
+      auth_required
+
+      manifest = prepare_deployment_manifest(show_state: true)
+      index = valid_index_for(manifest.hash, job, index)
       check_arguments(index)
 
       logs_downloader = Bosh::Cli::LogsDownloader.new(director, self)
 
-      resource_id = fetch_log_resource_id(index, job)
+      resource_id = fetch_log_resource_id(manifest.name, index, job)
       logs_path = logs_downloader.build_destination_path(job, index, options[:dir] || Dir.pwd)
       logs_downloader.download(resource_id, logs_path)
     end
 
-    def fetch_log_resource_id(index, job)
+    def fetch_log_resource_id(deployment_name, index, job)
       resource_id = director.fetch_logs(deployment_name, job, index, log_type, filters)
       err('Error retrieving logs') if resource_id.nil?
 
@@ -40,8 +43,6 @@ module Bosh::Cli::Command
     end
 
     def check_arguments(index)
-      auth_required
-      show_current_state(deployment_name)
       no_track_unsupported
 
       err('Job index is expected to be a positive integer') if index !~ /^\d+$/
@@ -73,10 +74,6 @@ module Bosh::Cli::Command
       end
       filter
     end
-
-    def deployment_name
-      @deployment_name ||= prepare_deployment_manifest['name']
-    end
   end
 end
 

data/lib/cli/commands/property_management.rb

@@ -121,9 +121,7 @@ module Bosh::Cli::Command
 
     def prepare
       auth_required
-      manifest = prepare_deployment_manifest
-      @deployment_name = manifest["name"]
-      show_current_state(@deployment_name)
+      @deployment_name = prepare_deployment_manifest(show_state: true).name
     end
 
     def show_header

data/lib/cli/commands/release/export_release.rb

@@ -11,18 +11,16 @@ module Bosh::Cli::Command
 
       def export(release, stemcell)
         auth_required
-        deployment_required
-        show_current_state
+        manifest = prepare_deployment_manifest(show_state: true)
 
-        deployment_name = prepare_deployment_manifest["name"]
         release = Bosh::Cli::NameVersionPair.parse(release)
         stemcell = Bosh::Cli::NameVersionPair.parse(stemcell)
         stemcell_os = stemcell.name
 
         client = Bosh::Cli::Client::ExportReleaseClient.new(director)
-        status, task_id = client.export(deployment_name, release.name, release.version, stemcell_os, stemcell.version)
+        status, task_id = client.export(manifest.name, release.name, release.version, stemcell_os, stemcell.version)
         task_report(status, task_id)
       end
     end
   end
-end
+end

data/lib/cli/commands/snapshot.rb

@@ -7,8 +7,7 @@ module Bosh::Cli::Command
     def list(job = nil, index = nil)
       auth_required
 
-      deployment_name = prepare_deployment_manifest['name']
-      show_current_state(deployment_name)
+      deployment_name = prepare_deployment_manifest(show_state: true).name
 
       snapshots = director.list_snapshots(deployment_name, job, index)
 
@@ -39,8 +38,7 @@ module Bosh::Cli::Command
     def take(job = nil, index = nil)
       auth_required
 
-      deployment_name = prepare_deployment_manifest['name']
-      show_current_state(deployment_name)
+      deployment_name = prepare_deployment_manifest(show_state: true).name
 
       unless job && index
         unless confirmed?("Are you sure you want to take a snapshot of all deployment `#{deployment_name}'?")
@@ -59,8 +57,7 @@ module Bosh::Cli::Command
     def delete(snapshot_cid)
       auth_required
 
-      deployment_name = prepare_deployment_manifest['name']
-      show_current_state(deployment_name)
+      deployment_name = prepare_deployment_manifest(show_state: true).name
 
       unless confirmed?("Are you sure you want to delete snapshot `#{snapshot_cid}'?")
         say('Canceled deleting snapshot'.make_green)
@@ -77,8 +74,7 @@ module Bosh::Cli::Command
     def delete_all
       auth_required
 
-      deployment_name = prepare_deployment_manifest['name']
-      show_current_state(deployment_name)
+      deployment_name = prepare_deployment_manifest(show_state: true).name
 
       unless confirmed?("Are you sure you want to delete all snapshots of deployment `#{deployment_name}'?")
         say('Canceled deleting snapshots'.make_green)

data/lib/cli/commands/ssh.rb

@@ -25,14 +25,16 @@ module Bosh::Cli
           job, index = prompt_for_job_and_index
         end
 
-        job_must_exist_in_deployment(job)
-        index = valid_index_for(job, index, integer_index: true)
+        manifest = prepare_deployment_manifest(show_state: true)
+        job_must_exist_in_deployment(manifest.hash, job)
+
+        index = valid_index_for(manifest.hash, job, index, integer_index: true)
 
         if command.empty?
-          setup_interactive_shell(job, index)
+          setup_interactive_shell(manifest.name, job, index)
         else
           say("Executing `#{command.join(' ')}' on #{job}/#{index}")
-          perform_operation(:exec, job, index, command)
+          perform_operation(:exec, manifest.name, job, index, command)
         end
       end
 
@@ -55,13 +57,14 @@ module Bosh::Cli
           err('Please specify either --upload or --download')
         end
 
-        job_must_exist_in_deployment(job)
+        manifest = prepare_deployment_manifest(show_state: true)
+        job_must_exist_in_deployment(manifest.hash, job)
 
         if args.size != 2
           err('Please enter valid source and destination paths')
         end
         say("Executing file operations on job #{job}")
-        perform_operation(upload ? :upload : :download, job, index, args)
+        perform_operation(upload ? :upload : :download, manifest.name, job, index, args)
       end
 
       usage 'cleanup ssh'
@@ -73,12 +76,11 @@ module Bosh::Cli
           err("SSH cleanup doesn't accept any extra args")
         end
 
-        job_must_exist_in_deployment(job)
-
-        manifest_name = prepare_deployment_manifest['name']
+        manifest = prepare_deployment_manifest(show_state: true)
+        job_must_exist_in_deployment(manifest.hash, job)
 
         say("Cleaning up ssh artifacts from #{job}/#{index}")
-        director.cleanup_ssh(manifest_name, job, "^#{SSH_USER_PREFIX}", [index])
+        director.cleanup_ssh(manifest.name, job, "^#{SSH_USER_PREFIX}", [index])
       end
 
       private
@@ -106,9 +108,8 @@ module Bosh::Cli
       # @param [String] job
       # @param [Integer] index
       # @param [optional,String] password
-      def setup_ssh(job, index, password = nil)
+      def setup_ssh(deployment_name, job, index, password)
         user            = random_ssh_username
-        deployment_name = prepare_deployment_manifest['name']
 
         say("Target deployment is `#{deployment_name}'")
         nl
@@ -166,8 +167,7 @@ module Bosh::Cli
 
       # @param [String] job Job name
       # @param [Integer] index Job index
-      def setup_interactive_shell(job, index)
-        deployment_required
+      def setup_interactive_shell(deployment_name, job, index)
         password = options[:default_password]
 
         if password.nil?
@@ -178,7 +178,7 @@ module Bosh::Cli
           err('Please provide ssh password') if password.blank?
         end
 
-        setup_ssh(job, index, password) do |sessions, user, gateway|
+        setup_ssh(deployment_name, job, index, password) do |sessions, user, gateway|
           session = sessions.first
 
           unless session['status'] == 'success' && session['ip']
@@ -199,8 +199,8 @@ module Bosh::Cli
         end
       end
 
-      def perform_operation(operation, job, index, args)
-        setup_ssh(job, index, nil) do |sessions, user, gateway|
+      def perform_operation(operation, deployment_name, job, index, args)
+        setup_ssh(deployment_name, job, index, nil) do |sessions, user, gateway|
           sessions.each do |session|
             unless session['status'] == 'success' && session['ip']
               err("Failed to set up SSH on #{job}/#{index}: #{session.inspect}")

data/lib/cli/commands/vm.rb

@@ -9,6 +9,7 @@ module Bosh::Cli
       def resurrection_state(job=nil, index=nil, new_state)
         if job.nil? && index.nil?
           resurrection = Resurrection.new(new_state)
+          show_current_state
 
           director.change_vm_resurrection_for_all(resurrection.paused?)
         else
@@ -16,11 +17,11 @@ module Bosh::Cli
           job, index, _ = job_args.to_a
           resurrection = Resurrection.new(new_state)
 
-          job_must_exist_in_deployment(job)
-          index = valid_index_for(job, index, integer_index: true)
+          manifest = prepare_deployment_manifest(show_state: true)
+          job_must_exist_in_deployment(manifest.hash, job)
+          index = valid_index_for(manifest.hash, job, index, integer_index: true)
 
-          manifest           = prepare_deployment_manifest
-          director.change_vm_resurrection(manifest['name'], job, index, resurrection.paused?)
+          director.change_vm_resurrection(manifest.name, job, index, resurrection.paused?)
         end
       end
     end

data/lib/cli/deployment_helper.rb

@@ -2,68 +2,17 @@ module Bosh::Cli
   module DeploymentHelper
     def prepare_deployment_manifest(options = {})
       deployment_required
-      manifest_filename = deployment
-
-      unless File.exists?(manifest_filename)
-        err("Cannot find deployment manifest in `#{manifest_filename}'")
-      end
-
-      header('Processing deployment manifest')
-
-      manifest = load_yaml_file(manifest_filename)
-      manifest_yaml = File.read(manifest_filename)
-
-      if manifest['name'].blank?
-        err('Deployment name not found in the deployment manifest')
-      end
-
-      if manifest['target']
-        err(manifest_target_upgrade_notice)
-      end
-
-      if options[:resolve_properties]
-        compiler = DeploymentManifestCompiler.new(manifest_yaml)
-        properties = {}
-
-        begin
-          say('Getting deployment properties from director...')
-          properties = director.list_properties(manifest['name'])
-        rescue Bosh::Cli::DirectorError
-          say('Unable to get properties list from director, ' +
-                'trying without it...')
-        end
-
-        say('Compiling deployment manifest...')
-        compiler.properties = properties.inject({}) do |hash, property|
-          hash[property['name']] = property['value']
-          hash
-        end
-
-        manifest = Psych.load(compiler.result)
+      manifest = Manifest.new(deployment, director)
+      manifest.load
+      if options.fetch(:show_state, false)
+        show_current_state(manifest.name)
       end
+      manifest.validate(options)
 
-      if manifest['name'].blank? || manifest['director_uuid'].blank?
-        err("Invalid manifest `#{File.basename(deployment)}': " +
-              '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")
-      end
-
-      resolve_release_aliases(manifest)
-      resolve_stemcell_aliases(manifest)
-
-      report_manifest_warnings(manifest)
-
-      options[:yaml] ? Psych.dump(manifest) : 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)
@@ -201,55 +150,17 @@ module Bosh::Cli
       end
     end
 
-    def latest_release_versions
-      @_latest_release_versions ||= begin
-        director.list_releases.inject({}) do |hash, release|
-          name = release['name']
-          versions = release['versions'] || release['release_versions'].map { |release_version| release_version['version'] }
-          parsed_versions = versions.map do |version|
-            {
-              original: version,
-              parsed: Bosh::Common::Version::ReleaseVersion.parse(version)
-            }
-          end
-          latest_version = parsed_versions.sort_by {|v| v[:parsed] }.last[:original]
-          hash[name] = latest_version.to_s
-          hash
-        end
-      end
-    end
-
-    # @param [Hash] manifest Deployment manifest (will be modified)
-    # @return [void]
-    def resolve_release_aliases(manifest)
-      releases = manifest['releases'] || [manifest['release']]
-
-      releases.each do |release|
-        if release['version'] == 'latest'
-          latest_release_version = latest_release_versions[release['name']]
-          unless latest_release_version
-            err("Release '#{release['name']}' not found on director. Unable to resolve 'latest' alias in manifest.")
-          end
-          release['version'] = latest_release_version
-        end
-
-        if release['version'].to_i.to_s == release['version']
-          release['version'] = release['version'].to_i
-        end
-      end
-    end
-
-    def job_unique_in_deployment?(job_name)
-      job = find_job(job_name)
+    def job_unique_in_deployment?(manifest_hash, job_name)
+      job = find_job(manifest_hash, job_name)
       job ? job.fetch('instances') == 1 : false
     end
 
-    def job_exists_in_deployment?(job_name)
-      !!find_job(job_name)
+    def job_exists_in_deployment?(manifest_hash, job_name)
+      !!find_job(manifest_hash, job_name)
     end
 
-    def job_must_exist_in_deployment(job)
-      err("Job `#{job}' doesn't exist") unless job_exists_in_deployment?(job)
+    def job_must_exist_in_deployment(manifest_hash, job)
+      err("Job `#{job}' doesn't exist") unless job_exists_in_deployment?(manifest_hash, job)
     end
 
     def prompt_for_job_and_index
@@ -280,7 +191,7 @@ module Bosh::Cli
     end
 
     def jobs_and_indexes
-      jobs = prepare_deployment_manifest.fetch('jobs')
+      jobs = prepare_deployment_manifest.hash.fetch('jobs')
 
       jobs.inject([]) do |jobs_and_indexes, job|
         job_name = job.fetch('name')
@@ -297,13 +208,13 @@ module Bosh::Cli
 
     private
 
-    def find_job(job_name)
-      jobs = prepare_deployment_manifest.fetch('jobs')
+    def find_job(manifest_hash, job_name)
+      jobs = manifest_hash.fetch('jobs')
       jobs.find { |job| job.fetch('name') == job_name }
     end
 
     def list_errands
-      deployment_name = prepare_deployment_manifest.fetch('name')
+      deployment_name = prepare_deployment_manifest.name
       director.list_errands(deployment_name)
     end
 
@@ -315,15 +226,6 @@ module Bosh::Cli
       end
     end
 
-    def manifest_target_upgrade_notice
-      <<-EOS.gsub(/^\s*/, '').gsub(/\n$/, '')
-        Please upgrade your deployment manifest to use director UUID instead
-        of target. Just replace 'target' key with 'director_uuid' key in your
-        manifest. You can get your director UUID by targeting your director
-        with 'bosh target' and running 'bosh status' command afterwards.
-      EOS
-    end
-
     def print_summary(diff, key, redact, title = nil)
       title ||= key.to_s.gsub(/[-_]/, ' ').capitalize
 
@@ -363,54 +265,5 @@ module Bosh::Cli
         end
       end
     end
-
-    # @param [Hash] manifest Deployment manifest (will be modified)
-    # @return [void]
-    def resolve_stemcell_aliases(manifest)
-      return if manifest['resource_pools'].nil?
-
-      manifest['resource_pools'].each do |rp|
-        stemcell = rp['stemcell']
-        unless stemcell.is_a?(Hash)
-          err('Invalid stemcell spec in the deployment manifest')
-        end
-        if stemcell['version'] == 'latest'
-          latest_version = latest_stemcells[stemcell['name']]
-          if latest_version.nil?
-            err("Latest version for stemcell `#{stemcell['name']}' is unknown")
-          end
-          # Avoiding {Float,Fixnum} -> String noise in diff
-          if latest_version.to_s == latest_version.to_f.to_s
-            latest_version = latest_version.to_f
-          elsif latest_version.to_s == latest_version.to_i.to_s
-            latest_version = latest_version.to_i
-          end
-          stemcell['version'] = latest_version
-        end
-      end
-    end
-
-    # @return [Array]
-    def latest_stemcells
-      @_latest_stemcells ||= begin
-        stemcells = director.list_stemcells.inject({}) do |hash, stemcell|
-          unless stemcell.is_a?(Hash) && stemcell['name'] && stemcell['version']
-            err('Invalid director stemcell list format')
-          end
-          hash[stemcell['name']] ||= []
-          hash[stemcell['name']] << stemcell['version']
-          hash
-        end
-
-        stemcells.inject({}) do |hash, (name, versions)|
-          hash[name] = Bosh::Common::Version::StemcellVersionList.parse(versions).latest.to_s
-          hash
-        end
-      end
-    end
-
-    def report_manifest_warnings(manifest)
-      ManifestWarnings.new(manifest).report
-    end
   end
 end

data/lib/cli/manifest.rb

@@ -0,0 +1,172 @@
+module Bosh::Cli
+  class Manifest
+    attr_reader :hash
+
+    def initialize(deployment_file, director)
+      @deployment_file = deployment_file
+      @director = director
+    end
+
+    def name
+      @hash['name']
+    end
+
+    def load
+      unless File.exists?(@deployment_file)
+        err("Cannot find deployment manifest in `#{@deployment_file}'")
+      end
+
+      @hash = load_yaml_file(@deployment_file)
+    end
+
+    def validate(options={})
+      if @hash['name'].blank?
+        err('Deployment name not found in the deployment manifest')
+      end
+
+      if @hash['target']
+        err(MANIFEST_TARGET_UPGRADE_NOTICE)
+      end
+
+      if options[:resolve_properties]
+        compiler = DeploymentManifestCompiler.new(File.read(@deployment_file))
+        properties = {}
+
+        begin
+          say('Getting deployment properties from director...')
+          properties = @director.list_properties(name)
+        rescue Bosh::Cli::DirectorError
+          say('Unable to get properties list from director, ' +
+              'trying without it...')
+        end
+
+        compiler.properties = properties.inject({}) do |hash, property|
+          hash[property['name']] = property['value']
+          hash
+        end
+
+        @hash = Psych.load(compiler.result)
+      end
+
+      if name.blank? || @hash['director_uuid'].blank?
+        err("Invalid manifest `#{File.basename(@deployment_file)}': " +
+            'name and director UUID are required')
+      end
+
+      if @director.uuid != @hash['director_uuid']
+        err("Target director UUID doesn't match UUID from deployment manifest")
+      end
+
+      if @hash['release'].blank? && @hash['releases'].blank?
+        err("Deployment manifest doesn't have release information: '" +
+            "please add 'release' or 'releases' section")
+      end
+
+      resolve_release_aliases
+      resolve_stemcell_aliases
+
+      report_manifest_warnings
+
+      @hash
+    end
+
+    def yaml
+      @yaml ||= Psych.dump(@hash)
+    end
+
+    # @param [Hash] manifest Deployment manifest (will be modified)
+    # @return [void]
+    def resolve_stemcell_aliases
+      return if @hash['resource_pools'].nil?
+
+      @hash['resource_pools'].each do |rp|
+        stemcell = rp['stemcell']
+        unless stemcell.is_a?(Hash)
+          err('Invalid stemcell spec in the deployment manifest')
+        end
+        if stemcell['version'] == 'latest'
+          latest_version = latest_stemcells[stemcell['name']]
+          if latest_version.nil?
+            err("Latest version for stemcell `#{stemcell['name']}' is unknown")
+          end
+          # Avoiding {Float,Fixnum} -> String noise in diff
+          if latest_version.to_s == latest_version.to_f.to_s
+            latest_version = latest_version.to_f
+          elsif latest_version.to_s == latest_version.to_i.to_s
+            latest_version = latest_version.to_i
+          end
+          stemcell['version'] = latest_version
+        end
+      end
+    end
+
+    # @return [Array]
+    def latest_stemcells
+      @_latest_stemcells ||= begin
+        stemcells = @director.list_stemcells.inject({}) do |hash, stemcell|
+          unless stemcell.is_a?(Hash) && stemcell['name'] && stemcell['version']
+            err('Invalid director stemcell list format')
+          end
+          hash[stemcell['name']] ||= []
+          hash[stemcell['name']] << stemcell['version']
+          hash
+        end
+
+        stemcells.inject({}) do |hash, (name, versions)|
+          hash[name] = Bosh::Common::Version::StemcellVersionList.parse(versions).latest.to_s
+          hash
+        end
+      end
+    end
+
+    # @param [Hash] manifest Deployment manifest (will be modified)
+    # @return [void]
+    def resolve_release_aliases
+      releases = @hash['releases'] || [@hash['release']]
+
+      releases.each do |release|
+        if release['version'] == 'latest'
+          latest_release_version = latest_release_versions[release['name']]
+          unless latest_release_version
+            err("Release '#{release['name']}' not found on director. Unable to resolve 'latest' alias in manifest.")
+          end
+          release['version'] = latest_release_version
+        end
+
+        if release['version'].to_i.to_s == release['version']
+          release['version'] = release['version'].to_i
+        end
+      end
+    end
+
+    def latest_release_versions
+      @_latest_release_versions ||= begin
+        @director.list_releases.inject({}) do |hash, release|
+          name = release['name']
+          versions = release['versions'] || release['release_versions'].map { |release_version| release_version['version'] }
+          parsed_versions = versions.map do |version|
+            {
+              original: version,
+              parsed: Bosh::Common::Version::ReleaseVersion.parse(version)
+            }
+          end
+          latest_version = parsed_versions.sort_by { |v| v[:parsed] }.last[:original]
+          hash[name] = latest_version.to_s
+          hash
+        end
+      end
+    end
+
+    MANIFEST_TARGET_UPGRADE_NOTICE =
+      <<-EOS.gsub(/^\s*/, '').gsub(/\n$/, '')
+        Please upgrade your deployment manifest to use director UUID instead
+        of target. Just replace 'target' key with 'director_uuid' key in your
+        manifest. You can get your director UUID by targeting your director
+        with 'bosh target' and running 'bosh status' command afterwards.
+      EOS
+
+    def report_manifest_warnings
+      ManifestWarnings.new(@hash).report
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3001.0'
+    VERSION = '1.3003.0'
   end
 end

data/lib/cli/vm_state.rb

@@ -1,17 +1,16 @@
 module Bosh::Cli
   class VmState
-    def initialize(command, force)
+    def initialize(command, manifest, force)
       @command = command
+      @manifest = manifest
       @force = force
     end
 
     def change(job, index, new_state, operation_desc)
       command.say("You are about to #{operation_desc.make_green}")
-      manifest = command.prepare_deployment_manifest
-      manifest_yaml = Psych.dump(manifest)
 
       if command.interactive?
-        check_if_manifest_changed(manifest)
+        check_if_manifest_changed(@manifest.hash)
 
         unless command.confirmed?("#{operation_desc.capitalize}?")
           command.cancel_deployment
@@ -20,7 +19,7 @@ module Bosh::Cli
 
       command.nl
       command.say("Performing `#{operation_desc}'...")
-      command.director.change_job_state(manifest['name'], manifest_yaml, job, index, new_state)
+      command.director.change_job_state(@manifest.name, @manifest.yaml, job, index, new_state)
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3001.0
+  version: 1.3003.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3001.0
+        version: 1.3003.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  7cc77f
+  44f0b8
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -395,6 +395,7 @@ files:
 - lib/cli/job_state.rb
 - lib/cli/line_wrap.rb
 - lib/cli/logs_downloader.rb
+- lib/cli/manifest.rb
 - lib/cli/manifest_warnings.rb
 - lib/cli/name_version_pair.rb
 - lib/cli/non_interactive_progress_renderer.rb