bosh-director 1.2862.0 → 1.2865.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90797724c4418af74e74de81c8b5c9955ebfbd31
-  data.tar.gz: fdac207018629e7463ba22a05dee08e0493e3a12
+  metadata.gz: d691fc291096229e10ae5d5d8e6da83337727e1c
+  data.tar.gz: 3aafd6149acf31aabeb76de9280ce530dec90b8f
 SHA512:
-  metadata.gz: a4f2dfa82f0e1c11acac4fb2d01342f6da5056d61107eb625ae2f30468ebfcccdfd52629d900ede43a86492d2d78066d73607f036792d27f78409e95f10420d4
-  data.tar.gz: b5dfff754b5543d8896537bf3774a826f5f51f641e671c7154845fd71ea0200a5ffc53af59c2cdf356d4d477915a8e69526cc7204ff827147f13e44b8da3111f
+  metadata.gz: 426f25380bffc4e9565094f6342fe4bca45651e48050f908a1c2e5b7b1a3c233a365cc8f4afc2b8e32c4a0b5a01389feadc62557965344c675efa5faa0ef3881
+  data.tar.gz: 348c2b119a34feff5b64422e67460a9b96634525246fdc436b1a931a075045aed4a96c53fdfd94fe876ef31f85d81e5fd93a0e821b11c6dfb4a264fb42dcfa4e

data/bin/bosh-director

@@ -18,7 +18,7 @@ config = Bosh::Director::Config.load_file(config_file)
 
 route_configuration = Bosh::Director::Api::RouteConfiguration.new(config)
 
-thin_server = Thin::Server.new('127.0.0.1', config.hash['port'], signals: false) do
+thin_server = Thin::Server.new('127.0.0.1', config.port, signals: false) do
   use Rack::CommonLogger
 
   route_configuration.controllers.each do |route, controller|
@@ -33,5 +33,5 @@ end
   end
 end
 
-Bosh::Director::Config.logger.info("Listening on port #{config.hash['port']}")
+Bosh::Director::Config.logger.info("Listening on port #{config.port}")
 thin_server.start!

data/bin/bosh-director-scheduler

@@ -16,7 +16,7 @@ opts.parse!(ARGV.dup)
 config = Bosh::Director::Config.load_file(config_file)
 Bosh::Director::App.new(config)
 
-scheduler = Bosh::Director::Scheduler.new(config.hash.fetch('scheduled_jobs', []))
+scheduler = Bosh::Director::Scheduler.new(config.scheduled_jobs)
 
 %w(TERM INT QUIT).each do |signal|
   trap(signal) do

data/bin/bosh-director-worker

@@ -51,15 +51,7 @@ end
 
 Bosh::Director::App.new(config)
 
-logger = Logging::Logger.new('DirectorWorker')
-resque_logging = config.hash.fetch('resque', {}).fetch('logging', {})
-if resque_logging.has_key?('file')
-  logger.add_appenders(Logging.appenders.file('DirectorWorkerFile', filename: resque_logging.fetch('file'), layout: ThreadFormatter.layout))
-else
-  logger.add_appenders(Logging.appenders.stdout('DirectorWorkerIO', layout: ThreadFormatter.layout))
-end
-logger.level = Logging.levelify(resque_logging.fetch('level', 'info'))
-Resque.logger = logger
+Resque.logger = config.resque_logger
 
 worker = nil
 queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')

data/lib/bosh/director/api/controllers/base_controller.rb

@@ -6,9 +6,10 @@ module Bosh::Director
         include Http
         include DnsHelper
 
-        def initialize(identity_provider)
+        def initialize(config)
           super()
-          @identity_provider = identity_provider
+          @config = config
+          @identity_provider = config.identity_provider
           @deployment_manager = DeploymentManager.new
           @backup_manager = BackupManager.new
           @instance_manager = InstanceManager.new

data/lib/bosh/director/api/controllers/compiled_packages_controller.rb

@@ -11,8 +11,8 @@ require 'bosh/director/jobs/import_compiled_packages'
 module Bosh::Director
   module Api::Controllers
     class CompiledPackagesController < BaseController
-      def initialize(identity_provider, compiled_package_group_manager)
-        super(identity_provider)
+      def initialize(config, compiled_package_group_manager)
+        super(config)
         @compiled_package_group_manager = compiled_package_group_manager
       end
 

data/lib/bosh/director/api/controllers/info_controller.rb

@@ -14,14 +14,15 @@ module Bosh::Director
           'version' => "#{VERSION} (#{Config.revision})",
           'user' => @user,
           'cpi' => Config.cloud_type,
+          'user_authentication' => @config.identity_provider.client_info,
           'features' => {
             'dns' => {
               'status' => Config.dns_enabled?,
-              'extras' => { 'domain_name' => dns_domain_name }
+              'extras' => {'domain_name' => dns_domain_name}
             },
             'compiled_package_cache' => {
               'status' => Config.use_compiled_package_cache?,
-              'extras' => { 'provider' => Config.compiled_package_cache_provider }
+              'extras' => {'provider' => Config.compiled_package_cache_provider}
             },
             'snapshots' => {
               'status' => Config.enable_snapshots

data/lib/bosh/director/api/controllers/resources_controller.rb

@@ -4,8 +4,8 @@ module Bosh::Director
   module Api::Controllers
     class ResourcesController < BaseController
 
-      def initialize(identity_provider, resource_manager)
-        super(identity_provider)
+      def initialize(config, resource_manager)
+        super(config)
         @resource_manager = resource_manager
       end
 

data/lib/bosh/director/api/local_identity_provider.rb

@@ -2,8 +2,12 @@ module Bosh
   module Director
     module Api
       class LocalIdentityProvider
-        def initialize(user_manager)
-          @user_manager = user_manager
+        def initialize(*_)
+          @user_manager = Bosh::Director::Api::UserManager.new
+        end
+
+        def client_info
+          {'type' => 'basic', 'options' => {}}
         end
 
         def corroborate_user(request_env)

data/lib/bosh/director/api/route_configuration.rb

@@ -3,8 +3,6 @@ module Bosh
     module Api
       class RouteConfiguration
 
-        USER_MANAGEMENT_PROVIDERS = %w[uaa local]
-
         def initialize(config)
           @config = config
         end
@@ -12,55 +10,27 @@ module Bosh
         def controllers
           director_app = Bosh::Director::App.new(@config)
           controllers = {}
-          controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new(identity_provider)
-          controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(identity_provider)
-          controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new(identity_provider)
-          controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new(identity_provider)
-          controllers['/packages'] = Bosh::Director::Api::Controllers::PackagesController.new(identity_provider)
-          controllers['/releases'] = Bosh::Director::Api::Controllers::ReleasesController.new(identity_provider)
+          controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new(@config)
+          controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(@config)
+          controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new(@config)
+          controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new(@config)
+          controllers['/packages'] = Bosh::Director::Api::Controllers::PackagesController.new(@config)
+          controllers['/releases'] = Bosh::Director::Api::Controllers::ReleasesController.new(@config)
           controllers['/resources'] = Bosh::Director::Api::Controllers::ResourcesController.new(
-            identity_provider,
+            @config,
             Bosh::Director::Api::ResourceManager.new(director_app.blobstores.blobstore)
           )
-          controllers['/resurrection'] = Bosh::Director::Api::Controllers::ResurrectionController.new(identity_provider)
-          controllers['/stemcells'] = Bosh::Director::Api::Controllers::StemcellsController.new(identity_provider)
-          controllers['/task'] = Bosh::Director::Api::Controllers::TaskController.new(identity_provider)
-          controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new(identity_provider)
+          controllers['/resurrection'] = Bosh::Director::Api::Controllers::ResurrectionController.new(@config)
+          controllers['/stemcells'] = Bosh::Director::Api::Controllers::StemcellsController.new(@config)
+          controllers['/task'] = Bosh::Director::Api::Controllers::TaskController.new(@config)
+          controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new(@config)
           controllers['/compiled_package_groups'] = Bosh::Director::Api::Controllers::CompiledPackagesController.new(
-            identity_provider,
+            @config,
             Bosh::Director::Api::CompiledPackageGroupManager.new
           )
-          controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new(identity_provider)
+          controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new(@config)
           controllers
         end
-
-        private
-
-        def identity_provider
-          @identity_provider ||= begin
-            # no fetching w defaults?
-            user_management = @config.hash['user_management']
-            user_management ||= { 'provider' => 'local' }
-            user_management_provider = user_management['provider']
-
-            unless USER_MANAGEMENT_PROVIDERS.include?(user_management_provider)
-              raise ArgumentError,
-                "Unknown user management provider '#{user_management_provider}', " +
-                  "available providers are: #{USER_MANAGEMENT_PROVIDERS}"
-            end
-            if user_management_provider == 'uaa'
-              Config.logger.debug("Director configured with 'uaa' user management provider")
-              unless user_management['options'] && user_management['options']['key']
-                raise ArgumentError, "Missing UAA secret key in user_management.options.key"
-              end
-
-              Bosh::Director::Api::UAAIdentityProvider.new(user_management['options']['key'])
-            else
-              Config.logger.debug("Director configured with 'local' user management provider")
-              Bosh::Director::Api::LocalIdentityProvider.new(Bosh::Director::Api::UserManager.new)
-            end
-          end
-        end
       end
     end
   end

data/lib/bosh/director/api/uaa_identity_provider.rb

@@ -4,8 +4,18 @@ module Bosh
   module Director
     module Api
       class UAAIdentityProvider
-        def initialize(key)
-          @token_coder = CF::UAA::TokenCoder.new(skey: key, audience_ids: ['bosh'])
+        def initialize(options)
+          @token_coder = CF::UAA::TokenCoder.new(skey: options.fetch('key'), audience_ids: ['bosh'])
+          @url = options.fetch('url')
+        end
+
+        def client_info
+          {
+            'type' => 'uaa',
+            'options' => {
+              'url' => @url
+            }
+          }
         end
 
         def corroborate_user(request_env)

data/lib/bosh/director/app.rb

@@ -23,9 +23,7 @@ module Bosh::Director
       # it becomes the authoritative official version across the whole app.
       @@instance = self
 
-      # This is the legacy config system that we are trying to get rid of by
-      # decomposing and moving all the dependent components into this App
-      Bosh::Director::Config.configure(config.hash)
+      config.configure_evil_config_singleton!
 
       @blobstores = Blobstores.new(config)
     end

data/lib/bosh/director/blobstores.rb

@@ -3,8 +3,8 @@ module Bosh::Director
     attr_reader :blobstore
 
     def initialize(config)
-      b_config = config.hash.fetch('blobstore')
-      bd_config = config.hash['backup_destination']
+      b_config = config.blobstore_config
+      bd_config = config.backup_blobstore_config
       @blobstore = create_client(b_config)
       @backup_destination = create_client(bd_config) if bd_config
     end

data/lib/bosh/director/config.rb

@@ -4,10 +4,7 @@ require 'bosh/director/dns_helper'
 
 module Bosh::Director
 
-  # We are in the slow painful process of extracting all of this class-level
-  # behavior into instance behavior, much of it on the App class. When this
-  # process is complete, the Config will be responsible only for maintaining
-  # configuration information - not holding the state of the world.
+  # We want to shift from class methods to instance methods here.
 
   class Config
     class << self
@@ -353,10 +350,70 @@ module Bosh::Director
       end
     end
 
-    attr_reader :hash
+    def name
+      hash['name']
+    end
+
+    def port
+      hash['port']
+    end
+
+    def scheduled_jobs
+      hash['scheduled_jobs'] || []
+    end
+
+    def identity_provider
+      @identity_provider ||= begin
+        # no fetching w defaults?
+        user_management = hash['user_management']
+        user_management ||= {'provider' => 'local'}
+        provider_name = user_management['provider']
+
+        providers = {
+          'uaa' => Bosh::Director::Api::UAAIdentityProvider,
+          'local' => Bosh::Director::Api::LocalIdentityProvider,
+        }
+        provider_class = providers[provider_name]
+
+        if provider_class.nil?
+          raise ArgumentError,
+            "Unknown user management provider '#{provider_name}', " +
+              "available providers are: #{providers.keys.join(", ")}"
+        end
+
+        Config.logger.debug("Director configured with '#{provider_name}' user management provider")
+        provider_class.new(user_management['options'] || {})
+      end
+    end
+
+    def resque_logger
+      logger = Logging::Logger.new('DirectorWorker')
+      resque_logging = hash.fetch('resque', {}).fetch('logging', {})
+      if resque_logging.has_key?('file')
+        logger.add_appenders(Logging.appenders.file('DirectorWorkerFile', filename: resque_logging.fetch('file'), layout: ThreadFormatter.layout))
+      else
+        logger.add_appenders(Logging.appenders.stdout('DirectorWorkerIO', layout: ThreadFormatter.layout))
+      end
+      logger.level = Logging.levelify(resque_logging.fetch('level', 'info'))
+      logger
+    end
+
+    def blobstore_config
+      hash.fetch('blobstore')
+    end
+
+    def backup_blobstore_config
+      hash['backup_destination']
+    end
+
+    def configure_evil_config_singleton!
+      Config.configure(hash)
+    end
 
     private
 
+    attr_reader :hash
+
     def initialize(hash)
       @hash = hash
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2862.0'
+    VERSION = '1.2865.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2862.0
+  version: 1.2865.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  c8ad5c
+  14ebaf
 email: support@cloudfoundry.com
 executables:
 - bosh-director