gitlab-fog-azure-rm 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff94ab3a5881a3709300b1a88ee3861f602a56aa675053e92a8b00f2fd9079a2
-  data.tar.gz: e7dbd521f7c7b0d1984ec6aa33005b12b7653741aaa4e9c80f46c66083180713
+  metadata.gz: 4bd2316f969712b2c31599625d5dda1b32b86a14f15eeacfc1c592cb52caf685
+  data.tar.gz: d5d9e38bed8754e15bfb2addd9ff3700b2f55163ea7c9af0c234e506844ee757
 SHA512:
-  metadata.gz: c93fcf5a6bbaedceb13c75c3b19e75e1ce0f78c2d8909f6bb84ab9eedf08390520a69e0071667fdf0ac8c618b2476706b6e1a3231daa2f9671f5c0bb654125f7
-  data.tar.gz: 94abb45649b7c9d88f2a916a1a39887ad44a991c3f890df84e9ad3fb4aa73af02c5ea0f968fc1947a64e2af671fc73d53ed7f88ae0fea2196f9810c61e8e88e7
+  metadata.gz: 61aed8b7727288feee5ff45b3e6a20d7819d474b45a0a0e966f1990e09ac9936f7762a2d0c589051e6149eee7088f558b0c9a12ba26e95a917630da8665a37b9
+  data.tar.gz: 3d6e9585c720b587ebcf3bc3336a27a3e77eec76aa787f581600f492a16edb40e13d97b3277c21e85060e83f397552341acbfa07a271b3a86bbf78a4e1142dfc

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## Unreleased
+
+## 0.8.0
+
+- Add `azure_storage_domain` for specifying custom domain
+
+## 0.7.0
+
+- Loosen mime-types version dependency !9
+- Drop azure_mgmt_storage and other dependencies !8
+
+## 0.6.0
+
+- Fix get_object_url !7
+- Add get_object_url method !6
+- Add support for copy_object !5
+- Add support for DELETE blob !4
+- Add support for PUT blobs !3
+- Add and update Rubocop files !2
+- Delete all code except blob storage-related functionality !1
+
 ## 0.5.2
 
 **Added**

data/lib/fog/azurerm/storage.rb

@@ -12,6 +12,8 @@ module Fog
       # Recognizes when creating data client
       recognizes :azure_storage_account_name
       recognizes :azure_storage_access_key
+      recognizes :azure_storage_domain
+
       recognizes :debug
 
       request_path 'fog/azurerm/requests/storage'
@@ -104,10 +106,18 @@ module Fog
 
           @azure_storage_account_name = options[:azure_storage_account_name]
           @azure_storage_access_key = options[:azure_storage_access_key]
+          @azure_storage_domain = options[:azure_storage_domain]
+
+          domain =
+            if @azure_storage_domain.nil? || @azure_storage_domain.empty?
+              get_blob_endpoint(@azure_storage_account_name, true, @environment)
+            else
+              get_blob_endpoint_with_domain(@azure_storage_account_name, true, @azure_storage_domain)
+            end
 
           azure_client = Azure::Storage::Client.create(storage_account_name: @azure_storage_account_name,
                                                        storage_access_key: @azure_storage_access_key)
-          azure_client.storage_blob_host = get_blob_endpoint(@azure_storage_account_name, true, @environment)
+          azure_client.storage_blob_host = domain
           @blob_client = azure_client.blob_client
           @blob_client.with_filter(Azure::Storage::Core::Filter::ExponentialRetryPolicyFilter.new)
           @blob_client.with_filter(Azure::Core::Http::DebugFilter.new) if @debug

data/lib/fog/azurerm/utilities/general.rb

@@ -125,6 +125,11 @@ def get_blob_endpoint(storage_account_name, enable_https = false, environment =
   "#{protocol}://#{storage_account_name}.blob#{storage_endpoint_suffix(environment)}"
 end
 
+def get_blob_endpoint_with_domain(storage_account_name, enable_https = false, domain = 'blob.core.windows.net')
+  protocol = enable_https ? 'https' : 'http'
+  "#{protocol}://#{storage_account_name}.#{domain}"
+end
+
 def current_time
   time = Time.now.to_f.to_s
   time.split(/\W+/).join

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/rakefile

@@ -1,4 +1,6 @@
 require 'rake/testtask'
+require 'bundler/gem_tasks'
+
 task default: :cc_coverage
 task :test do
   ENV['COVERAGE'] = nil

data/test/requests/storage/test_get_blob_https_url.rb

@@ -25,6 +25,22 @@ class TestGetBlobHttpsUrl < Minitest::Test
     end
   end
 
+  def test_get_blob_https_url_with_domain_success
+    service = Fog::Storage::AzureRM.new(storage_account_credentials_with_domain)
+    blob_client = service.instance_variable_get(:@blob_client)
+    signature_client = service.instance_variable_get(:@signature_client)
+
+    url = 'https://mockaccount.test.example.com/test_container/test_blob'
+    token = ApiStub::Requests::Storage::File.blob_url_token
+
+    blob_client.stub :generate_uri, url do
+      signature_client.stub :generate_service_sas_token, token do
+        assert_equal "#{url}?#{token}", service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+        assert_equal "#{url}?#{token}", service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
+      end
+    end
+  end
+
   def test_get_blob_https_url_mock
     assert_equal "#{@url}?#{@token}", @mock_service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
     assert_equal "#{@url}?#{@token}", @mock_service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)

data/test/test_helper.rb

@@ -36,6 +36,14 @@ def storage_account_credentials
   }
 end
 
+def storage_account_credentials_with_domain
+  storage_account_credentials.merge(
+    {
+      azure_storage_domain: 'test.example.com'
+    }
+  )
+end
+
 # Mock Class for Blob
 class MockBlob
   def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter