bosh_cli 1.3048.0 → 1.3050.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2c8caf633418d93c3fc5d55e5d55829f2909d2
-  data.tar.gz: 7d6c4f2522b87f032f687719407f8b5a308a7ee6
+  metadata.gz: e7a164a6a5e5dee79814a1b030c95281ef0d17cf
+  data.tar.gz: 3cb0f56a36a75aeb2250c4484add4e1efd93c9a8
 SHA512:
-  metadata.gz: e176f20927bcafcf2a4ba72fff120e4d49cba0f77a2710b2c32deaccc023a907f42810a4f8f6ac0d55294718262160a4ecbe610997ac424f54c5a5621077bef7
-  data.tar.gz: 0550e4ad1f6969805ec4f1e84b60db9c90e94ebde919977493855e84dd10636e413c6b2edf4e5213001cb66d76c4afc8f3022715e4c75a0cfc60a03a5bc28af3
+  metadata.gz: eed65e888f4520649fd0aeab3a3e809e2c35ae97b085b1cb4b448e4be078986ba2b07c96dba1162e4891894500d67db42f0e0358fb2be69ddfc2f5367cc69648
+  data.tar.gz: 19e8b853bbfa29e109442a1b32a8c14932ad7421ce5259cf17750590c6993fe77c31c1c7d55f62211ce655fca1c9ce16e55cd7e1385332fc075fcb1eceab43ac

data/lib/cli/client/director.rb

@@ -157,6 +157,17 @@ module Bosh
           end
         end
 
+        def match_compiled_packages(manifest_yaml)
+          url          = '/packages/matches_compiled'
+          status, body = post(url, 'text/yaml', manifest_yaml)
+
+          if status == 200
+            JSON.parse(body)
+          else
+            err(parse_error_message(status, body))
+          end
+        end
+
         def get_deployment(name)
           _, body = get_json_with_status("/deployments/#{name}")
           body

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

@@ -47,7 +47,7 @@ module Bosh::Cli::Command
           err("Checksum mismatch for downloaded blob `#{tarball_file_path}'")
         end
 
-        task_report(status, task_id, "Exported Release `#{release.name.make_green}/#{release.version.make_green}` for `#{stemcell_os.make_green}/#{stemcell.version.make_green}`")
+        task_report(status, task_id, "Exported release `#{release.name.make_green}/#{release.version.make_green}` for `#{stemcell_os.make_green}/#{stemcell.version.make_green}`")
       end
 
       # Returns file SHA1 checksum

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

@@ -8,7 +8,7 @@ module Bosh::Cli::Command
         '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', 'skips upload if release already exists'
+      option '--skip-if-exists', 'no-op; retained for backward compatibility'
       def upload(release_file = nil)
         auth_required
         show_current_state
@@ -16,7 +16,6 @@ module Bosh::Cli::Command
         upload_options = {
           :rebase => options[:rebase],
           :repack => true,
-          :skip_if_exists => options[:skip_if_exists],
         }
 
         #only check release_dir if not compiled release tarball
@@ -43,7 +42,7 @@ module Bosh::Cli::Command
             err("Release file doesn't exist")
           end
 
-          file_type = `file --mime-type -b '#{release_file}'`
+          file_type = `file --mime-type -b '#{release_file}'` # duplicate? Already done on line 23
 
           if file_type =~ /text\/(plain|yaml)/
             upload_manifest(release_file, upload_options)
@@ -100,26 +99,15 @@ module Bosh::Cli::Command
           tarball_path = tarball.convert_to_old_format
         end
 
-        remote_release = get_remote_release(tarball.release_name) rescue nil
-        if remote_release && !rebase
-          version = if new_director?
-                      Bosh::Common::Version::ReleaseVersion.parse(tarball.version)
-                    else
-                      tarball.version
-                    end
-          if remote_release['versions'].include?(version.to_s)
-            if upload_options[:skip_if_exists]
-              say("Release `#{tarball.release_name}/#{version}' already exists. Skipping upload.")
-              return
-            else
-              err('This release version has already been uploaded')
-            end
-          end
-        end
+        Bosh::Common::Version::ReleaseVersion.parse(tarball.version) if new_director?
 
         begin
           if repack
-            package_matches = match_remote_packages(tarball.manifest)
+            if tarball.compiled_release?
+              package_matches = match_remote_compiled_packages(tarball.manifest)
+            else
+              package_matches = match_remote_packages(tarball.manifest)
+            end
 
             say('Checking if can repack release for faster upload...')
             repacked_path = tarball.repack(package_matches)
@@ -161,7 +149,6 @@ module Bosh::Cli::Command
         status, task_id = director.upload_remote_release(
           release_location,
           rebase: upload_options[:rebase],
-          skip_if_exists: upload_options[:skip_if_exists],
         )
         task_report(status, task_id, report)
       end
@@ -201,7 +188,17 @@ module Bosh::Cli::Command
           'director or downgrade your CLI to 0.19.6'
 
         say(msg.make_yellow)
-        exit(1) unless confirmed?
+      end
+
+      def match_remote_compiled_packages(manifest_yaml)
+        director.match_compiled_packages(manifest_yaml)
+      rescue Bosh::Cli::DirectorError
+        msg = "You are using CLI >= 0.20 with director that doesn't support " +
+            "package matches.\nThis will result in uploading all packages " +
+            "and jobs to your director.\nIt is recommended to update your " +
+            'director or downgrade your CLI to 0.19.6'
+
+        say(msg.make_yellow)
       end
 
       def should_convert_to_old_format?(version)

data/lib/cli/release.rb

@@ -71,7 +71,6 @@ module Bosh::Cli
       return true if provider == 'local'
 
       has_legacy_secret? ||
-        has_blobstore_secrets?(bs, "atmos", "secret") ||
         has_blobstore_secrets?(bs, "simple", "user", "password") ||
         has_blobstore_secrets?(bs, "dav", "user", "password") ||
         has_blobstore_secrets?(bs, "swift", "rackspace") ||
@@ -93,8 +92,6 @@ module Bosh::Cli
     #   s3:
     #     secret_access_key: ...
     #     access_key_id: ...
-    #   atmos:
-    #     secret: ...
 
     # Picks blobstore client to use with current release.
     #
@@ -115,8 +112,6 @@ module Bosh::Cli
       provider = blobstore_config["provider"]
       options  = blobstore_config["options"] || {}
 
-      deprecate_blobstore_secret if has_legacy_secret?
-
       options = merge_private_data(provider, options)
 
       opts = Bosh::Common.symbolize_keys(options)
@@ -156,19 +151,6 @@ module Bosh::Cli
       options.merge(bs[provider] ? bs[provider] : {})
     end
 
-    # stores blobstore_secret as blobstore.atmos.secret
-    def deprecate_blobstore_secret
-      say("WARNING:".make_red + " use of blobstore_secret is deprecated")
-
-      @private_config["blobstore"] ||= {}
-      bs = @private_config["blobstore"]
-
-      bs["atmos"] ||= {}
-      atmos = bs["atmos"]
-
-      atmos["secret"] = @private_config["blobstore_secret"]
-    end
-
     # Upgrade path for legacy clients that kept release metadata
     # in config/dev.yml and config/final.yml
     #
@@ -200,30 +182,6 @@ module Bosh::Cli
         say("Migrated dev config file format".make_green)
       end
 
-      if @final_config.has_key?("blobstore_options") &&
-          @final_config["blobstore_options"] != "deprecated"
-        say("Found legacy config file `#{@final_config_file}'".make_yellow)
-
-        unless @final_config["blobstore_options"]["provider"] == "atmos" &&
-            @final_config["blobstore_options"].has_key?("atmos_options")
-          err("Please update your release to the version " +
-                  "that uses Atmos blobstore")
-        end
-
-        new_final_config = {
-          "final_name" => @final_config["name"],
-          "blobstore" => {
-            "provider" => "atmos",
-            "options" => @final_config["blobstore_options"]["atmos_options"]
-          },
-          "blobstore_options" => "deprecated"
-        }
-
-        @final_config = new_final_config
-
-        File.open(@final_config_file, "w") { |f| Psych.dump(@final_config, f) }
-        say("Migrated final config file format".make_green)
-      end
     end
 
     def load_config(file)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3048.0'
+    VERSION = '1.3050.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3050.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 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.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.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.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  e2c11a
+  b92cdc
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -325,7 +325,6 @@ files:
 - lib/cli/blob_manager.rb
 - lib/cli/build_artifact.rb
 - lib/cli/changeset_helper.rb
-- lib/cli/client/compiled_packages_client.rb
 - lib/cli/client/credentials.rb
 - lib/cli/client/director.rb
 - lib/cli/client/errands_client.rb
@@ -349,9 +348,7 @@ files:
 - lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb
 - lib/cli/commands/errand.rb
-- lib/cli/commands/export_compiled_packages.rb
 - lib/cli/commands/help.rb
-- lib/cli/commands/import_compiled_packages.rb
 - lib/cli/commands/instances.rb
 - lib/cli/commands/job.rb
 - lib/cli/commands/job_management.rb

data/lib/cli/client/compiled_packages_client.rb

@@ -1,28 +0,0 @@
-module Bosh::Cli::Client
-  class CompiledPackagesClient
-    def initialize(director)
-      @director = director
-    end
-
-    def export(release_name, release_version, stemcell_name, stemcell_version)
-      path = "/compiled_package_groups/export"
-      content_type = 'application/json'
-
-      body = JSON.dump(
-        stemcell_name: stemcell_name,
-        stemcell_version: stemcell_version,
-        release_name: release_name,
-        release_version: release_version,
-      )
-
-      _, file_path, _ = @director.post(path, content_type, body, {}, file: true)
-      file_path
-    end
-
-    def import(exported_tar_path)
-      path = '/compiled_package_groups/import'
-
-      @director.upload_and_track(:post, path, exported_tar_path, {content_type: 'application/x-compressed'})
-    end
-  end
-end

data/lib/cli/commands/export_compiled_packages.rb

@@ -1,34 +0,0 @@
-require 'fileutils'
-require 'cli/name_version_pair'
-require 'cli/client/compiled_packages_client'
-
-module Bosh::Cli::Command
-  class ExportCompiledPackages < Base
-    usage 'export compiled_packages'
-    desc 'Download compiled packages for a specific release and stemcell combination'
-    def perform(release, stemcell, download_dir)
-      auth_required
-      show_current_state
-
-      release = Bosh::Cli::NameVersionPair.parse(release)
-      stemcell = Bosh::Cli::NameVersionPair.parse(stemcell)
-
-      unless Dir.exists?(download_dir)
-        err("Directory `#{download_dir}' must exist.")
-      end
-
-      download_file_name = "#{release.name}-#{release.version}-#{stemcell.name}-#{stemcell.version}.tgz"
-      download_path = File.join(download_dir, download_file_name)
-
-      if File.exists?(download_path)
-        err("File `#{download_path}' already exists.")
-      end
-
-      client = Bosh::Cli::Client::CompiledPackagesClient.new(director)
-      tmp_path = client.export(release.name, release.version, stemcell.name, stemcell.version)
-      FileUtils.mv(tmp_path, download_path)
-
-      say("Exported compiled packages to `#{download_path.make_green}'.")
-    end
-  end
-end

data/lib/cli/commands/import_compiled_packages.rb

@@ -1,20 +0,0 @@
-require 'cli/client/compiled_packages_client'
-
-module Bosh::Cli::Command
-  class ImportCompiledPackages < Base
-    usage 'import compiled_packages'
-    desc 'Import compiled packages for a specific release and stemcell combination'
-    def perform(exported_tar_path)
-      auth_required
-      show_current_state
-
-      unless File.exist?(exported_tar_path)
-        raise Bosh::Cli::CliError, 'Archive does not exist'
-      end
-
-      client = Bosh::Cli::Client::CompiledPackagesClient.new(director)
-      status, task_id = client.import(exported_tar_path)
-      task_report(status, task_id)
-    end
-  end
-end