bosh-director 1.2682.1.0 → 1.2685.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e101a621d65e85af0e74b19c104bb96588ea22e7
-  data.tar.gz: 6ed3e1fabcdb47774c4d4ece30d75b70b359a1c9
+  metadata.gz: 98b2d92521f2e7c1f4b858e42e743b4c6f870725
+  data.tar.gz: fc2d3f58d4ba28091df63f69c73d274f367b3052
 SHA512:
-  metadata.gz: c5fbe0b46fe75031887dc83a30591d2b3add1340fbfee930261e8901461ca0512995f8608dea61324ff253ad11ae5835c55eeda04f9b9afea368c2ed6c0fd166
-  data.tar.gz: 67d12e46cc08bb6662551c0a1cf24116cabb63e7a527265e7c7561d1ec0fb59a10b6221d0562b5be60337a76d14ea072727701453608345f8e1450bccd16e673
+  metadata.gz: 520bc0f8c7bb6079be71da973cfefdad7af0d5331feee3fcabcbe3d5b495b5a39baaded8c47d98cdf6cdeb631729ac6fc511d53466ce87730c0e2a25f760da6c
+  data.tar.gz: a76f8db3e2e866081be3e5203dc945685de2feec2cc7c8abd82dc5f4489684c87eeedddeaf4d5fedc7f08eb3b7f67f92e04f2a8a376396cd55138f6854fece8b

data/bin/bosh-director

@@ -20,8 +20,61 @@ Bosh::Director::App.new(config)
 
 thin_server = Thin::Server.new('127.0.0.1', config.hash['port'], signals: false) do
   use Rack::CommonLogger
-  map '/' do
-    run Bosh::Director::Api::Controller.new
+
+  map '/info' do
+    run Bosh::Director::Api::Controllers::InfoController.new
+  end
+
+  map '/tasks' do
+    run Bosh::Director::Api::Controllers::TasksController.new
+  end
+
+  map '/backups' do
+    run Bosh::Director::Api::Controllers::BackupsController.new
+  end
+
+  map '/deployments' do
+    run Bosh::Director::Api::Controllers::DeploymentsController.new
+  end
+
+  map '/packages' do
+    run Bosh::Director::Api::Controllers::PackagesController.new
+  end
+
+  map '/releases' do
+    run Bosh::Director::Api::Controllers::ReleasesController.new
+  end
+
+  map '/resources' do
+    run Bosh::Director::Api::Controllers::ResourcesController.new
+  end
+
+  map '/resurrection' do
+    run Bosh::Director::Api::Controllers::ResurrectionController.new
+  end
+
+  map '/stemcells' do
+    run Bosh::Director::Api::Controllers::StemcellsController.new
+  end
+
+  map '/tasks' do
+    run Bosh::Director::Api::Controllers::TasksController.new
+  end
+
+  map '/task' do
+    run Bosh::Director::Api::Controllers::TaskController.new
+  end
+
+  map '/users' do
+    run Bosh::Director::Api::Controllers::UsersController.new
+  end
+
+  map '/compiled_package_groups' do
+    run Bosh::Director::Api::Controllers::CompiledPackagesController.new
+  end
+
+  map '/locks' do
+    run Bosh::Director::Api::Controllers::LocksController.new
   end
 end
 

data/lib/bosh/director.rb

@@ -84,7 +84,7 @@ require 'bosh/director/lock'
 require 'bosh/director/nats_rpc'
 require 'bosh/director/network_reservation'
 require 'bosh/director/package_compiler'
-require 'bosh/director/problem_scanner'
+require 'bosh/director/problem_scanner/scanner'
 require 'bosh/director/problem_resolver'
 require 'bosh/director/resource_pool_updater'
 require 'bosh/director/sequel'
@@ -97,6 +97,7 @@ require 'bosh/director/cloudcheck_helper'
 require 'bosh/director/problem_handlers/base'
 require 'bosh/director/problem_handlers/invalid_problem'
 require 'bosh/director/problem_handlers/inactive_disk'
+require 'bosh/director/problem_handlers/missing_disk'
 require 'bosh/director/problem_handlers/out_of_sync_vm'
 require 'bosh/director/problem_handlers/unresponsive_agent'
 require 'bosh/director/problem_handlers/unbound_instance_vm'
@@ -138,4 +139,16 @@ end
 
 require 'bosh/director/thread_pool'
 require 'bosh/director/api/controller_helpers'
-require 'bosh/director/api/controller'
+require 'bosh/director/api/controllers/backups_controller'
+require 'bosh/director/api/controllers/deployments_controller'
+require 'bosh/director/api/controllers/packages_controller'
+require 'bosh/director/api/controllers/info_controller'
+require 'bosh/director/api/controllers/releases_controller'
+require 'bosh/director/api/controllers/resources_controller'
+require 'bosh/director/api/controllers/resurrection_controller'
+require 'bosh/director/api/controllers/stemcells_controller'
+require 'bosh/director/api/controllers/tasks_controller'
+require 'bosh/director/api/controllers/task_controller'
+require 'bosh/director/api/controllers/users_controller'
+require 'bosh/director/api/controllers/compiled_packages_controller'
+require 'bosh/director/api/controllers/locks_controller'

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

@@ -3,11 +3,11 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class BackupsController < BaseController
-      post '/backups' do
+      post '/' do
         start_task { @backup_manager.create_backup(@user) }
       end
 
-      get '/backups' do
+      get '/' do
         send_file(@backup_manager.destination_path)
       end
     end

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

@@ -57,7 +57,7 @@ module Bosh::Director
             request.env.has_key?(key)
           end
 
-          protected! if auth_provided || !PUBLIC_URLS.include?(request.path_info)
+          protected! if auth_provided || !PUBLIC_URLS.include?(request.path)
         end
 
         after { headers('Date' => Time.now.rfc822) } # As thin doesn't inject date

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

@@ -16,7 +16,7 @@ module Bosh::Director
         @compiled_package_group_manager = Api::CompiledPackageGroupManager.new
       end
 
-      post '/compiled_package_groups/export', consumes: :json do
+      post '/export', consumes: :json do
         stemcell = find_stemcell_by_name_and_version
         release_version = find_release_version_by_name_and_version
 
@@ -36,7 +36,7 @@ module Bosh::Director
         send_file(output_path, type: :tgz)
       end
 
-      post '/compiled_package_groups/import', consumes: :multipart do
+      post '/import', consumes: :multipart do
         task = @compiled_package_group_manager.create_from_file_path(@user, params[:nginx_upload_path])
         redirect "/tasks/#{task.id}"
       end

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

@@ -3,7 +3,7 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class DeploymentsController < BaseController
-      get '/deployments/:deployment/jobs/:job/:index' do
+      get '/:deployment/jobs/:job/:index' do
         instance = @instance_manager.find_by_name(params[:deployment], params[:job], params[:index])
 
         response = {
@@ -18,7 +18,7 @@ module Bosh::Director
       end
 
       # PUT /deployments/foo/jobs/dea?new_name=dea_new
-      put '/deployments/:deployment/jobs/:job', :consumes => :yaml do
+      put '/:deployment/jobs/:job', :consumes => :yaml do
         if params['state']
           options = {
             'job_states' => {
@@ -48,7 +48,7 @@ module Bosh::Director
       end
 
       # PUT /deployments/foo/jobs/dea/2?state={started,stopped,detached,restart,recreate}
-      put '/deployments/:deployment/jobs/:job/:index', :consumes => :yaml do
+      put '/:deployment/jobs/:job/:index', :consumes => :yaml do
         begin
           index = Integer(params[:index])
         rescue ArgumentError
@@ -72,7 +72,7 @@ module Bosh::Director
       end
 
       # GET /deployments/foo/jobs/dea/2/logs
-      get '/deployments/:deployment/jobs/:job/:index/logs' do
+      get '/:deployment/jobs/:job/:index/logs' do
         deployment = params[:deployment]
         job = params[:job]
         index = params[:index]
@@ -86,17 +86,17 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/deployments/:deployment/snapshots' do
+      get '/:deployment/snapshots' do
         deployment = @deployment_manager.find_by_name(params[:deployment])
         json_encode(@snapshot_manager.snapshots(deployment))
       end
 
-      get '/deployments/:deployment/jobs/:job/:index/snapshots' do
+      get '/:deployment/jobs/:job/:index/snapshots' do
         deployment = @deployment_manager.find_by_name(params[:deployment])
         json_encode(@snapshot_manager.snapshots(deployment, params[:job], params[:index]))
       end
 
-      post '/deployments/:deployment/snapshots' do
+      post '/:deployment/snapshots' do
         deployment = @deployment_manager.find_by_name(params[:deployment])
         # until we can tell the agent to flush and wait, all snapshots are considered dirty
         options = {clean: false}
@@ -105,13 +105,13 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      put '/deployments/:deployment/jobs/:job/:index/resurrection', consumes: :json do
+      put '/:deployment/jobs/:job/:index/resurrection', consumes: :json do
         payload = json_decode(request.body)
 
         @resurrector_manager.set_pause_for_instance(params[:deployment], params[:job], params[:index], payload['resurrection_paused'])
       end
 
-      post '/deployments/:deployment/jobs/:job/:index/snapshots' do
+      post '/:deployment/jobs/:job/:index/snapshots' do
         instance = @instance_manager.find_by_name(params[:deployment], params[:job], params[:index])
         # until we can tell the agent to flush and wait, all snapshots are considered dirty
         options = {clean: false}
@@ -120,14 +120,14 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      delete '/deployments/:deployment/snapshots' do
+      delete '/:deployment/snapshots' do
         deployment = @deployment_manager.find_by_name(params[:deployment])
 
         task = @snapshot_manager.delete_deployment_snapshots_task(@user, deployment)
         redirect "/tasks/#{task.id}"
       end
 
-      delete '/deployments/:deployment/snapshots/:cid' do
+      delete '/:deployment/snapshots/:cid' do
         deployment = @deployment_manager.find_by_name(params[:deployment])
         snapshot = @snapshot_manager.find_by_cid(deployment, params[:cid])
 
@@ -135,7 +135,7 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      get '/deployments' do
+      get '/' do
         deployments = Models::Deployment.order_by(:name.asc).map { |deployment|
           name = deployment.name
 
@@ -153,12 +153,12 @@ module Bosh::Director
         json_encode(deployments)
       end
 
-      get '/deployments/:name' do
+      get '/:name' do
         deployment = @deployment_manager.find_by_name(params[:name])
         @deployment_manager.deployment_to_json(deployment)
       end
 
-      get '/deployments/:name/vms' do
+      get '/:name/vms' do
         deployment = @deployment_manager.find_by_name(params[:name])
 
         format = params[:format]
@@ -170,7 +170,7 @@ module Bosh::Director
         end
       end
 
-      delete '/deployments/:name' do
+      delete '/:name' do
         deployment = @deployment_manager.find_by_name(params[:name])
 
         options = {}
@@ -181,37 +181,37 @@ module Bosh::Director
       end
 
       # Property management
-      get '/deployments/:deployment/properties' do
+      get '/:deployment/properties' do
         properties = @property_manager.get_properties(params[:deployment]).map do |property|
           { 'name' => property.name, 'value' => property.value }
         end
         json_encode(properties)
       end
 
-      get '/deployments/:deployment/properties/:property' do
+      get '/:deployment/properties/:property' do
         property = @property_manager.get_property(params[:deployment], params[:property])
         json_encode('value' => property.value)
       end
 
-      post '/deployments/:deployment/properties', :consumes => [:json] do
+      post '/:deployment/properties', :consumes => [:json] do
         payload = json_decode(request.body)
         @property_manager.create_property(params[:deployment], payload['name'], payload['value'])
         status(204)
       end
 
-      post '/deployments/:deployment/ssh', :consumes => [:json] do
+      post '/:deployment/ssh', :consumes => [:json] do
         payload = json_decode(request.body)
         task = @instance_manager.ssh(@user, payload)
         redirect "/tasks/#{task.id}"
       end
 
-      put '/deployments/:deployment/properties/:property', :consumes => [:json] do
+      put '/:deployment/properties/:property', :consumes => [:json] do
         payload = json_decode(request.body)
         @property_manager.update_property(params[:deployment], params[:property], payload['value'])
         status(204)
       end
 
-      delete '/deployments/:deployment/properties/:property' do
+      delete '/:deployment/properties/:property' do
         @property_manager.delete_property(params[:deployment], params[:property])
         status(204)
       end
@@ -219,12 +219,12 @@ module Bosh::Director
       # Cloud check
 
       # Initiate deployment scan
-      post '/deployments/:deployment/scans' do
+      post '/:deployment/scans' do
         start_task { @problem_manager.perform_scan(@user, params[:deployment]) }
       end
 
       # Get the list of problems for a particular deployment
-      get '/deployments/:deployment/problems' do
+      get '/:deployment/problems' do
         problems = @problem_manager.get_problems(params[:deployment]).map do |problem|
           {
             'id' => problem.id,
@@ -239,12 +239,12 @@ module Bosh::Director
       end
 
       # Try to resolve a set of problems
-      put '/deployments/:deployment/problems', :consumes => [:json] do
+      put '/:deployment/problems', :consumes => [:json] do
         payload = json_decode(request.body)
         start_task { @problem_manager.apply_resolutions(@user, params[:deployment], payload['resolutions']) }
       end
 
-      put '/deployments/:deployment/scan_and_fix', :consumes => :json do
+      put '/:deployment/scan_and_fix', :consumes => :json do
         jobs_json = json_decode(request.body)['jobs']
         # payload: [['j1', 'i1'], ['j1', 'i2'], ['j2', 'i1'], ...]
         payload = convert_job_instance_hash(jobs_json)
@@ -252,13 +252,27 @@ module Bosh::Director
         start_task { @problem_manager.scan_and_fix(@user, params[:deployment], payload) }
       end
 
-      post '/deployments', :consumes => :yaml do
+      post '/', :consumes => :yaml do
         options = {}
         options['recreate'] = true if params['recreate'] == 'true'
 
         task = @deployment_manager.create_deployment(@user, request.body, options)
         redirect "/tasks/#{task.id}"
       end
+
+      post '/:deployment_name/errands/:errand_name/runs' do
+        deployment_name = params[:deployment_name]
+        errand_name = params[:errand_name]
+
+        task = JobQueue.new.enqueue(
+          @user,
+          Jobs::RunErrand,
+          "run errand #{errand_name} from deployment #{deployment_name}",
+          [deployment_name, errand_name],
+        )
+
+        redirect "/tasks/#{task.id}"
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class InfoController < BaseController
-      get '/info' do
+      get '/' do
         status = {
           'name' => Config.name,
           'uuid' => Config.uuid,

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

@@ -1,7 +1,7 @@
 module Bosh::Director
   module Api::Controllers
     class LocksController < BaseController
-      get '/locks' do
+      get '/' do
         redis = Config.redis
 
         locks = []

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

@@ -3,7 +3,7 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class PackagesController < BaseController
-      post '/packages/matches', :consumes => :yaml do
+      post '/matches', :consumes => :yaml do
         manifest = Psych.load(request.body)
 
         unless manifest.is_a?(Hash) && manifest['packages'].is_a?(Array)

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

@@ -3,20 +3,20 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class ReleasesController < BaseController
-      post '/releases', :consumes => :json do
+      post '/', :consumes => :json do
         payload = json_decode(request.body)
         rebase = params['rebase'] == 'true'
         task = @release_manager.create_release_from_url(@user, payload['location'], rebase)
         redirect "/tasks/#{task.id}"
       end
 
-      post '/releases', :consumes => :multipart do
+      post '/', :consumes => :multipart do
         rebase = params['rebase'] == 'true'
         task = @release_manager.create_release_from_file_path(@user, params[:nginx_upload_path], rebase)
         redirect "/tasks/#{task.id}"
       end
 
-      get '/releases' do
+      get '/' do
         releases = Models::Release.order_by(:name.asc).map do |release|
           release_versions = release.versions_dataset.order_by(:version.asc).map do |rv|
             {
@@ -37,7 +37,7 @@ module Bosh::Director
         json_encode(releases)
       end
 
-      get '/releases/:name' do
+      get '/:name' do
         name = params[:name].to_s.strip
         release = @release_manager.find_by_name(name)
 
@@ -69,7 +69,7 @@ module Bosh::Director
         json_encode(result)
       end
 
-      delete '/releases/:name' do
+      delete '/:name' do
         release = @release_manager.find_by_name(params[:name])
 
         options = {}