bosh_cli 1.2789.0 → 1.2792.0

data/lib/cli/base_command.rb

@@ -48,7 +48,7 @@ module Bosh::Cli
       def release
         return @release if @release
         check_if_release_dir
-        @release = Bosh::Cli::Release.new(@work_dir)
+        @release = Bosh::Cli::Release.new(@work_dir, options[:final])
       end
 
       def blob_manager

data/lib/cli/blob_manager.rb

@@ -45,9 +45,6 @@ module Bosh::Cli
       end
 
       @blobstore = @release.blobstore
-      if @blobstore.nil?
-        err("Blobstore is not configured")
-      end
 
       @new_blobs = []
       @updated_blobs = []
@@ -237,6 +234,10 @@ module Bosh::Cli
     # Uploads blob to a blobstore, updates blobs index.
     # @param [String] path Blob path relative to blobs dir
     def upload_blob(path)
+      if @blobstore.nil?
+        err("Failed to upload blobs: blobstore not configured")
+      end
+
       blob_path = File.join(@blobs_dir, path)
 
       unless File.exists?(blob_path)
@@ -267,6 +268,10 @@ module Bosh::Cli
     # Downloads blob from a blobstore
     # @param [String] path Downloaded blob file path
     def download_blob(path)
+      if @blobstore.nil?
+        err("Failed to download blobs: blobstore not configured")
+      end
+
       unless @index.has_key?(path)
         err("Unknown blob path `#{path}'")
       end

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

@@ -63,7 +63,7 @@ module Bosh::Cli::Command
         manifest_only = !options[:with_tarball]
         dry_run = options[:dry_run]
 
-        err("Can't create final release without blobstore secret") if final && !release.has_blobstore_secret?
+        release.blobstore # prime & validate blobstore config
 
         dirty_blob_check(force)
 

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

@@ -165,7 +165,7 @@ module Bosh::Cli::Command
           dir = File.expand_path('../..', manifest_path)
           Dir.chdir(dir)
           if in_release_dir?
-            @release = Bosh::Cli::Release.new(dir)
+            @release = Bosh::Cli::Release.new(dir, options[:final])
           end
         end
 

data/lib/cli/release.rb

@@ -7,8 +7,10 @@ module Bosh::Cli
   class Release
     attr_reader :dir
 
-    def initialize(dir)
+    def initialize(dir, final = false)
       @dir = dir
+      @final = final
+
       config_dir = File.join(dir, "config")
       @final_config_file = File.join(config_dir, "final.yml")
       @dev_config_file = File.join(config_dir, "dev.yml")
@@ -62,6 +64,8 @@ module Bosh::Cli
     def has_blobstore_secret?
       bs = @private_config["blobstore"]
 
+      return false unless @final_config['blobstore']
+
       # Add special handling for local blobstore which should not need need credentials
       provider = @final_config['blobstore']['provider']
       return true if provider == 'local'
@@ -99,7 +103,12 @@ module Bosh::Cli
       blobstore_config = Marshal.load(Marshal.dump(@final_config["blobstore"]))
 
       if blobstore_config.nil?
-        err("Missing blobstore configuration, please update your release")
+        err("Missing blobstore configuration, please update config/final.yml") if @final
+        unless @user_warned
+          warning("Missing blobstore configuration, please update config/final.yml before making a final release")
+          @user_warned = true
+        end
+        return nil
       end
 
       provider = blobstore_config["provider"]
@@ -134,6 +143,8 @@ module Bosh::Cli
     # Extracts private blobstore data from final.yml (i.e. secrets)
     # and merges it into the blobstore options.
     def merge_private_data(provider, options)
+      err("Missing blobstore secret configuration, please update config/private.yml") if @final && !has_blobstore_secret?
+
       bs = @private_config["blobstore"]
       return options unless bs
 

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2789.0'
+    VERSION = '1.2792.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2789.0
+  version: 1.2792.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2789.0
+        version: 1.2792.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: 0.5.4
 description: ! 'BOSH CLI
 
-  177517'
+  5e7f33'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 271561866118815358
+      hash: -1339837986300098617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23