gitlab-fog-azure-rm 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26308fac90191e41fa3a0cfe59f7c02159c5ac5c846c2fc958038d1fbaa9bf34
-  data.tar.gz: 9b382c3381a912f1c847c7757576f467750d9fedfb08304fa47e663fb7f34ad0
+  metadata.gz: 96a2a16b2feac00c533b0489e6572ccd808c11e44f9f3efab5b69bdc392aea04
+  data.tar.gz: 8e7a5d519fa7002896efb7c00fe7bb73440f875cc0a428dba625695ed6c385bb
 SHA512:
-  metadata.gz: f54b5e063064523fbb79ea1aea50ad6847a20c9ffc47a81ae95d1869d2c487b75b8205b567e7d9cf08d10ac1b0c083661003aef4df3762f81382805d2e950c02
-  data.tar.gz: fa98f14295c821d0d07321adc42080163fc774684a0f8e87611a1921b4a22cbd20d68e3938177840b12f2b96e30d377addd379841161657d704343602de8fcb4
+  metadata.gz: 36e3c183ee97204706d901c25c3791b760980d0dcf84440d2370dddff622f54670db85a11e1badec9853341e661d057d519b990912b626c9d86e16c9461e2ebf
+  data.tar.gz: b20976bdfab522b172572194e2f6f0693129c3f6315910fb9d8331cd11e9855ecce53292f22d982b7d6c7811267bce716cf6e680a04d3bf9e703988ee21b2f1e

data/.gitlab-ci.yml

@@ -14,7 +14,7 @@ test:
     - bundle exec rake test
   parallel:
     matrix:
-      - RUBY_VERSION: [ "2.7", "3.0", "3.1" ]
+      - RUBY_VERSION: [ "2.7", "3.0", "3.1", "3.2" ]
 
 rubocop:
   script:

data/.rubocop.yml

@@ -2,4 +2,4 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
-
+  TargetRubyVersion: 2.7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Unreleased
 
+## 1.7.0
+
+- Fix #get_object return type to be consistent with other Fog providers !36
+- Require Ruby 2.7+ !36
+
+## 1.6.0
+
+- Add get_object request method !34
+- Fix uninitialized constant errors !35
+
+## 1.5.0
+
+- Add delete_object request method !32
+
 ## 1.4.0
 
 -  Move all top-level constants and functions to Fog::AzureRM !30

data/gitlab-fog-azure-rm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://gitlab.com/gitlab-org/gitlab-fog-azure-rm'
   spec.rdoc_options = %w[--charset=UTF-8]
   spec.extra_rdoc_files = %w[README.md]
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.7.0'
   spec.post_install_message = 'Thanks for installing!'
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
   spec.add_development_dependency 'minitest', '~> 5.8.4'

data/lib/fog/azurerm/credentials.rb

@@ -2,7 +2,11 @@ module Fog
   module Credentials
     # This class is managing credentials token
     class AzureRM
-      def self.get_credentials(tenant_id, client_id, client_secret, environment = ENVIRONMENT_AZURE_CLOUD)
+      class << self
+        include Fog::AzureRM::Utilities::General
+      end
+
+      def self.get_credentials(tenant_id, client_id, client_secret, environment = Fog::AzureRM::ENVIRONMENT_AZURE_CLOUD)
         if @credentials.nil? || new_management_credential?(tenant_id, client_id, client_secret, environment)
           get_new_credentials(tenant_id, client_id, client_secret, environment)
         else
@@ -10,7 +14,7 @@ module Fog
         end
       end
 
-      def self.get_token(tenant_id, client_id, client_secret, environment = ENVIRONMENT_AZURE_CLOUD)
+      def self.get_token(tenant_id, client_id, client_secret, environment = Fog::AzureRM::ENVIRONMENT_AZURE_CLOUD)
         get_credentials(tenant_id, client_id, client_secret, environment) if @credentials.nil?
         @token_provider.get_authentication_header
       end

data/lib/fog/azurerm/requests/storage/delete_object.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Storage
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        alias delete_object delete_blob
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        alias delete_object delete_blob
+      end
+    end
+  end
+end

data/lib/fog/azurerm/requests/storage/get_object.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Storage
+    class AzureRM
+      # This class provides the actual implemention for service calls.
+      class Real
+        def get_object(...)
+          blob, body = get_blob(...)
+
+          blob[:body] = body
+          blob
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def get_object(...)
+          blob, body = get_blob(...)
+
+          blob[:body] = body
+          blob
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/storage.rb

@@ -40,9 +40,9 @@ module Fog
       request :compare_container_blobs
       request :acquire_blob_lease
       request :release_blob_lease
-      request :delete_blob
       request :get_blob
       request :get_blob_url
+      request :get_object
       request :get_object_url
       request :get_blob_http_url
       request :get_blob_https_url
@@ -50,8 +50,10 @@ module Fog
       request :put_blob_block
       request :put_blob_https_url
       request :put_object_url
+      request :delete_blob
       request :delete_blob_https_url
       request :delete_object_url
+      request :delete_object
       request :commit_blob_blocks
       request :create_page_blob
       request :put_blob_pages

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.4.0'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

data/rakefile

@@ -5,6 +5,7 @@ task default: :cc_coverage
 task :test do
   ENV['COVERAGE'] = nil
   ENV['CODECLIMATE_REPO_TOKEN'] = nil
+  Dir.glob('test/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/models/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/requests/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
 end
@@ -13,6 +14,7 @@ desc 'Generates a coverage report for minitest-cases using simple-cov'
 task :coverage do
   ENV['CODECLIMATE_REPO_TOKEN'] = nil
   ENV['COVERAGE'] = 'true'
+  Dir.glob('test/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/models/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/requests/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
 end
@@ -21,6 +23,7 @@ desc 'Generates a coverage report for minitest-cases using code-climate'
 task :cc_coverage do
   ENV['COVERAGE'] = nil
   ENV['CODECLIMATE_REPO_TOKEN'] = 'b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd'
+  Dir.glob('test/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/models/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
   Dir.glob('test/requests/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
 end

data/test/requests/storage/test_delete_object.rb

@@ -0,0 +1,42 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Storage Blob Class
+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)
+    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)
+    @blob_client = @service.instance_variable_get(:@blob_client)
+  end
+
+  def test_delete_object_success
+    @blob_client.stub :delete_blob, true do
+      assert @service.delete_object('test_container', 'test_blob')
+    end
+  end
+
+  def test_delete_object_with_not_found_success
+    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_not_found_response) }
+    @blob_client.stub :delete_blob, http_exception do
+      assert @service.delete_object('test_container', 'test_blob')
+    end
+  end
+
+  def test_delete_object_http_exception
+    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
+    @blob_client.stub :delete_blob, http_exception do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        @service.delete_object('test_container', 'test_blob')
+      end
+    end
+  end
+
+  def test_delete_object_mock
+    assert @mock_service.delete_blob('test_container', 'test_blob')
+  end
+end

data/test/requests/storage/test_get_object.rb

@@ -0,0 +1,34 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Storage Blob Class
+class TestGetObject < 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)
+    Fog.unmock!
+    @mocked_response = mocked_storage_http_error
+
+    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @blob_client = @service.instance_variable_get(:@blob_client)
+
+    @raw_cloud_blob = storage_blob
+    @blob = ApiStub::Requests::Storage::File.blob_as_hash
+    @blob_with_content = @blob.merge(body: 'content')
+  end
+
+  def test_get_object_success
+    @blob_client.stub :get_blob, @blob_with_content do
+      assert_equal @blob_with_content, @service.get_object('test_container', 'test_blob')
+    end
+  end
+
+  def test_get_object_not_found
+    exception = ->(*) { raise StandardError.new('Not found(404). Not exist') }
+    @blob_client.stub :get_blob, exception do
+      assert_raises('NotFound') do
+        @service.get_object('test_container', 'test_blob')
+      end
+    end
+  end
+end

data/test/test_credentials.rb

@@ -38,7 +38,7 @@ class TestCredentials < Minitest::Test
   end
 
   def test_get_token_method_with_china_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], ENVIRONMENT_AZURE_CHINA_CLOUD)
+    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
     token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
     token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
       assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
@@ -46,7 +46,7 @@ class TestCredentials < Minitest::Test
   end
 
   def test_get_token_method_with_us_government_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], ENVIRONMENT_AZURE_US_GOVERNMENT)
+    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
     token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
     token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
       assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
@@ -54,7 +54,7 @@ class TestCredentials < Minitest::Test
   end
 
   def test_get_token_method_with_german_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], ENVIRONMENT_AZURE_GERMAN_CLOUD)
+    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
     token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
     token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
       assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -237,6 +237,7 @@ files:
 - lib/fog/azurerm/requests/storage/delete_blob.rb
 - lib/fog/azurerm/requests/storage/delete_blob_https_url.rb
 - lib/fog/azurerm/requests/storage/delete_container.rb
+- lib/fog/azurerm/requests/storage/delete_object.rb
 - lib/fog/azurerm/requests/storage/delete_object_url.rb
 - lib/fog/azurerm/requests/storage/get_blob.rb
 - lib/fog/azurerm/requests/storage/get_blob_http_url.rb
@@ -246,6 +247,7 @@ files:
 - lib/fog/azurerm/requests/storage/get_container_acl.rb
 - lib/fog/azurerm/requests/storage/get_container_properties.rb
 - lib/fog/azurerm/requests/storage/get_container_url.rb
+- lib/fog/azurerm/requests/storage/get_object.rb
 - lib/fog/azurerm/requests/storage/get_object_url.rb
 - lib/fog/azurerm/requests/storage/list_blobs.rb
 - lib/fog/azurerm/requests/storage/list_containers.rb
@@ -294,6 +296,7 @@ files:
 - test/requests/storage/test_delete_blob.rb
 - test/requests/storage/test_delete_blob_https_url.rb
 - test/requests/storage/test_delete_container.rb
+- test/requests/storage/test_delete_object.rb
 - test/requests/storage/test_get_blob.rb
 - test/requests/storage/test_get_blob_http_url.rb
 - test/requests/storage/test_get_blob_https_url.rb
@@ -302,6 +305,7 @@ files:
 - test/requests/storage/test_get_container_acl.rb
 - test/requests/storage/test_get_container_properties.rb
 - test/requests/storage/test_get_container_url.rb
+- test/requests/storage/test_get_object.rb
 - test/requests/storage/test_list_blobs.rb
 - test/requests/storage/test_list_containers.rb
 - test/requests/storage/test_put_blob_block.rb
@@ -331,14 +335,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Blob Storage with CarrierWave and