bosh-director 1.3232.24.0 → 1.3262.0

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

@@ -4,7 +4,7 @@ module Bosh::Director
   module Api::Controllers
     class ReleasesController < BaseController
       post '/', :consumes => :json do
-        payload = json_decode(request.body)
+        payload = json_decode(request.body.read)
         options = {
           rebase: params['rebase'] == 'true',
           fix:    params['fix'] == 'true',

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

@@ -4,7 +4,7 @@ module Bosh::Director
   module Api::Controllers
     class ResurrectionController < BaseController
       put '/', consumes: :json do
-        payload = json_decode(request.body)
+        payload = json_decode(request.body.read)
 
         @resurrector_manager.set_pause_for_all(payload['resurrection_paused'])
         status(200)

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

@@ -4,7 +4,7 @@ module Bosh::Director
   module Api::Controllers
     class StemcellsController < BaseController
       post '/', :consumes => :json do
-        payload = json_decode(request.body)
+        payload = json_decode(request.body.read)
         options = {
             fix: params['fix'] == 'true',
             sha1: payload['sha1']

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

@@ -16,9 +16,9 @@ module Bosh::Director
           type = params[:type]
           task = @task_manager.find_task(params[:id])
           if type == 'debug' || type == 'cpi' || !type
-            check_access_to_task(task, :admin)
+            @permission_authorizer.granted_or_raise(task, :admin, token_scopes)
           elsif type == 'event' || type == 'result' || type == 'none'
-            check_access_to_task(task, :read)
+            @permission_authorizer.granted_or_raise(task, :read, token_scopes)
           else
             raise UnauthorizedToAccessDeployment, "Unknown type #{type}"
           end
@@ -28,12 +28,6 @@ module Bosh::Director
       get '/', scope: :list_tasks do
         dataset = Models::Task.dataset
 
-        if limit = params['limit']
-          limit = limit.to_i
-          limit = 1 if limit < 1
-          dataset = dataset.limit(limit)
-        end
-
         states = params['state'].to_s.split(',')
         if states.size > 0
           dataset = dataset.filter(:state => states)
@@ -56,27 +50,21 @@ module Bosh::Director
           ])
         end
 
-        deployment = params['deployment']
-        if deployment
-          dataset = dataset.filter(deployment_name: deployment)
-          deployment = @deployment_manager.find_by_name(deployment)
-          @permission_authorizer.granted_or_raise(deployment, :read, token_scopes)
+        if limit = params['limit']
+          limit = limit.to_i
+          limit = 1 if limit < 1
         end
 
-        tasks = dataset.order_by(Sequel.desc(:timestamp)).map
-
-        unless @permission_authorizer.is_granted?(:director, :read, token_scopes)
-          permitted_deployments = @deployment_manager.all_by_name_asc.select { |deployment|
-              @permission_authorizer.is_granted?(deployment, :read, token_scopes)
-            }.map { |deployment| deployment.name }
-
-          tasks = tasks.select do |task|
-            next false unless task.deployment_name
-            permitted_deployments.include?(task.deployment_name)
-          end
+        if @permission_authorizer.is_granted?(:director, :read, token_scopes) ||
+          @permission_authorizer.is_granted?(:director, :admin, token_scopes)
+          tasks = filter_task_by_deployment_and_teams(dataset, params['deployment'], nil, limit)
+          permitted_tasks = Set.new(tasks)
+        else
+          tasks = filter_task_by_deployment_and_teams(dataset, params['deployment'], token_scopes, limit)
+          permitted_tasks = Set.new(tasks)
         end
 
-        tasks = tasks.map do |task|
+        tasks = permitted_tasks.map do |task|
           if task_timeout?(task)
             task.state = :timeout
             task.save
@@ -84,15 +72,29 @@ module Bosh::Director
           @task_manager.task_to_hash(task)
         end
         content_type(:json)
+
+
         json_encode(tasks)
       end
 
+      def filter_task_by_deployment_and_teams(dataset, deployment, token_scopes, limit)
+          if deployment
+            dataset = dataset.where(deployment_name: deployment)
+          end
+          if token_scopes
+            teams = Models::Team.transform_admin_team_scope_to_teams(token_scopes)
+            dataset = dataset.where(teams: teams)
+          end
+          if limit
+            dataset = dataset.limit(limit)
+          end
+          dataset.order_by(Sequel.desc(:timestamp)).all
+      end
+
+
       get '/:id', scope: :list_tasks do
         task = @task_manager.find_task(params[:id])
-        deployment_name = task.deployment_name
-        if deployment_name
-          check_access_to_deployment(deployment_name, :read)
-        elsif !@permission_authorizer.is_granted?(:director, :read, token_scopes)
+        if !@permission_authorizer.is_granted?(task, :read, token_scopes)
           raise UnauthorizedToAccessDeployment,
             'One of the following scopes is required to access this task: ' +
               @permission_authorizer.list_expected_scope(:director, :read, token_scopes).join(', ')
@@ -134,23 +136,6 @@ module Bosh::Director
 
       private
 
-      def check_access_to_task(task, scope)
-        if task.deployment_name
-          check_access_to_deployment(task.deployment_name, scope)
-        else
-          @permission_authorizer.granted_or_raise(:director, scope, token_scopes)
-        end
-      end
-
-      def check_access_to_deployment(deployment_name, scope)
-        begin
-          deployment = @deployment_manager.find_by_name(deployment_name)
-          @permission_authorizer.granted_or_raise(deployment, scope, token_scopes)
-        rescue DeploymentNotFound
-          @permission_authorizer.granted_or_raise(:director, :admin, token_scopes)
-        end
-      end
-
       def task_timeout?(task)
         # Some of the old task entries might not have the checkpoint_time
         unless task.checkpoint_time

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

@@ -11,7 +11,7 @@ module Bosh::Director
       post '/', :consumes => [:json] do
         validate_user_management_support
 
-        user = @identity_provider.get_user_from_request(request)
+        user = @identity_provider.get_user_from_json(request.body.read)
         @identity_provider.create_user(user)
         status(204)
         nil
@@ -20,7 +20,7 @@ module Bosh::Director
       put '/:username', :consumes => [:json] do
         validate_user_management_support
 
-        user = @identity_provider.get_user_from_request(request)
+        user = @identity_provider.get_user_from_json(request.body.read)
         if user.username != params[:username]
           raise UserImmutableUsername, 'The username is immutable'
         end

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

@@ -0,0 +1,18 @@
+require 'bosh/director/api/controllers/base_controller'
+
+module Bosh::Director
+  module Api::Controllers
+    class VmsController < BaseController
+      delete '/:vm_cid' do
+        vm_cid = params[:vm_cid]
+        task = JobQueue.new.enqueue(
+            current_user,
+            Jobs::DeleteVm,
+            "delete vm #{vm_cid}",
+            [vm_cid]
+        )
+        redirect "/tasks/#{task.id}"
+      end
+    end
+  end
+end

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

@@ -15,14 +15,14 @@ module Bosh::Director
         Bosh::Director::Models::Deployment.order_by(Sequel.asc(:name)).all
       end
 
-      def create_deployment(username, deployment_manifest_file_path, cloud_config, runtime_config, deployment_name, options = {})
+      def create_deployment(username, deployment_manifest_file_path, cloud_config, runtime_config, deployment, options = {})
         cloud_config_id = cloud_config.nil? ? nil : cloud_config.id
         runtime_config_id = runtime_config.nil? ? nil : runtime_config.id
-        JobQueue.new.enqueue(username, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file_path, cloud_config_id, runtime_config_id, options], deployment_name)
+        JobQueue.new.enqueue(username, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file_path, cloud_config_id, runtime_config_id, options], deployment)
       end
 
       def delete_deployment(username, deployment, options = {})
-        JobQueue.new.enqueue(username, Jobs::DeleteDeployment, "delete deployment #{deployment.name}", [deployment.name, options], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::DeleteDeployment, "delete deployment #{deployment.name}", [deployment.name, options], deployment)
       end
 
       def deployment_instances_with_vms(deployment)

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

@@ -0,0 +1,11 @@
+module Bosh::Director
+  module Api
+    class InstanceIgnoreManager
+      def set_ignore_state_for_instance(deployment, instance_group_name, instance_group_id, state)
+        instance = InstanceLookup.new.by_uuid(deployment, instance_group_name, instance_group_id)
+        instance.ignore = state
+        instance.save
+      end
+    end
+  end
+end

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

@@ -61,15 +61,15 @@ module Bosh::Director
           instance = filter_by(deployment, uuid: index_or_id).first
         end
 
-        JobQueue.new.enqueue(username, Jobs::FetchLogs, 'fetch logs', [instance.id, options], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::FetchLogs, 'fetch logs', [instance.id, options], deployment)
       end
 
       def fetch_instances(username, deployment, format)
-        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format, true], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format, true], deployment)
       end
 
       def fetch_instances_with_vm(username, deployment, format)
-        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format], deployment)
       end
 
       def ssh(username, deployment, options)

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

@@ -12,7 +12,7 @@ module Bosh
         end
 
         # User management is supported for backwards compatibility
-        def_delegators :@user_manager, :supports_api_update?, :create_user, :update_user, :delete_user, :get_user_from_request
+        def_delegators :@user_manager, :supports_api_update?, :create_user, :update_user, :delete_user, :get_user_from_json
 
         def client_info
           {'type' => 'basic', 'options' => {}}

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

@@ -2,7 +2,7 @@ module Bosh::Director
   module Api
     class ProblemManager
       def perform_scan(username, deployment)
-        JobQueue.new.enqueue(username, Jobs::CloudCheck::Scan, 'scan cloud', [deployment.name], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::Scan, 'scan cloud', [deployment.name], deployment)
       end
 
       def get_problems(deployment)
@@ -15,11 +15,11 @@ module Bosh::Director
       end
 
       def apply_resolutions(username, deployment, resolutions)
-        JobQueue.new.enqueue(username, Jobs::CloudCheck::ApplyResolutions, 'apply resolutions', [deployment.name, resolutions], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::ApplyResolutions, 'apply resolutions', [deployment.name, resolutions], deployment)
       end
 
       def scan_and_fix(username, deployment, jobs)
-        JobQueue.new.enqueue(username, Jobs::CloudCheck::ScanAndFix, 'scan and fix', [deployment.name, jobs, Bosh::Director::Config.fix_stateful_nodes], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::ScanAndFix, 'scan and fix', [deployment.name, jobs, Bosh::Director::Config.fix_stateful_nodes], deployment)
       end
     end
   end

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

@@ -15,14 +15,21 @@ module Bosh::Director
         releases
       end
 
-      def sorted_release_versions(release)
+      def sorted_release_versions(release, prefix = nil)
         sorted_version_tuples = release.versions_dataset.all.map do |version|
           {
             provided: version,
             parsed: Bosh::Common::Version::ReleaseVersion.parse(version.values[:version])
           }
         end.sort_by { |rv| rv[:parsed] }
-        release_versions = sorted_version_tuples.map do |version|
+
+        unless prefix.nil?
+          sorted_version_tuples = sorted_version_tuples.select do |version_tuple|
+            /^#{prefix}([\.\-\+]|$)/.match(version_tuple[:provided].version.to_s)
+          end
+        end
+
+        sorted_version_tuples.map do |version|
           provided = version[:provided]
           {
             'version' => provided.version.to_s,
@@ -32,8 +39,6 @@ module Bosh::Director
             'job_names' => provided.templates.map(&:name),
           }
         end
-
-        release_versions
       end
 
       def find_by_name(name)

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

@@ -15,7 +15,19 @@ module Bosh::Director
       end
 
       def set_pause_for_all(desired_state)
-        Models::Instance.dataset.update(resurrection_paused: desired_state)
+        Models::DirectorAttribute.create(name: 'resurrection_paused', value: desired_state.to_s)
+      rescue Sequel::ValidationFailed, Sequel::DatabaseError => e
+        error_message = e.message.downcase
+        if error_message.include?('unique') || error_message.include?('duplicate')
+          Models::DirectorAttribute.where(name: 'resurrection_paused').update(value: desired_state.to_s)
+        else
+          raise e
+        end
+      end
+
+      def pause_for_all?
+        record = Models::DirectorAttribute.first(name: 'resurrection_paused')
+        record.nil? || record.value == "false" ? false : true
       end
     end
   end

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

@@ -31,6 +31,7 @@ module Bosh
           controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(@config)
           controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new(@config)
           controllers['/events'] = Bosh::Director::Api::Controllers::EventsController.new(@config)
+          controllers['/vms'] = Bosh::Director::Api::Controllers::VmsController.new(@config)
           controllers
         end
       end

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

@@ -2,7 +2,7 @@ module Bosh::Director
   module Api
     class SnapshotManager
       def create_deployment_snapshot_task(username, deployment, options = {})
-        JobQueue.new.enqueue(username, Jobs::SnapshotDeployment, 'snapshot deployment', [deployment.name, options], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::SnapshotDeployment, 'snapshot deployment', [deployment.name, options], deployment)
       end
 
       def create_snapshot_task(username, instance, options)
@@ -10,7 +10,7 @@ module Bosh::Director
       end
 
       def delete_deployment_snapshots_task(username, deployment)
-        JobQueue.new.enqueue(username, Jobs::DeleteDeploymentSnapshots, 'delete deployment snapshots', [deployment.name], deployment.name)
+        JobQueue.new.enqueue(username, Jobs::DeleteDeploymentSnapshots, 'delete deployment snapshots', [deployment.name], deployment)
       end
 
       def delete_snapshots_task(username, snapshot_cids)

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

@@ -27,26 +27,40 @@ module Bosh::Director
         end
       end
 
-      def latest_by_os(os)
-        stemcells = Bosh::Director::Models::Stemcell.where(:operating_system => os)
+      def latest_by_os(os, prefix = nil)
+        stemcells = Bosh::Director::Models::Stemcell.where(:operating_system => os).all
 
-        if stemcells.nil? || stemcells.empty?
+        if stemcells.empty?
           raise StemcellNotFound,
             "Stemcell with Operating System '#{os}' doesn't exist"
         end
 
-        find_latest(stemcells)
+        latest = find_latest(stemcells, prefix)
+
+        if latest.nil?
+          raise StemcellNotFound,
+            "Stemcell with Operating System '#{os}' exists, but version with prefix '#{prefix}' not found."
+        end
+
+        latest
       end
 
-      def latest_by_name(name)
-        stemcells = Bosh::Director::Models::Stemcell.where(:name => name)
+      def latest_by_name(name, prefix = nil)
+        stemcells = Bosh::Director::Models::Stemcell.where(:name => name).all
 
-        if stemcells.nil? || stemcells.empty?
+        if stemcells.empty?
           raise StemcellNotFound,
             "Stemcell '#{name}' doesn't exist"
         end
 
-        find_latest(stemcells)
+        latest = find_latest(stemcells, prefix)
+
+        if latest.nil?
+          raise StemcellNotFound,
+            "Stemcell '#{name}' exists, but version with prefix '#{prefix}' not found."
+        end
+
+        latest
       end
 
       def find_by_os_and_version(os, version)
@@ -87,7 +101,13 @@ module Bosh::Director
 
       private
 
-      def find_latest(stemcells)
+      def find_latest(stemcells, prefix = nil)
+        unless prefix.nil?
+          stemcells = stemcells.select do |stemcell|
+            stemcell.version =~ /^#{prefix}([\.\-\+]|$)/
+          end
+        end
+
         versions = stemcells.map(&:version)
 
         latest_version = Bosh::Common::Version::StemcellVersionList.parse(versions).latest.to_s

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

@@ -3,13 +3,14 @@ require 'bosh/director/api/task_remover'
 module Bosh::Director
   module Api
     class TaskHelper
-      def create_task(username, type, description, deployment_name)
-        task = Models::Task.create(:username => username,
+      def create_task(username, type, description, deployment)
+        task = Models::Task.create_with_teams(:username => username,
                                    :type => type,
                                    :description => description,
                                    :state => :queued,
-                                   :deployment_name => deployment_name,
+                                   :deployment_name => deployment ? deployment.name : nil,
                                    :timestamp => Time.now,
+                                   :teams => deployment ? deployment.teams : nil,
                                    :checkpoint_time => Time.now)
         log_dir = File.join(Config.base_dir, 'tasks', task.id.to_s)
         task_status_file = File.join(log_dir, 'debug')

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

@@ -7,8 +7,13 @@ module Bosh
         MAX_TOKEN_EXTENSION_TIME_IN_SECONDS = 3600
 
         def initialize(options)
-          @url = options.fetch('url')
-          Config.logger.debug "Initializing UAA Identity provider with url #{@url}"
+          raise ValidationExtraField if options.has_key?('url') && options.has_key?('urls')
+          if options.has_key?('url')
+            @urls = [options.fetch('url')]
+          else
+            @urls = options.fetch('urls')
+          end
+          Config.logger.debug "Initializing UAA Identity provider with urls #{@urls}"
           @token_coder = CF::UAA::TokenCoder.new(skey: options.fetch('symmetric_key', nil), pkey: options.fetch('public_key', nil), scope: [])
         end
 
@@ -20,7 +25,8 @@ module Bosh
           {
             'type' => 'uaa',
             'options' => {
-              'url' => @url
+              'url' => @urls.first,
+              'urls' => @urls
             }
           }
         end