def create
[:repository, :script, :script_version, :script_parameters].each do |r|
if !resource_attrs[r]
- return render json: {
- :errors => ["#{r} attribute must be specified"]
- }, status: :unprocessable_entity
+ return send_error("#{r} attribute must be specified",
+ status: :unprocessable_entity)
end
end
end
if params[:find_or_create]
- load_filters_param
+ return if false.equal?(load_filters_param)
if @filters.empty? # Translate older creation parameters into filters.
- @filters = [:repository, :script].map do |attrsym|
- [attrsym.to_s, "=", resource_attrs[attrsym]]
- end
- @filters.append(["script_version", "in",
- Commit.find_commit_range(current_user,
- resource_attrs[:repository],
- params[:minimum_script_version],
- resource_attrs[:script_version],
- params[:exclude_script_versions])])
+ @filters =
+ [["repository", "=", resource_attrs[:repository]],
+ ["script", "=", resource_attrs[:script]],
+ ["script_version", "in git",
+ params[:minimum_script_version] || resource_attrs[:script_version]],
+ ["script_version", "not in git", params[:exclude_script_versions]],
+ ].reject { |filter| filter.last.nil? or filter.last.empty? }
if image_search = resource_attrs[:runtime_constraints].andand["docker_image"]
- image_tag = resource_attrs[:runtime_constraints]["docker_image_tag"]
- image_locator = Collection.
- uuids_for_docker_image(image_search, image_tag, @read_users).first
- return super if image_locator.nil? # We won't find anything to reuse.
- @filters.append(["docker_image_locator", "=", image_locator])
+ if image_tag = resource_attrs[:runtime_constraints]["docker_image_tag"]
+ image_search += ":#{image_tag}"
+ end
+ @filters.append(["docker_image_locator", "in docker", image_search])
else
@filters.append(["docker_image_locator", "=", nil])
end
- else
- script_info = {"repository" => nil, "script" => nil}
- script_range = Hash.new { |key| [] }
- @filters.select! do |filter|
- if script_info.has_key? filter[0]
- script_info[filter[0]] = filter[2]
- end
- case filter[0..1]
- when ["script_version", "in git"]
- script_range["min_version"] = filter.last
- false
- when ["script_version", "not in"], ["script_version", "not in git"]
- begin
- script_range["exclude_versions"] += filter.last
- rescue TypeError
- script_range["exclude_versions"] << filter.last
- end
- false
- when ["docker_image_locator", "in docker"], ["docker_image_locator", "not in docker"]
- filter[1].sub!(/ docker$/, '')
- filter[2] = Collection.uuids_for_docker_image(filter[2])
- true
- else
- true
- end
+ begin
+ load_job_specific_filters
+ rescue ArgumentError => error
+ return send_error(error.message)
end
+ end
- script_info.each_pair do |key, value|
- raise ArgumentError.new("#{key} filter required") if value.nil?
- end
- unless script_range.empty?
- @filters.append(["script_version", "in",
- Commit.find_commit_range(current_user,
- script_info["repository"],
- script_range["min_version"],
- resource_attrs[:script_version],
- script_range["exclude_versions"])])
+ # Check specified filters for some reasonableness.
+ filter_names = @filters.map { |f| f.first }.uniq
+ ["repository", "script"].each do |req_filter|
+ if not filter_names.include?(req_filter)
+ return send_error("#{req_filter} filter required")
end
end
if j.nondeterministic != true and
((j.success == true and j.output != nil) or j.running == true) and
j.script_parameters == resource_attrs[:script_parameters]
- if j.running
+ if j.running && j.owner_uuid == current_user.uuid
# We'll use this if we don't find a job that has completed
incomplete_job ||= j
else
- # Record the first job in the list
- if !@object
- @object = j
- end
- # Ensure that all candidate jobs actually did produce the same output
- if @object.output != j.output
- @object = nil
- break
+ if Collection.readable_by(current_user).find_by_portable_data_hash(j.output)
+ # Record the first job in the list
+ if !@object
+ @object = j
+ end
+ # Ensure that all candidate jobs actually did produce the same output
+ if @object.output != j.output
+ @object = nil
+ break
+ end
end
end
end
cancelled_at: nil,
success: nil
})
- load_filters_param
+ return if false.equal?(load_filters_param)
find_objects_for_index
index
end
+ def self._create_requires_parameters
+ (super rescue {}).
+ merge({
+ find_or_create: {
+ type: 'boolean', required: false, default: false
+ },
+ filters: {
+ type: 'array', required: false
+ },
+ minimum_script_version: {
+ type: 'string', required: false
+ },
+ exclude_script_versions: {
+ type: 'array', required: false
+ },
+ })
+ end
+
def self._queue_requires_parameters
self._index_requires_parameters
end
+
+ protected
+
+ def load_job_specific_filters
+ # Convert Job-specific @filters entries into general SQL filters.
+ script_info = {"repository" => nil, "script" => nil}
+ script_range = {"exclude_versions" => []}
+ @filters.select! do |filter|
+ if (script_info.has_key? filter[0]) and (filter[1] == "=")
+ if script_info[filter[0]].nil?
+ script_info[filter[0]] = filter[2]
+ elsif script_info[filter[0]] != filter[2]
+ raise ArgumentError.new("incompatible #{filter[0]} filters")
+ end
+ end
+ case filter[0..1]
+ when ["script_version", "in git"]
+ script_range["min_version"] = filter.last
+ false
+ when ["script_version", "not in git"]
+ begin
+ script_range["exclude_versions"] += filter.last
+ rescue TypeError
+ script_range["exclude_versions"] << filter.last
+ end
+ false
+ when ["docker_image_locator", "in docker"], ["docker_image_locator", "not in docker"]
+ filter[1].sub!(/ docker$/, '')
+ search_list = filter[2].is_a?(Enumerable) ? filter[2] : [filter[2]]
+ filter[2] = search_list.flat_map do |search_term|
+ image_search, image_tag = search_term.split(':', 2)
+ Collection.find_all_for_docker_image(image_search, image_tag, @read_users).map(&:portable_data_hash)
+ end
+ true
+ else
+ true
+ end
+ end
+
+ # Build a real script_version filter from any "not? in git" filters.
+ if (script_range.size > 1) or script_range["exclude_versions"].any?
+ script_info.each_pair do |key, value|
+ if value.nil?
+ raise ArgumentError.new("script_version filter needs #{key} filter")
+ end
+ end
+ last_version = begin resource_attrs[:script_version] rescue "HEAD" end
+ version_range = Commit.find_commit_range(current_user,
+ script_info["repository"],
+ script_range["min_version"],
+ last_version,
+ script_range["exclude_versions"])
+ if version_range.nil?
+ raise ArgumentError.
+ new(["error searching #{script_info['repository']} from",
+ "'#{script_range['min_version']}' to '#{last_version}',",
+ "excluding #{script_range['exclude_versions']}"].join(" "))
+ end
+ @filters.append(["script_version", "in", version_range])
+ end
+ end
+
+ def load_filters_param
+ begin
+ super
+ load_job_specific_filters
+ rescue ArgumentError => error
+ send_error(error.message)
+ false
+ end
+ end
end
projects / arvados.git / blobdiff