gitlab-fog-azure-rm 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce981ede9f77d01f6cfabd05f9b7bb77aff52a15ade7ac87ed441880178858f
-  data.tar.gz: e3b730ce6e3aa6ea507ab5352dbb0e3e56416abf5624fa763a4932e858efe649
+  metadata.gz: 8e22573f58ecdd3a318e5b75145645b6828d557320e00d3833ac6bb552c12a27
+  data.tar.gz: 02e55258c8128b9e00cdcf1d4659e270b58f9382b362555c49a73f260586e129
 SHA512:
-  metadata.gz: a9d42e20bed0c4b5c53757098ac751555c126dec547b19c133b7e130bba1c20ca1ca2b3cf1d4976391b0a06a66daaa268dba9a0b38eeb7a6258a187c78aa66e2
-  data.tar.gz: 88480526e3e2f0565fc3c24009a09bf482c721c9f14dacd39a5d2ecfdbfe909498a798ebbff8f7745df348c3f251fc69c20a1bcddff0090cd5e9becbe2a15378
+  metadata.gz: 65983b2a6caa2de4444fdde0b27053519588df069809894445c52123242afedfc3f5357434c754b361e5234eae5230ac86c1b3d208b10ea2615fbdb74bb8e347
+  data.tar.gz: bad2b6523176bc008228137172e50f1059333f59428de88e7cc237892650056e92987aff983436ef1086b12cdf8c5e72f4cf0c7727059b88b6af5fcd71a3f224

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 1.6.0
+
+- Add get_object request method !34
+- Fix uninitialized constant errors !35
+
 ## 1.5.0
 
 - Add delete_object request method !32

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

@@ -3,17 +3,12 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def delete_object(container_name, blob_name)
-          delete_blob(container_name, blob_name)
-        end
+        alias delete_object delete_blob
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        def delete_object(*)
-          Fog::Logger.debug 'Blob deleted successfully.'
-          true
-        end
+        alias delete_object delete_blob
       end
     end
   end

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

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

data/lib/fog/azurerm/storage.rb

@@ -42,6 +42,7 @@ module Fog
       request :release_blob_lease
       request :get_blob
       request :get_blob_url
+      request :get_object
       request :get_object_url
       request :get_blob_http_url
       request :get_blob_https_url

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.5.0'.freeze
+    VERSION = '1.6.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_get_blob.rb

@@ -26,6 +26,12 @@ class TestGetBlob < Minitest::Test
     end
   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_blob_not_found
     exception = ->(*) { raise StandardError.new('Not found(404). Not exist') }
     @blob_client.stub :get_blob, exception do
@@ -35,6 +41,15 @@ class TestGetBlob < Minitest::Test
     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
+
   def test_get_blob_http_exception
     http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
     @blob_client.stub :get_blob, http_exception do

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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -247,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