diff options
Diffstat (limited to 'lib/bulk_imports/common')
| -rw-r--r-- | lib/bulk_imports/common/extractors/ndjson_extractor.rb | 6 | ||||
| -rw-r--r-- | lib/bulk_imports/common/extractors/rest_extractor.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/bulk_imports/common/extractors/ndjson_extractor.rb b/lib/bulk_imports/common/extractors/ndjson_extractor.rb index 79d626001a0..788d10ca364 100644 --- a/lib/bulk_imports/common/extractors/ndjson_extractor.rb +++ b/lib/bulk_imports/common/extractors/ndjson_extractor.rb @@ -7,6 +7,8 @@ module BulkImports include Gitlab::ImportExport::CommandLineUtil include Gitlab::Utils::StrongMemoize + FILE_SIZE_LIMIT = 5.gigabytes + ALLOWED_CONTENT_TYPES = %w(application/gzip application/octet-stream).freeze EXPORT_DOWNLOAD_URL_PATH = "/%{resource}/%{full_path}/export_relations/download?relation=%{relation}" def initialize(relation:) @@ -39,7 +41,9 @@ module BulkImports configuration: context.configuration, relative_url: relative_resource_url(context), dir: tmp_dir, - filename: filename + filename: filename, + file_size_limit: FILE_SIZE_LIMIT, + allowed_content_types: ALLOWED_CONTENT_TYPES ) end diff --git a/lib/bulk_imports/common/extractors/rest_extractor.rb b/lib/bulk_imports/common/extractors/rest_extractor.rb index 2179e0575c5..88315305222 100644 --- a/lib/bulk_imports/common/extractors/rest_extractor.rb +++ b/lib/bulk_imports/common/extractors/rest_extractor.rb @@ -25,7 +25,7 @@ module BulkImports def http_client(configuration) @http_client ||= BulkImports::Clients::HTTP.new( - uri: configuration.url, + url: configuration.url, token: configuration.access_token, per_page: 100 ) |