gitlab-fog-azure-rm 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b58d858add0fa6eb3a7cd2e748232d32506f5d1c1c5ec91dc333137938804c8
-  data.tar.gz: 6863876c31c86b6d8e7eae3a03fb0ced679678ffd515e508e5f854379b878019
+  metadata.gz: ff94ab3a5881a3709300b1a88ee3861f602a56aa675053e92a8b00f2fd9079a2
+  data.tar.gz: e7dbd521f7c7b0d1984ec6aa33005b12b7653741aaa4e9c80f46c66083180713
 SHA512:
-  metadata.gz: 47e8d612e9b2144f46badfc86f7df85a8b39fc35e6b95134a94a5b79cb43786286a0e565a5fbb52e9da9d2eec0510203fe1bb0e5b769b0d32bd74313991b4a6b
-  data.tar.gz: ff4911539b4736ad2dc4d1cd3d541904cf75ac2695c65e2317077cd9200b1aedcac35a3b39e30a2d456d35e8c8b8b6b4d6c6d88d64c63ba9577c9297bd1f270f
+  metadata.gz: c93fcf5a6bbaedceb13c75c3b19e75e1ce0f78c2d8909f6bb84ab9eedf08390520a69e0071667fdf0ac8c618b2476706b6e1a3231daa2f9671f5c0bb654125f7
+  data.tar.gz: 94abb45649b7c9d88f2a916a1a39887ad44a991c3f890df84e9ad3fb4aa73af02c5ea0f968fc1947a64e2af671fc73d53ed7f88ae0fea2196f9810c61e8e88e7

data/.rubocop_todo.yml

@@ -43,7 +43,6 @@ Layout/EndOfLine:
 Layout/HashAlignment:
   Exclude:
     - 'lib/fog/azurerm/models/storage/file.rb'
-    - 'lib/fog/azurerm/requests/storage/create_disk.rb'
     - 'test/test_helper.rb'
 
 # Offense count: 1
@@ -227,7 +226,6 @@ Style/RescueStandardError:
   Exclude:
     - 'lib/fog/azurerm/models/storage/files.rb'
     - 'lib/fog/azurerm/requests/storage/create_block_blob.rb'
-    - 'lib/fog/azurerm/requests/storage/create_disk.rb'
     - 'lib/fog/azurerm/requests/storage/multipart_save_block_blob.rb'
     - 'lib/fog/azurerm/requests/storage/save_page_blob.rb'
     - 'lib/fog/azurerm/requests/storage/wait_blob_copy_operation_to_finish.rb'

data/gitlab-fog-azure-rm.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |spec|
   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'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.89'
   spec.add_development_dependency 'simplecov'
-  spec.add_dependency 'azure_mgmt_storage', '~> 0.21'
   spec.add_dependency 'azure-storage', '~> 0.15.0.preview'
   spec.add_dependency 'fog-core', '= 2.1.0'
   spec.add_dependency 'fog-json', '~> 1.2.0'
-  spec.add_dependency 'mime-types', '~> 3.2.2'
-  spec.add_dependency 'vhd', '0.0.4'
+  spec.add_dependency 'mime-types'
+  spec.add_dependency 'ms_rest_azure', '~> 0.12.0'
 end

data/lib/fog/azurerm/docs/storage.md

@@ -12,32 +12,6 @@ require 'fog/azurerm'
 
 ## Create Connection
 
-Next, create a connection to the Storage Service:
-
-```ruby
-fog_storage_service = Fog::Storage::AzureRM.new(
-  tenant_id: '<Tenant Id>',                                                          # Tenant Id of Azure Active Directory Application
-  client_id:    '<Client Id>',                                                       # Client Id of Azure Active Directory Application
-  client_secret: '<Client Secret>',                                                  # Client Secret of Azure Active Directory Application
-  subscription_id: '<Subscription Id>',                                              # Subscription Id of an Azure Account
-  azure_storage_account_name: '<Storage Account Name>',                              # Name of an Azure Storage Account
-  azure_storage_access_key: '<Storage Account Key>',                                 # Key of an Azure Storage Account
-  environment: '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'     # Azure cloud environment. Default is AzureCloud.
-)
-```
-
-If you only want to manage the storage accounts, you can create the connection without the storage account information:
-
-```ruby
-fog_storage_service = Fog::Storage::AzureRM.new(
-  tenant_id:        '<Tenant Id>',                                                         # Tenant Id of Azure Active Directory Application
-  client_id:        '<Client Id>',                                                         # Client Id of Azure Active Directory Application
-  client_secret:    '<Client Secret>',                                                     # Client Secret of Azure Active Directory Application
-  subscription_id:  '<Subscription Id>',                                                   # Subscription Id of an Azure Account
-  environment:      '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'      # Azure cloud environment. Default is AzureCloud.
-)
-```
-
 If you only want to manage the storage data, you can create the connection without the Azure subscription information:
 
 ```ruby
@@ -48,127 +22,6 @@ fog_storage_service = Fog::Storage::AzureRM.new(
 )
 ```
 
-## Check Name Availability 
-
-This operation checks that account name is valid and is not already in use. _Storage Account Type_ is an optional parameter
-
-```ruby
-fog_storage_service.storage_accounts.check_name_availability('<Storage Account Name>', '<Storage Account Type>')
-```
-
-## Check Storage Account Existence
-
-```ruby
-fog_storage_service.storage_accounts.check_storage_account_exists('<Resource Group Name>', '<Storage Account Name>')
-```
-
-## Create Storage Account
-
-Create a new storage account. Replication attribute for Standard and Premium account types are as follows 
-
-##### Standard 
-
-1. LRS (Standard Locally-redundant storage)
-2. ZRS (Standard Zone-redundant storage)
-3. GRS (Standard Geo-redundant storage)
-4. RAGRS (Standard Read access geo-redundant storage)
-
-##### Premium
-1. LRS (Premium Locally-redundant storage)
-
-```ruby
-fog_storage_service.storage_accounts.create(
-  name:           '<Storage Account name>',
-  location:       '<Location>',
-  resource_group: '<Resource Group Name>',
-  account_type:   '<Standard/Premium>',                                   # [Optional] Default value 'Standard'. Allowed values can only be Standard or Premium
-  replication:    '<Replication Type>',                                    # [Optional] Default value 'LRS'
-  encryption:     <True/False>,                                           # [Optional] Enables encryption. Default is false.
-  tags:           { key1: 'value1', key2: 'value2', keyN: 'valueN' }       # [Optional]
-)
-```
-Premium Storage account store data on solid state drives (SSDs). For more details on standard and premium storage accounts, see [Introduction to Microsoft Azure Storage](https://azure.microsoft.com/en-us/documentation/articles/storage-introduction/) and [Premium Storage: High-Performance Storage for Azure Virtual Machine Workloads](https://azure.microsoft.com/en-us/documentation/articles/storage-premium-storage/).
-
-## List storage accounts
-
-##### List storage accounts in a subscription
-
-```ruby
-fog_storage_service.storage_accounts.each do |storage_acc|
-  puts "#{storage_acc.name}"
-  puts "#{storage_acc.location}"
-end
-```
-##### List storage accounts in a resource group
-
-```ruby
-storage_accounts  = fog_storage_service.storage_accounts(resource_group: '<Resource Group Name>')
-storage_accounts.each do |storage_acc|
-  puts "#{storage_acc.name}"
-  puts "#{storage_acc.location}"
-end
-```
-
-## Retrieve a single Storage Account
-
-Get a single record of Storage Account
-
-```ruby
-storage_acc = fog_storage_service
-                .storage_accounts
-                .get('<Resource Group Name>', '<Storage Account Name>')
-puts "#{storage_acc.name}"
-```
-
-## Enable encryption on Storage Account
-
-Get a single record of Storage Account and enable encryption on that Storage Account
-
-```ruby
-storage_acc = fog_storage_service
-                .storage_accounts
-                .get('<Resource Group Name>', '<Storage Account Name>')
-
-storage_acc.update(encryption: true)
-```
-
-## Get Access Keys
-
-Get access keys of a storage account
-
-```ruby
-keys_hash = storage_acc.get_access_keys
-keys_hash.each do |keys|
-  puts "#{keys.key_name}:  #{keys.value}"
-end
-```
-
-## Destroy a single Storage Account
-
-Get storage account object from the get method and then destroy that storage account.
-
-```ruby
-storage_acc.destroy
-```
-
-## Create a Disk
-
-Create a Disk in storage account. _disk_size_in_gb_ must be an integer and the range is [1, 1023].
-By default the disk will be created in the container 'vhds'. You can specify other container by set options[:container_name].
-
-```ruby
-fog_storage_service.create_disk('<Data Disk Name>', disk_size_in_gb, options = {})
-```
-
-## Delete a Disk
-
-Delete a Disk from a storage account. Disk must be in unlocked state i.e detached from server (virtual machine) to successfully perform this action.
-By default the disk will be deleted from the container 'vhds'. You can specify other container by set options[:container_name].
-
-```ruby
-fog_storage_service.delete_disk('<Data Disk Name>', options = {})
-```
-
 ## Check Storage Container Existence
 
 ```ruby

data/lib/fog/azurerm/storage.rb

@@ -15,9 +15,6 @@ module Fog
       recognizes :debug
 
       request_path 'fog/azurerm/requests/storage'
-      # Azure Storage Disk requests
-      request :delete_disk
-      request :create_disk
       # Azure Storage Container requests
       request :create_container
       request :release_container_lease
@@ -70,7 +67,6 @@ module Fog
       class Mock
         def initialize(_options = {})
           begin
-            require 'azure_mgmt_storage'
             require 'azure/storage'
           rescue LoadError => e
             retry if require('rubygems')
@@ -83,10 +79,8 @@ module Fog
       class Real
         def initialize(options)
           begin
-            require 'azure_mgmt_storage'
             require 'azure/storage'
             require 'securerandom'
-            require 'vhd'
             @debug = ENV['DEBUG'] || options[:debug]
             require 'azure/core/http/debug_filter' if @debug
           rescue LoadError => e

data/lib/fog/azurerm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -54,14 +54,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -90,20 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: azure_mgmt_storage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: azure-storage
   requirement: !ruby/object:Gem::Requirement
@@ -150,30 +136,30 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: vhd
+  name: ms_rest_azure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.12.0
 description: This is a stripped-down fork of fog-azure-rm that enables Azure Blob
   Storage to be used with CarrierWave and Fog.
 email: 
@@ -233,12 +219,10 @@ files:
 - lib/fog/azurerm/requests/storage/copy_object.rb
 - lib/fog/azurerm/requests/storage/create_block_blob.rb
 - lib/fog/azurerm/requests/storage/create_container.rb
-- lib/fog/azurerm/requests/storage/create_disk.rb
 - lib/fog/azurerm/requests/storage/create_page_blob.rb
 - 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_disk.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
@@ -293,12 +277,10 @@ files:
 - test/requests/storage/test_copy_blob_from_uri.rb
 - test/requests/storage/test_create_block_blob.rb
 - test/requests/storage/test_create_container.rb
-- test/requests/storage/test_create_disk.rb
 - test/requests/storage/test_create_page_blob.rb
 - 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_disk.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

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

@@ -1,62 +0,0 @@
-module Fog
-  module Storage
-    class AzureRM
-      # This class provides the actual implementation for service calls.
-      class Real
-        # Create a disk in Azure storage.
-        #
-        # @param disk_name [String] Name of disk
-        # @param disk_size_in_gb [Integer] Disk size in GiB. Value range: [1, 1023]
-        # @param options  [Hash]
-        # @option options [String] container_name Sets name of the container which contains the disk. Default is 'vhds'.
-        #
-        # @return [Boolean]
-        #
-        def create_disk(disk_name, disk_size_in_gb, options = {})
-          msg = "Creating disk(#{disk_name}, #{disk_size_in_gb}). options: #{options}"
-          Fog::Logger.debug msg
-
-          raise ArgumentError, "disk_size_in_gb #{disk_size_in_gb} must be an integer" unless disk_size_in_gb.is_a?(Integer)
-          raise ArgumentError, "Azure minimum disk size is 1 GiB: #{disk_size_in_gb}" if disk_size_in_gb < 1
-          raise ArgumentError, "Azure maximum disk size is 1023 GiB: #{disk_size_in_gb}" if disk_size_in_gb > 1023
-
-          container_name = options.delete(:container_name)
-          container_name = 'vhds' if container_name.nil?
-          blob_name = "#{disk_name}.vhd"
-          vhd_size = disk_size_in_gb * 1024 * 1024 * 1024
-          blob_size = vhd_size + 512
-
-          opts = {
-            type:   :fixed,
-            name: '/tmp/footer.vhd', # Only used to initialize vhd, no local file is generated.
-            size: disk_size_in_gb
-          }
-          vhd_footer = Vhd::Library.new(opts).footer.values.join
-
-          begin
-            create_page_blob(container_name, blob_name, blob_size, options)
-            put_blob_pages(container_name, blob_name, vhd_size, blob_size - 1, vhd_footer, options)
-          rescue
-            begin
-              delete_blob(container_name, blob_name)
-            rescue => ex
-              Fog::Logger.debug "Cannot delete the blob: #{container_name}/#{blob_name} after create_disk failed. #{ex.inspect}"
-            end
-            raise
-          end
-
-          Fog::Logger.debug "Created a disk #{disk_name} successfully."
-          true
-        end
-      end
-
-      # This class provides the mock implementation for unit tests.
-      class Mock
-        def create_disk(*)
-          Fog::Logger.debug 'Disk created successfully.'
-          true
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module Fog
-  module Storage
-    class AzureRM
-      # This class provides the actual implementation for service calls.
-      class Real
-        # Delete a disk in Azure storage.
-        #
-        # @param disk_name [String] Name of disk
-        # @param options  [Hash]
-        # @option options [String] container_name Sets name of the container which contains the disk. Default is 'vhds'.
-        #
-        # @return [Boolean]
-        #
-        def delete_disk(disk_name, options = {})
-          msg = "Deleting disk(#{disk_name}). options: #{options}"
-          Fog::Logger.debug msg
-
-          container_name = options.delete(:container_name)
-          container_name = 'vhds' if container_name.nil?
-          delete_blob(container_name, "#{disk_name}.vhd")
-
-          Fog::Logger.debug "Successfully deleted Disk: #{disk_name}."
-          true
-        end
-      end
-
-      # This class provides the mock implementation for unit tests.
-      class Mock
-        def delete_disk(*)
-          Fog::Logger.debug 'Successfully deleted Disk'
-          true
-        end
-      end
-    end
-  end
-end

data/test/requests/storage/test_create_disk.rb

@@ -1,70 +0,0 @@
-require File.expand_path '../../test_helper', __dir__
-
-# Storage Data Disk Class
-class TestCreateDisk < Minitest::Test
-  # This class posesses the test cases for the request of create disk.
-  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)
-  end
-
-  def test_create_disk_success
-    @service.stub :create_page_blob, true do
-      @service.stub :put_blob_pages, true do
-        assert @service.create_disk('test_disk', 10)
-      end
-    end
-  end
-
-  def test_create_disk_in_another_container_success
-    @service.stub :create_page_blob, true do
-      @service.stub :put_blob_pages, true do
-        assert @service.create_disk('test_disk', 10, container_name: 'test_container')
-      end
-    end
-  end
-
-  def test_create_disk_with_invalid_size_exception
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 'invalid_size')
-    end
-
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 0)
-    end
-
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 1024)
-    end
-  end
-
-  def test_create_disk_http_exception
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_page_blob, http_exception do
-      @service.stub :delete_blob, true do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.create_disk('test_disk', 10, container_name: 'test_container')
-        end
-      end
-    end
-  end
-
-  def test_create_disk_fail_when_delete_blob_http_exception
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_page_blob, http_exception do
-      @service.stub :delete_blob, http_exception do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.create_disk('test_disk', 10, container_name: 'test_container')
-        end
-      end
-    end
-  end
-
-  def test_create_disk_mock
-    assert @mock_service.create_disk('test_disk')
-  end
-end

data/test/requests/storage/test_delete_disk.rb

@@ -1,30 +0,0 @@
-require File.expand_path '../../test_helper', __dir__
-
-# Storage Data Disk Class
-class TestDeleteDisk < Minitest::Test
-  # This class posesses the test cases for the requests of deleting data disks.
-  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)
-  end
-
-  def test_delete_disk_success
-    @service.stub :delete_blob, true do
-      assert @service.delete_disk('test_disk')
-    end
-  end
-
-  def test_delete_disk_in_another_container_success
-    @service.stub :delete_blob, true do
-      assert @service.delete_disk('test_disk', container_name: 'test_container')
-    end
-  end
-
-  def test_delete_disk_mock
-    assert @mock_service.delete_disk('test_disk')
-  end
-end