gitlab-fog-azure-rm 1.8.0 → 1.9.0

data/test/models/storage/test_directories.rb

@@ -3,8 +3,8 @@ require File.expand_path '../../test_helper', __dir__
 # Test class for Container Collection
 class TestDirectories < Minitest::Test
   def setup
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
-    @directories = Fog::Storage::AzureRM::Directories.new(service: @service)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    @directories = Fog::AzureRM::Storage::Directories.new(service: @service)
 
     @container_list = ApiStub::Models::Storage::Directory.container_list
     @container = ApiStub::Models::Storage::Directory.container
@@ -25,10 +25,10 @@ class TestDirectories < Minitest::Test
   def test_all_method_success
     @service.stub :list_containers, @container_list do
       dirs = @directories.all
-      assert_instance_of Fog::Storage::AzureRM::Directories, dirs
+      assert_instance_of Fog::AzureRM::Storage::Directories, dirs
       assert_equal @container_list.size, dirs.size
       dirs.each do |directory|
-        assert_instance_of Fog::Storage::AzureRM::Directory, directory
+        assert_instance_of Fog::AzureRM::Storage::Directory, directory
         assert_equal 'unknown', directory.attributes[:acl]
       end
     end
@@ -38,7 +38,7 @@ class TestDirectories < Minitest::Test
     @service.stub :get_container_properties, @container do
       @service.stub :list_blobs, @blob_list do
         directory = @directories.get('test_container')
-        assert_instance_of Fog::Storage::AzureRM::Directory, directory
+        assert_instance_of Fog::AzureRM::Storage::Directory, directory
         assert_equal 'unknown', directory.attributes[:acl]
       end
     end

data/test/models/storage/test_directory.rb

@@ -3,7 +3,7 @@ require File.expand_path '../../test_helper', __dir__
 # Test class for Storage Container Model
 class TestDirectory < Minitest::Test
   def setup
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @directory = directory(@service)
 
     @container = ApiStub::Models::Storage::Directory.container
@@ -100,7 +100,7 @@ class TestDirectory < Minitest::Test
   end
 
   def test_files_method_success
-    assert_instance_of Fog::Storage::AzureRM::Files, @directory.files
+    assert_instance_of Fog::AzureRM::Storage::Files, @directory.files
   end
 
   def test_set_public_method_success

data/test/models/storage/test_file.rb

@@ -3,7 +3,7 @@ require File.expand_path '../../test_helper', __dir__
 # Test class for Storage Container Model
 class TestFile < Minitest::Test # rubocop:disable Metrics/ClassLength
   def setup
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @directory = directory(@service)
     @file = file(@service)
     @raw_cloud_blob = storage_blob
@@ -171,7 +171,7 @@ class TestFile < Minitest::Test # rubocop:disable Metrics/ClassLength
       @service.stub :copy_blob, [copy_id, copy_status] do
         @service.stub :wait_blob_copy_operation_to_finish, true do
           target_file = @file.copy('target_container', 'target_blob')
-          assert_instance_of Fog::Storage::AzureRM::File, target_file
+          assert_instance_of Fog::AzureRM::Storage::File, target_file
         end
       end
     end
@@ -290,8 +290,20 @@ class TestFile < Minitest::Test # rubocop:disable Metrics/ClassLength
   end
 
   def test_url_method_with_response_content_disposition
-    @file.collection.stub :get_url, @blob_https_url, { content_disposition: 'attachment' } do
-      assert @file.url(Time.now + 3600, { query: { 'response-content-disposition' => 'attachment' } }), @blob_https_url
+    fake = Minitest::Mock.new
+    expiry = Time.now + 3600
+    fake.expect :call, nil, [@file.key, expiry, { content_disposition: 'attachment', content_type: nil }]
+    @file.collection.stub(:get_url, fake) do
+      @file.url(expiry, { query: { 'response-content-disposition' => 'attachment' } })
+    end
+  end
+
+  def test_url_method_with_response_content_type
+    fake = Minitest::Mock.new
+    expiry = Time.now + 3600
+    fake.expect :call, nil, [@file.key, expiry, { content_disposition: nil, content_type: 'image/png' }]
+    @file.collection.stub(:get_url, fake) do
+      @file.url(expiry, { query: { 'response-content-type' => 'image/png' } })
     end
   end
 

data/test/models/storage/test_files.rb

@@ -3,7 +3,7 @@ require File.expand_path '../../test_helper', __dir__
 # Test class for Blob Collection
 class TestFiles < Minitest::Test
   def setup
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @directory = directory(@service)
     @files = @directory.files
 
@@ -49,7 +49,7 @@ class TestFiles < Minitest::Test
     @service.stub :get_container_properties, @container do
       @service.stub :list_blobs, @blob_list do
         files = @files.all
-        assert_instance_of Fog::Storage::AzureRM::Files, files
+        assert_instance_of Fog::AzureRM::Storage::Files, files
         assert_equal @blob_list[:blobs].size, files.size
       end
     end
@@ -76,7 +76,7 @@ class TestFiles < Minitest::Test
         @files.next_marker = nil
         j = 0
         @files.each do |file|
-          assert_instance_of Fog::Storage::AzureRM::File, file
+          assert_instance_of Fog::AzureRM::Storage::File, file
           j += 1
         end
         assert_equal @blob_list[:blobs].size, j
@@ -85,7 +85,7 @@ class TestFiles < Minitest::Test
   end
 
   def test_each_method_with_parts
-    assert_instance_of Fog::Storage::AzureRM::Files, @files.each
+    assert_instance_of Fog::AzureRM::Storage::Files, @files.each
 
     multiple_values = lambda do |_container_name, options|
       if options[:marker] == 'marker'
@@ -104,7 +104,7 @@ class TestFiles < Minitest::Test
       @service.stub :list_blobs, multiple_values do
         j = 0
         @files.each do |file|
-          assert_instance_of Fog::Storage::AzureRM::File, file
+          assert_instance_of Fog::AzureRM::Storage::File, file
           j += 1
         end
         assert_equal @blob_list[:blobs].size, j
@@ -116,7 +116,7 @@ class TestFiles < Minitest::Test
     content = 'data'
     @service.stub :get_blob, [@blob, content] do
       file = @files.get('test_blob')
-      assert_instance_of Fog::Storage::AzureRM::File, file
+      assert_instance_of Fog::AzureRM::Storage::File, file
       assert_equal content, file.body
     end
   end
@@ -193,7 +193,7 @@ class TestFiles < Minitest::Test
   def test_head_method_success
     @service.stub :get_blob_properties, @blob do
       file = @files.head('test_blob')
-      assert_instance_of Fog::Storage::AzureRM::File, file
+      assert_instance_of Fog::AzureRM::Storage::File, file
       assert file.attributes[:body].nil?
     end
   end
@@ -222,7 +222,7 @@ class TestFiles < Minitest::Test
   end
 
   def test_new_method_success
-    assert_instance_of Fog::Storage::AzureRM::File, @files.new
+    assert_instance_of Fog::AzureRM::Storage::File, @files.new
   end
 
   def test_new_method_without_directory_exception

data/test/requests/storage/test_acquire_blob_lease.rb

@@ -5,11 +5,11 @@ class TestAcquireBlobLease < Minitest::Test
   # This class posesses the test cases for the requests of acquire blob lease.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_lease_id = ApiStub::Requests::Storage::File.blob_lease_id

data/test/requests/storage/test_acquire_container_lease.rb

@@ -5,11 +5,11 @@ class TestAcquireContainerLease < Minitest::Test
   # This class posesses the test cases for the requests of acquire container lease.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @container_lease_id = ApiStub::Requests::Storage::Directory.container_lease_id

data/test/requests/storage/test_check_container_exists.rb

@@ -4,7 +4,7 @@ require File.expand_path '../../test_helper', __dir__
 class TestCheckContainerExists < Minitest::Test
   # This class posesses the test cases for the requests of checking container exists.
   def setup
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @container = ApiStub::Requests::Storage::Directory.container

data/test/requests/storage/test_commit_blob_blocks.rb

@@ -5,11 +5,11 @@ class TestCommitBlobBlocks < Minitest::Test
   # This class posesses the test cases for the requests of committing blob blocks.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_compare_container_blobs.rb

@@ -5,11 +5,11 @@ class TestCompareContainerBlobs < Minitest::Test
   # This class posesses the test cases for the requests of comparing blobs.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_list = ApiStub::Requests::Storage::File.blob_list

data/test/requests/storage/test_copy_blob.rb

@@ -5,11 +5,11 @@ class TestCopyBlob < Minitest::Test
   # This class posesses the test cases for the requests of copying blobs.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_copy_result = ApiStub::Requests::Storage::File.blob_copy_result

data/test/requests/storage/test_copy_blob_from_uri.rb

@@ -5,11 +5,11 @@ class TestCopyBlobFromUri < Minitest::Test
   # This class posesses the test cases for the requests of copying blobs from uri.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_copy_result = ApiStub::Requests::Storage::File.blob_copy_result

data/test/requests/storage/test_create_block_blob.rb

@@ -5,11 +5,11 @@ class TestCreateBlockBlob < Minitest::Test
   # This class posesses the test cases for the requests of creating block blob.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @block_blob = ApiStub::Requests::Storage::File.block_blob

data/test/requests/storage/test_create_container.rb

@@ -5,11 +5,11 @@ class TestCreateContainer < Minitest::Test
   # This class posesses the test cases for the requests of creating storage containers.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @container = ApiStub::Requests::Storage::Directory.container

data/test/requests/storage/test_create_page_blob.rb

@@ -5,11 +5,11 @@ class TestCreatePageBlob < Minitest::Test
   # This class posesses the test cases for the requests of creating storage page blobs.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_delete_blob.rb

@@ -5,12 +5,12 @@ class TestDeleteBlob < Minitest::Test
   # This class posesses the test cases for the requests of deleting storage blobs.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
     @mocked_not_found_response = mocked_storage_http_not_found_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_delete_blob_https_url.rb

@@ -1,27 +1,24 @@
 require File.expand_path '../../test_helper', __dir__
 
 # Storage Blob Class
-class TestPutBlobHttpUrl < Minitest::Test
+class TestDeleteBlobHttpsUrl < Minitest::Test
   # This class posesses the test cases for the requests of Blob service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
-    @blob_client = @service.instance_variable_get(:@blob_client)
-    @signature_client = @service.instance_variable_get(:@signature_client)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    @signature_client = @service.send(:signature_client, Minitest::Mock.new)
 
     @url = ApiStub::Requests::Storage::File.blob_https_url
     @token = ApiStub::Requests::Storage::File.blob_url_token
   end
 
   def test_delete_blob_http_urls_success
-    @blob_client.stub :generate_uri, @url do
-      @signature_client.stub :generate_service_sas_token, @token do
-        assert_equal "#{@url}?#{@token}", @service.delete_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
-        assert_equal "#{@url}?#{@token}", @service.delete_object_url('test_container', 'test_blob', Time.now.utc + 3600)
-      end
+    @signature_client.stub :generate_service_sas_token, @token do
+      assert_equal "#{@url}?#{@token}", @service.delete_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+      assert_equal "#{@url}?#{@token}", @service.delete_object_url('test_container', 'test_blob', Time.now.utc + 3600)
     end
   end
 

data/test/requests/storage/test_delete_container.rb

@@ -5,12 +5,12 @@ class TestDeleteContainer < Minitest::Test
   # This class posesses the test cases for the requests of deleting storage containers.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
     @mocked_not_found_response = mocked_storage_http_not_found_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_delete_object.rb

@@ -5,12 +5,12 @@ class TestDeleteObject < Minitest::Test
   # This class posesses the test cases for the requests of deleting storage blobs.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
     @mocked_not_found_response = mocked_storage_http_not_found_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_get_blob.rb

@@ -5,11 +5,11 @@ class TestGetBlob < Minitest::Test
   # This class posesses the test cases for the requests of getting storage blob.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @raw_cloud_blob = storage_blob

data/test/requests/storage/test_get_blob_encoding.rb

@@ -0,0 +1,45 @@
+require File.expand_path '../../test_helper', __dir__
+
+require 'webrick'
+
+class TestGetBlobGzipped < Minitest::Test
+  def setup
+    @server = WEBrick::HTTPServer.new(
+      BindAddress: '127.0.0.1',
+      Port: 0,
+      Logger: WEBrick::Log.new(nil, 0),
+      AccessLog: []
+    )
+    @server_uri = URI.parse("http://#{@server.config.values_at(:BindAddress, :Port).join(':')}/test")
+    @thread = Thread.new do
+      @server.start
+    end
+
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    @blob_client = @service.instance_variable_get(:@blob_client)
+  end
+
+  def teardown
+    @server&.shutdown
+    @thread&.join
+  end
+
+  def test_get_blob_with_encoding
+    io = StringIO.new.binmode
+    gzip = Zlib::GzipWriter.new(io)
+    gzip.write "Hello world.\n"
+    gzip.close
+
+    @server.mount_proc '/' do |_request, response|
+      response.header['Content-Encoding'] = 'gzip'
+      response.body = io.string
+    end
+
+    blob, content = @blob_client.stub :generate_uri, @server_uri do
+      @service.get_blob('test_container', 'test_blob')
+    end
+
+    assert_equal 'gzip', blob.properties[:content_encoding]
+    assert_equal io.string, content
+  end
+end

data/test/requests/storage/test_get_blob_http_url.rb

@@ -5,22 +5,20 @@ class TestGetBlobHttpUrl < Minitest::Test
   # This class posesses the test cases for the requests of Blob service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
-    @signature_client = @service.instance_variable_get(:@signature_client)
+    @signature_client = @service.send(:signature_client, Minitest::Mock.new)
 
     @url = ApiStub::Requests::Storage::File.blob_https_url.gsub('https:', 'http:')
     @token = ApiStub::Requests::Storage::File.blob_url_token
   end
 
   def test_get_blob_http_url_success
-    @blob_client.stub :generate_uri, @url do
-      @signature_client.stub :generate_service_sas_token, @token do
-        assert_equal "#{@url}?#{@token}", @service.get_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
-      end
+    @signature_client.stub :generate_service_sas_token, @token do
+      assert_equal "#{@url}?#{@token}", @service.get_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
     end
   end
 
@@ -29,7 +27,7 @@ class TestGetBlobHttpUrl < Minitest::Test
     mock_generate_service_token = Minitest::Mock.new
     url_params = { content_disposition: 'attachment' }
 
-    mock_generate_uri.expect(:call, @url, ['test_container/test_blob', {}, { encode: true }])
+    mock_generate_uri.expect(:call, URI.parse(@url), ['test_container/test_blob', {}, { encode: true }])
     mock_generate_service_token.expect(:call, @token) do |_relative_path, params|
       params[:service] == 'b' &&
         params[:resource] == 'b' &&
@@ -49,7 +47,7 @@ class TestGetBlobHttpUrl < Minitest::Test
     mock_generate_uri = Minitest::Mock.new
     mock_generate_service_token = Minitest::Mock.new
 
-    mock_generate_uri.expect(:call, @url, ['.test0/..test1/...test2', {}, { encode: true }])
+    mock_generate_uri.expect(:call, URI.parse(@url), ['.test0/..test1/...test2', {}, { encode: true }])
     mock_generate_service_token.expect(:call, @token) do |relative_path, _|
       relative_path == '.test0/..test1/...test2'
     end
@@ -61,6 +59,12 @@ class TestGetBlobHttpUrl < Minitest::Test
     end
   end
 
+  def test_get_url_https_in_container_and_blob_names
+    uri = URI.parse(@service.get_blob_http_url('https://container', 'https://blob', Time.now.utc + 3600))
+    assert_equal 'http', uri.scheme
+    assert_equal '/https://container/https://blob', CGI.unescape(uri.path)
+  end
+
   def test_get_blob_http_url_mock
     assert_equal "#{@url}?#{@token}", @mock_service.get_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
   end