bosh_cli 1.3115.0 → 1.3120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd2d53b788b054d99bd8d7708453c81396f7c85
-  data.tar.gz: c3137783a4253dcaa07585072913d86884df6070
+  metadata.gz: a07bebb24e591343dc294c015139dd6819ccb421
+  data.tar.gz: b0deb9dd65fa416dc36019a8b1d2d8a6014b7232
 SHA512:
-  metadata.gz: 508628bc1637eb908b4b6b2c0e0150ab4dfaee34d7a5f8ec27a6960a3802b071901caa77339bba42daaca0cb14615e8e36b7f66b177bc56b5a870c102ae6bc23
-  data.tar.gz: a2585a85ad0c31c0f11554d439dd36e0b81557a7eb7414fed3d54ad6ec33e67b5b45344769712d004e2ee04c4ce8b42d7af16ae414279216f06521c6d394c43f
+  metadata.gz: 40aec8117537c126aa07018ce826d30b17bc5cce82e395368f3df64c2c035aa52cda137094eb457c353c93c5a5f3dea2902d4f8af5e5bc43e956a64b6d71cfcb
+  data.tar.gz: e6dfd1f9188ae86ef0913d278692132572e7fc7f4e8408816065fc7a609166be4a11da322096b2096b895c6b43d337e5726f64795e2a730a6251f38fc84d98eb

data/lib/cli/base_command.rb

@@ -4,7 +4,7 @@ module Bosh::Cli
       extend Bosh::Cli::CommandDiscovery
       include Bosh::Cli::DeploymentHelper
 
-      attr_accessor :options, :out, :args
+      attr_accessor :options, :out, :args, :info
       attr_reader :work_dir, :exit_code, :runner
 
       DEFAULT_DIRECTOR_PORT = 25555
@@ -18,6 +18,7 @@ module Bosh::Cli
         @exit_code = 0
         @out = nil
         @args = []
+        @info = {}
       end
 
       # @return [Bosh::Cli::Config] Current configuration
@@ -87,6 +88,10 @@ module Bosh::Cli
         Bosh::Cli::Runner.new(args, @options).run
       end
 
+      def run_nested_command(*args)
+        Bosh::Cli::Runner.new(args, @options).run(false)
+      end
+
       def confirmed?(question = 'Are you sure?')
         return true if non_interactive?
         ask("#{question} (type 'yes' to continue): ") == 'yes'

data/lib/cli/client/director.rb

@@ -96,6 +96,7 @@ module Bosh
         def upload_remote_stemcell(stemcell_location, options = {})
           options                = options.dup
           payload                = { 'location' => stemcell_location }
+          payload[:sha1]         = options[:sha1] if options[:sha1]
           options[:payload]      = JSON.generate(payload)
           options[:content_type] = 'application/json'
 
@@ -641,6 +642,7 @@ module Bosh
         def releases_path(options = {})
           path = '/releases'
           params = [:rebase, :skip_if_exists].select { |p| options[p] }.map { |p| "#{p}=true" }
+          params.push "sha1=#{options[:sha1]}" unless options[:sha1].blank?
           path << "?#{params.join('&')}" unless params.empty?
           path
         end

data/lib/cli/command_handler.rb

@@ -55,7 +55,7 @@ module Bosh::Cli
 
       begin
         command.send(@method.name, *args)
-        command.exit_code
+        [command.exit_code, command.info]
       rescue ArgumentError => ex
         err("#{ex.message}.\n\nUsage: #{usage_with_params}")
       end

data/lib/cli/commands/deployment.rb

@@ -88,6 +88,54 @@ module Bosh::Cli::Command
       recreate = !!options[:recreate]
       redact_diff = !!options[:redact_diff]
 
+      manifest = build_manifest
+      if manifest.hash['releases']
+        manifest.hash['releases'].each do |release|
+          if release['url'].blank?
+            if release['version'] == 'create'
+              err("Expected URL when specifying release version `create'")
+            end
+          else
+            parsed_uri = URI.parse(release['url'])
+            case parsed_uri.scheme
+            when 'file'
+              if release['version'] == 'create'
+                path_is_reasonable!(parsed_uri.path)
+                _, info = run_nested_command "create", "release", "--name", release['name'], "--dir", parsed_uri.path, "--timestamp-version", "--force"
+                release['version'] = info[:generated_version]
+                run_nested_command "upload", "release", "--dir", parsed_uri.path, info[:generated_manifest_path]
+              else
+                run_nested_command "upload", "release", parsed_uri.path, '--name', release['name'], '--version', release['version'].to_s
+              end
+            when 'http', 'https'
+              err('Path must be a local release directory when version is `create\'') if release['version'] == 'create'
+              err("Expected SHA1 when specifying remote URL for release `#{release["name"]}'") if release['sha1'].blank?
+              run_nested_command "upload", "release", release['url'], "--sha1", release['sha1'], "--name", release['name'], "--version", release['version'].to_s
+            else
+              err("Invalid URL format for release `#{release['name']}' with URL `#{release['url']}'. Supported schemes: file, http, https.")
+            end
+          end
+        end
+      end
+
+      if manifest.hash['resource_pools']
+        manifest.hash['resource_pools'].each do |resource_pool|
+          unless resource_pool['stemcell']['url'].blank?
+            parsed_uri = URI.parse(resource_pool['stemcell']['url'])
+            case parsed_uri.scheme
+            when 'file'
+              run_nested_command "upload", "stemcell", parsed_uri.path, "--name", resource_pool['stemcell']['name'], "--version", resource_pool['stemcell']['version'].to_s, "--skip-if-exists"
+            when 'http', 'https'
+              err("Expected SHA1 when specifying remote URL for stemcell `#{resource_pool['stemcell']['name']}'") if resource_pool['stemcell']['sha1'].blank?
+              run_nested_command "upload", "stemcell", resource_pool['stemcell']['url'], "--sha1", resource_pool['stemcell']['sha1'],
+                "--name", resource_pool['stemcell']['name'], "--version", resource_pool['stemcell']['version'].to_s, "--skip-if-exists"
+            else
+              err("Invalid URL format for stemcell `#{resource_pool['stemcell']['name']}' with URL `#{resource_pool['stemcell']['url']}'. Supported schemes: file, http, https.")
+            end
+          end
+        end
+      end
+
       manifest = prepare_deployment_manifest(resolve_properties: true, show_state: true)
 
       inspect_deployment_changes(
@@ -275,11 +323,19 @@ module Bosh::Cli::Command
 
       [deployment["name"], releases.join("\n"), stemcells.join("\n"), deployment.fetch("cloud_config", "none")]
     end
-    
+
     def names_and_versions_from(arr)
       arr.map { |hash|
         hash.values_at("name", "version").join("/")
       }.sort
     end
+
+    def path_is_reasonable!(path)
+      #path is actually to a directory, not a file
+      unless File.directory?(path)
+        err "Path must be a release directory when version is `create'"
+      end
+    end
+
   end
 end

data/lib/cli/commands/instances.rb

@@ -8,6 +8,7 @@ module Bosh::Cli::Command
     option '--dns', 'Return instance DNS A records'
     option '--vitals', 'Return instance vitals information'
     option '--ps', "Return instance process information"
+    option '--failing', "Only show failing ones"
     def list()
       auth_required
       deployment_required
@@ -44,6 +45,7 @@ module Bosh::Cli::Command
         s
       end
 
+      row_count = 0
       has_disk_cid = instances[0].has_key?('disk_cid')
 
       instances_table = table do |t|
@@ -65,9 +67,19 @@ module Bosh::Cli::Command
           headings += ["System\nDisk Usage", "Ephemeral\nDisk Usage", "Persistent\nDisk Usage"]
         end
         t.headings = headings
-
-        s = instances.size
         sorted.each do |instance|
+          if options[:failing]
+            if options[:ps]
+              instance['processes'].keep_if { |p| p['state'] != 'running' }
+              next if instance['processes'].size == 0 && instance['job_state'] != 'failing'
+            else
+              next if instance['job_state'] != 'failing'
+            end
+          end
+
+          row_count += 1
+          t << :separator if row_count.between?(2, sorted.size)
+
           job = "#{instance['job_name'] || 'unknown'}/#{instance['index'] || 'unknown'}"
           ips = Array(instance['ips']).join("\n")
           dns_records = Array(instance['dns']).join("\n")
@@ -117,7 +129,6 @@ module Bosh::Cli::Command
           end
 
           t << row
-          s -= 1
           if options[:ps] && instance['processes']
             instance['processes'].each do |process|
               name = process['name']
@@ -126,16 +137,20 @@ module Bosh::Cli::Command
               (headings.size - 2).times { process_row << '' }
               t << process_row
             end
-            t << :separator if s > 0
           end
         end
       end
 
+      if options[:failing] && row_count == 0
+        nl
+        say('No failing instances')
+        nl
+        return
+      end
       nl
       say(instances_table)
       nl
-      say('Instances total: %d' % instances.size)
+      say('Instances total: %d' % row_count )
     end
-
   end
 end

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

@@ -17,6 +17,7 @@ module Bosh::Cli::Command
       option '--name NAME', 'specify a custom release name'
       option '--version VERSION', 'specify a custom version number (ex: 1.0.0 or 1.0-beta.2+dev.10)'
       option '--dir RELEASE_DIRECTORY', 'path to release directory'
+      option '--timestamp-version', 'create release with the timestamp as the dev version (ex: 1+dev.TIMESTAMP)'
 
       def create(manifest_file = nil)
         switch_to_release_dir
@@ -29,12 +30,23 @@ module Bosh::Cli::Command
             err('Cannot specify a custom version number when creating from a manifest. The manifest already specifies a version.'.make_red)
           end
 
+          if options[:'timestamp_version']
+            err('Cannot specify timestamp-version when creating from a manifest. The manifest already specifies a version.'.make_red)
+          end
+
           say('Recreating release from the manifest')
           Bosh::Cli::ReleaseCompiler.compile(manifest_file, cache_dir, release.blobstore, [], release.dir)
           release_filename = manifest_file
         else
-          version = options[:version]
-          version = Bosh::Common::Version::ReleaseVersion.parse(version).to_s unless version.nil?
+          if options[:version] && options[:'timestamp_version']
+            err('Cannot specify both timestamp-version and version when creating a release.')
+          end
+
+          version = nil
+          if options[:version]
+            version = options[:version]
+            version = Bosh::Common::Version::ReleaseVersion.parse(version).to_s unless version.nil?
+          end
 
           release_filename = create_from_spec(version)
         end
@@ -99,6 +111,8 @@ module Bosh::Cli::Command
 
         header('Building release')
         release_builder = build_release(job_artifacts, manifest_only, package_artifacts, license_artifacts, name, version)
+        info[:generated_version] = release_builder.version
+        info[:generated_manifest_path] = release_builder.manifest_path
 
         header('Release summary')
         show_summary(release_builder)
@@ -150,7 +164,8 @@ module Bosh::Cli::Command
           final: final,
           commit_hash: commit_hash,
           version: version,
-          uncommitted_changes: dirty_state?
+          uncommitted_changes: dirty_state?,
+          timestamp_version: options[:'timestamp_version']
         )
 
         unless dry_run

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

@@ -3,13 +3,17 @@ module Bosh::Cli::Command
     class UploadRelease < Base
 
       usage 'upload release'
-      desc 'Upload release (release_file can be a local file or a remote URI)'
+      desc "Upload release (release_file can be a local file or a remote URI). \
+If --name & --version are provided, they will be used for checking if release exists & upload will be skipped if it exists (for both local and remote)"
       option '--rebase',
         'Rebases this release onto the latest version',
         'known by director (discards local job/package',
         'versions in favor of versions assigned by director)'
       option '--skip-if-exists', 'no-op; retained for backward compatibility'
       option '--dir RELEASE_DIRECTORY', 'path to release directory'
+      option '--sha1 SHA1', 'SHA1 of the remote release'
+      option '--name NAME', 'name of the release'
+      option '--version VERSION', 'version of the release'
 
       def upload(release_file = nil)
         auth_required
@@ -19,6 +23,7 @@ module Bosh::Cli::Command
         upload_options = {
           :rebase => options[:rebase],
           :repack => true,
+          :sha1 => options[:sha1]
         }
 
         #only check release_dir if not compiled release tarball
@@ -38,12 +43,22 @@ module Bosh::Cli::Command
           end
         end
 
+        if options[:name] && options[:version]
+          director.list_releases.each do |release|
+            if release['name'] == options[:name]
+              release['release_versions'].each do |version|
+                return if version['version'] == options[:version]
+              end
+            end
+          end
+        end
+
         if release_file =~ /^#{URI::regexp}$/
           upload_remote_release(release_file, upload_options)
+
         else
-          unless File.exist?(release_file)
-            err("Release file doesn't exist")
-          end
+          err("Option '--sha1' is not supported for uploading local release") unless options[:sha1].nil?
+          err("Release file doesn't exist") unless File.exist?(release_file)
 
           file_type = `file --mime-type -b '#{release_file}'` # duplicate? Already done on line 23
 
@@ -146,7 +161,6 @@ module Bosh::Cli::Command
       end
 
       def upload_remote_release(release_location, upload_options = {})
-        nl
         if upload_options[:rebase]
           say("Using remote release `#{release_location}' (#{'will be rebased'.make_yellow})")
           report = 'Release rebased'
@@ -158,6 +172,7 @@ module Bosh::Cli::Command
         status, task_id = director.upload_remote_release(
           release_location,
           rebase: upload_options[:rebase],
+          sha1: upload_options[:sha1]
         )
         task_report(status, task_id, report)
       end

data/lib/cli/commands/stemcell.rb

@@ -28,9 +28,13 @@ module Bosh::Cli
 
     usage 'upload stemcell'
     desc "Upload stemcell (stemcell_location can be a local file or a remote URI). \
-Note that --skip-if-exists and --fix can not be used together."
+Note that --skip-if-exists and --fix can not be used together. \
+If --name & --version are provided, they will be used for checking if stemcell exists & upload will be skipped if it exists (for both local and remote)"
     option '--skip-if-exists', 'skips upload if stemcell already exists'
     option '--fix', 'replaces the stemcell if already exists'
+    option '--sha1 SHA1', 'SHA1 of the remote stemcell'
+    option '--name NAME', 'name of the stemcell'
+    option '--version VERSION', 'version of the stemcell'
     def upload(stemcell_location)
       auth_required
       show_current_state
@@ -39,9 +43,19 @@ Note that --skip-if-exists and --fix can not be used together."
         err("Option '--skip-if-exists' and option '--fix' should not be used together")
       end
 
+      if options[:fix] && (options[:name] || options[:version])
+        err("Options '--name' and '--version' should not be used together with option '--fix'")
+      end
+
       stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? 'remote' : 'local'
 
+      if options[:name] && options[:version]
+        return if exists?(options[:name], options[:version])
+      end
+
       if stemcell_type == 'local'
+        err("Option '--sha1' is not supported for uploading local stemcell") unless options[:sha1].nil?
+
         stemcell = Bosh::Cli::Stemcell.new(stemcell_location)
 
         nl
@@ -75,7 +89,10 @@ Note that --skip-if-exists and --fix can not be used together."
         say("Using remote stemcell `#{stemcell_location}'")
       end
 
-      status, task_id = apply_upload_stemcell_strategy(stemcell_type, stemcell_location, options[:fix]?{fix: true}:{})
+      selected_options = {}
+      selected_options[:fix] = options[:fix] if options[:fix]
+      selected_options[:sha1] = options[:sha1] if options[:sha1]
+      status, task_id = apply_upload_stemcell_strategy(stemcell_type, stemcell_location, selected_options)
       success_message = 'Stemcell uploaded and created.'
 
       if status == :error && options[:skip_if_exists] && last_event(task_id)['error']['code'] == STEMCELL_EXISTS_ERROR_CODE

data/lib/cli/deployment_helper.rb

@@ -1,9 +1,15 @@
 module Bosh::Cli
   module DeploymentHelper
-    def prepare_deployment_manifest(options = {})
+    def build_manifest
       deployment_required
-      manifest = Manifest.new(deployment, director)
-      manifest.load
+      return @manifest if @manifest
+      @manifest = Manifest.new(deployment, director)
+      @manifest.load
+      @manifest
+    end
+
+    def prepare_deployment_manifest(options = {})
+      manifest = build_manifest
       if options.fetch(:show_state, false)
         show_current_state(manifest.name)
       end

data/lib/cli/manifest.rb

@@ -29,7 +29,7 @@ module Bosh::Cli
       end
 
       if options[:resolve_properties]
-        compiler = DeploymentManifestCompiler.new(File.read(@deployment_file))
+        compiler = DeploymentManifestCompiler.new(Psych.dump(@hash))
         properties = {}
 
         begin

data/lib/cli/release_builder.rb

@@ -29,6 +29,7 @@ module Bosh::Cli
       @name = name
       raise 'Release name is blank' if name.blank?
 
+      @timestamp_version = options.fetch(:'timestamp_version', false)
       @version = options.fetch(:version, nil)
 
       @final_index = Versions::VersionsIndex.new(final_releases_dir)
@@ -195,6 +196,10 @@ module Bosh::Cli
 
       if @final
         # Drop pre-release and post-release segments, and increment the release segment
+        if @timestamp_version
+          raise ReleaseVersionError.new('Release version cannot be set to a timestamp for a final release')
+        end
+
         latest_final_version.increment_release
       else
         # Increment or Reset the post-release segment
@@ -202,13 +207,19 @@ module Bosh::Cli
         latest_dev_version = dev_versions.latest_with_pre_release(latest_final_version)
 
         if latest_dev_version
-          if latest_dev_version.version.post_release.nil?
+          if @timestamp_version
+            latest_dev_version.timestamp_release
+          elsif latest_dev_version.version.post_release.nil?
             latest_dev_version.default_post_release
           else
             latest_dev_version.increment_post_release
           end
         else
-          latest_final_version.default_post_release
+          if @timestamp_version
+            latest_final_version.timestamp_release
+          else
+            latest_final_version.default_post_release
+          end
         end
       end
     end

data/lib/cli/runner.rb

@@ -32,7 +32,7 @@ module Bosh::Cli
 
     # Find and run CLI command
     # @return [void]
-    def run
+    def run(exit_on_success=true)
       Config.interactive = !@options[:non_interactive]
       Config.poll_interval = @options[:poll_interval]
 
@@ -53,8 +53,9 @@ module Bosh::Cli
 
       command.runner = self
       begin
-        exit_code = command.run(@args, @options)
-        exit(exit_code)
+        exit_code, info = command.run(@args, @options)
+        exit(exit_code) if exit_on_success || exit_code != 0
+        [exit_code, info]
       rescue OptionParser::ParseError => e
         say_err(e.message)
         nl

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3115.0'
+    VERSION = '1.3120.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3115.0
+  version: 1.3120.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-27 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.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.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.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement