Merge pull request #2338 from broadinstitute/development

Release 1.106.2

Author: bistline

app/lib/bulk_download_service.rb

@@ -106,7 +106,7 @@ def self.generate_curl_configuration(study_files:,
           file_output_path = RequestUtils.format_path_for_os(
             "#{shortname}/#{file_entry['name']}", os
           )
-          file_config = "--location\nurl=\"#{file_entry['url']}\"\noutput=\"#{file_output_path}\""
+          file_config = "--location\nurl=\"#{file_entry['azul_url']}\"\noutput=\"#{file_output_path}\""
           azul_file_configs << file_config
         end
       end

app/models/import_service_config/hca.rb

@@ -47,7 +47,7 @@ def id_from_method; end
     def id_from; end
 
     def file_access_info
-      load_file&.[]('url')
+      load_file&.[]('azul_url')
     end
 
     def study_default_settings

config/application.rb

@@ -29,7 +29,7 @@ class Application < Rails::Application
     config.middleware.use Rack::Brotli
 
     # Docker image for file parsing via scp-ingest-pipeline
-    config.ingest_docker_image = 'gcr.io/broad-singlecellportal-staging/scp-ingest-pipeline:1.43.3'
+    config.ingest_docker_image = 'gcr.io/broad-singlecellportal-staging/scp-ingest-pipeline:1.43.4'
 
     # Docker image for image pipeline jobs
     config.image_pipeline_docker_image = 'gcr.io/broad-singlecellportal-staging/image-pipeline:0.1.0_c2b090043'

test/integration/external/hca_azul_client_test.rb

@@ -150,7 +150,7 @@ def get_entries_from_response(response, key)
     files = ApplicationController.hca_azul_client.files(size: 1)
     assert_equal 1, files.size
     file = files.first
-    keys = %w[name format size url fileSource].sort
+    keys = %w[name format size azul_url accessible fileSource].sort
     assert_equal keys, file.keys.sort & keys
   end
 
@@ -159,7 +159,7 @@ def get_entries_from_response(response, key)
     files = ApplicationController.hca_azul_client.files(query: @query_json, size: 1)
     assert_equal 1, files.size
     file = files.first
-    keys = %w[name format size url fileSource].sort
+    keys = %w[name format size azul_url accessible fileSource].sort
     assert_equal keys, file.keys.sort & keys
   end