gitlab-fog-azure-rm 1.7.0 → 1.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -90,6 +90,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: azure-storage-blob
   requirement: !ruby/object:Gem::Requirement
@@ -122,30 +136,30 @@ dependencies:
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -160,20 +174,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ms_rest_azure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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:
@@ -201,19 +201,10 @@ files:
 - lib/fog/azurerm/async_response.rb
 - lib/fog/azurerm/config.rb
 - lib/fog/azurerm/constants.rb
-- lib/fog/azurerm/credentials.rb
 - lib/fog/azurerm/custom_fog_errors.rb
 - lib/fog/azurerm/docs/storage.md
 - lib/fog/azurerm/docs/structure.md
-- lib/fog/azurerm/models/resources/azure_resource.rb
-- lib/fog/azurerm/models/resources/azure_resources.rb
-- lib/fog/azurerm/models/resources/dependency.rb
-- lib/fog/azurerm/models/resources/deployment.rb
-- lib/fog/azurerm/models/resources/deployments.rb
-- lib/fog/azurerm/models/resources/provider.rb
-- lib/fog/azurerm/models/resources/provider_resource_type.rb
-- lib/fog/azurerm/models/resources/resource_group.rb
-- lib/fog/azurerm/models/resources/resource_groups.rb
+- lib/fog/azurerm/identity_encoding_filter.rb
 - lib/fog/azurerm/models/storage/directories.rb
 - lib/fog/azurerm/models/storage/directory.rb
 - lib/fog/azurerm/models/storage/file.rb
@@ -252,6 +243,7 @@ files:
 - lib/fog/azurerm/requests/storage/list_blobs.rb
 - lib/fog/azurerm/requests/storage/list_containers.rb
 - lib/fog/azurerm/requests/storage/put_blob_block.rb
+- lib/fog/azurerm/requests/storage/put_blob_http_url.rb
 - lib/fog/azurerm/requests/storage/put_blob_https_url.rb
 - lib/fog/azurerm/requests/storage/put_blob_metadata.rb
 - lib/fog/azurerm/requests/storage/put_blob_pages.rb
@@ -278,7 +270,6 @@ files:
 - test/integration/blob.rb
 - test/integration/container.rb
 - test/integration/credentials/azure.yml
-- test/integration/storage_account.rb
 - test/models/storage/test_directories.rb
 - test/models/storage/test_directory.rb
 - test/models/storage/test_file.rb
@@ -298,6 +289,7 @@ files:
 - 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_encoding.rb
 - test/requests/storage/test_get_blob_http_url.rb
 - test/requests/storage/test_get_blob_https_url.rb
 - test/requests/storage/test_get_blob_properties.rb
@@ -309,6 +301,7 @@ files:
 - test/requests/storage/test_list_blobs.rb
 - test/requests/storage/test_list_containers.rb
 - test/requests/storage/test_put_blob_block.rb
+- test/requests/storage/test_put_blob_http_url.rb
 - test/requests/storage/test_put_blob_https_url.rb
 - test/requests/storage/test_put_blob_metadata.rb
 - test/requests/storage/test_put_blob_pages.rb
@@ -319,8 +312,6 @@ files:
 - test/requests/storage/test_release_container_lease.rb
 - test/requests/storage/test_save_page_blob.rb
 - test/requests/storage/test_wait_blob_copy_operation_to_finish.rb
-- test/smoke_tests/compute/test_resource_group_smoke.rb
-- test/test_credentials.rb
 - test/test_helper.rb
 homepage: https://gitlab.com/gitlab-org/gitlab-fog-azure-rm
 licenses:
@@ -342,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Blob Storage with CarrierWave and

data/lib/fog/azurerm/credentials.rb

@@ -1,44 +0,0 @@
-module Fog
-  module Credentials
-    # This class is managing credentials token
-    class AzureRM
-      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
-          @credentials
-        end
-      end
-
-      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
-
-      def self.get_new_credentials(tenant_id, client_id, client_secret, environment)
-        @tenant_id = tenant_id
-        @client_id = client_id
-        @client_secret = client_secret
-        @environment = environment
-        return if @tenant_id.nil? || @client_id.nil? || @client_secret.nil?
-        @token_provider = MsRestAzure::ApplicationTokenProvider.new(@tenant_id, @client_id, @client_secret, active_directory_service_settings(environment))
-        @credentials = MsRest::TokenCredentials.new(@token_provider)
-        @credentials
-      end
-
-      def self.new_management_credential?(tenant_id, client_id, client_secret, environment)
-        @tenant_id != tenant_id ||
-          @client_id != client_id ||
-          @client_secret != client_secret ||
-          @environment != environment
-      end
-
-      private_class_method :get_new_credentials
-      private_class_method :new_management_credential?
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/azure_resource.rb

@@ -1,25 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # This class is giving implementation of create/save and
-      # delete/destroy for resources.
-      class AzureResource < Fog::Model
-        attribute :id
-        attribute :name
-        attribute :type
-        attribute :location
-        attribute :tags
-
-        def self.parse(resource)
-          hash = {}
-          hash['id'] = resource.id
-          hash['name'] = resource.name
-          hash['type'] = resource.type
-          hash['location'] = resource.location
-          hash['tags'] = resource.tags
-          hash
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/azure_resources.rb

@@ -1,40 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # This class is giving implementation of all/list and get.
-      class AzureResources < Fog::Collection
-        attribute :tag_name
-        attribute :tag_value
-        model Fog::Resources::AzureRM::AzureResource
-
-        def all
-          unless tag_name.nil? && tag_value.nil?
-            resources = []
-            service.list_tagged_resources(tag_name, tag_value).each do |resource|
-              resources << Fog::Resources::AzureRM::AzureResource.parse(resource)
-            end
-            resources.inspect
-            return load(resources)
-          end
-          nil
-        end
-
-        def get(resource_id)
-          all.find { |f| f.id == resource_id }
-        end
-
-        def check_azure_resource_exists(resource_id, api_version)
-          service.check_azure_resource_exists(resource_id, api_version)
-        end
-
-        def list_resources_in_resource_group(resource_group_name)
-          resources = []
-          service.list_resources_in_resource_group(resource_group_name).each do |resource|
-            resources.push(Fog::Resources::AzureRM::AzureResource.parse(resource))
-          end
-          load(resources)
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/dependency.rb

@@ -1,27 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # Dependency model class
-      class Dependency < Fog::Model
-        attribute :id
-        attribute :resource_name
-        attribute :resource_type
-        attribute :depends_on
-
-        def self.parse(dependency)
-          hash = {}
-          hash['id'] = dependency.id
-          hash['resource_name'] = dependency.resource_name
-          hash['resource_type'] = dependency.resource_type
-
-          hash['depends_on'] = []
-          dependency.depends_on.each do |sub_dependency|
-            dependency_obj = Fog::Resources::AzureRM::Dependency.new
-            hash['depends_on'] << dependency_obj.merge_attributes(Fog::Resources::AzureRM::Dependency.parse(sub_dependency))
-          end if dependency.respond_to?('depends_on')
-          hash
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/deployment.rb

@@ -1,65 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # This class is giving implementation of create/save and
-      # delete/destroy for Deployment model.
-      class Deployment < Fog::Model
-        identity :name
-        attribute :id
-        attribute :resource_group
-        attribute :correlation_id
-        attribute :timestamp
-        attribute :outputs
-        attribute :providers
-        attribute :dependencies
-        attribute :template_link
-        attribute :parameters_link
-        attribute :mode
-        attribute :debug_setting
-        attribute :content_version
-        attribute :provisioning_state
-
-        def self.parse(deployment)
-          hash = {}
-          hash['name'] = deployment.name
-          hash['id'] = deployment.id
-          hash['resource_group'] = get_resource_from_resource_id(deployment.id, RESOURCE_GROUP_NAME)
-          hash['correlation_id'] = deployment.properties.correlation_id
-          hash['timestamp'] = deployment.properties.timestamp
-          hash['outputs'] = deployment.properties.outputs
-
-          hash['providers'] = []
-          deployment.properties.providers.each do |provider|
-            provider_obj = Fog::Resources::AzureRM::Provider.new
-            hash['providers'] << provider_obj.merge_attributes(Fog::Resources::AzureRM::Provider.parse(provider))
-          end
-
-          hash['dependencies'] = []
-          deployment.properties.dependencies.each do |dependency|
-            dependency_obj = Fog::Resources::AzureRM::Dependency.new
-            hash['dependencies'] << dependency_obj.merge_attributes(Fog::Resources::AzureRM::Dependency.parse(dependency))
-          end
-
-          hash['template_link'] = deployment.properties.template_link.uri
-          hash['parameters_link'] = deployment.properties.parameters_link.uri
-          hash['content_version'] = deployment.properties.template_link.content_version
-          hash['mode'] = deployment.properties.mode
-          hash['debug_setting'] = deployment.properties.debug_setting.detail_level unless deployment.properties.debug_setting.nil?
-          hash['provisioning_state'] = deployment.properties.provisioning_state
-          hash
-        end
-
-        def save
-          requires :name, :resource_group, :template_link, :parameters_link
-
-          deployment = service.create_deployment(resource_group, name, template_link, parameters_link)
-          merge_attributes(Fog::Resources::AzureRM::Deployment.parse(deployment))
-        end
-
-        def destroy
-          service.delete_deployment(resource_group, name)
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/deployments.rb

@@ -1,30 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # Deployments collection class
-      class Deployments < Fog::Collection
-        attribute :resource_group
-        model Fog::Resources::AzureRM::Deployment
-
-        def all
-          requires :resource_group
-          deployments = []
-          service.list_deployments(resource_group).each do |deployment|
-            deployments << Fog::Resources::AzureRM::Deployment.parse(deployment)
-          end
-          load(deployments)
-        end
-
-        def get(resource_group_name, deployment_name)
-          deployment = service.get_deployment(resource_group_name, deployment_name)
-          deployment_fog = Fog::Resources::AzureRM::Deployment.new(service: service)
-          deployment_fog.merge_attributes(Fog::Resources::AzureRM::Deployment.parse(deployment))
-        end
-
-        def check_deployment_exists(resource_group_name, deployment_name)
-          service.check_deployment_exists(resource_group_name, deployment_name)
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/provider.rb

@@ -1,27 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # Provider model class
-      class Provider < Fog::Model
-        attribute :id
-        attribute :namespace
-        attribute :registration_state
-        attribute :resource_types
-
-        def self.parse(provider)
-          hash = {}
-          hash['id'] = provider.id
-          hash['namespace'] = provider.namespace
-          hash['registration_state'] = provider.registration_state if provider.respond_to?('registration_state')
-
-          hash['resource_types'] = []
-          provider.resource_types.each do |provider_resource_type|
-            provider_resource_type_obj = Fog::Resources::AzureRM::ProviderResourceType.new
-            hash['resource_types'] << provider_resource_type_obj.merge_attributes(Fog::Resources::AzureRM::ProviderResourceType.parse(provider_resource_type))
-          end
-          hash
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/provider_resource_type.rb

@@ -1,22 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # ProviderResourceType model class
-      class ProviderResourceType < Fog::Model
-        attribute :resource_type
-        attribute :locations
-        attribute :api_versions
-        attribute :properties
-
-        def self.parse(provider_resource_type)
-          hash = {}
-          hash['resource_type'] = provider_resource_type.resource_type
-          hash['locations'] = provider_resource_type.locations
-          hash['api_versions'] = provider_resource_type.api_versions if provider_resource_type.respond_to?('api_versions')
-          hash['properties'] = provider_resource_type.properties if provider_resource_type.respond_to?('properties')
-          hash
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/resource_group.rb

@@ -1,34 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # This class is giving implementation of create/save and
-      # delete/destroy for resource group.
-      class ResourceGroup < Fog::Model
-        identity :name
-        attribute :id
-        attribute :location
-        attribute :tags
-
-        def self.parse(resource_group)
-          hash = {}
-          hash['id'] = resource_group.id
-          hash['name'] = resource_group.name
-          hash['location'] = resource_group.location
-          hash['tags'] = resource_group.tags
-          hash
-        end
-
-        def save
-          requires :name
-          requires :location
-          resource_group = service.create_resource_group(name, location, tags)
-          merge_attributes(Fog::Resources::AzureRM::ResourceGroup.parse(resource_group))
-        end
-
-        def destroy
-          service.delete_resource_group(name)
-        end
-      end
-    end
-  end
-end

data/lib/fog/azurerm/models/resources/resource_groups.rb

@@ -1,29 +0,0 @@
-module Fog
-  module Resources
-    class AzureRM
-      # This class is giving implementation of all/list, get and
-      # check name availability for resource groups.
-      class ResourceGroups < Fog::Collection
-        model Fog::Resources::AzureRM::ResourceGroup
-
-        def all
-          resource_groups = []
-          service.list_resource_groups.each do |resource_group|
-            resource_groups.push(Fog::Resources::AzureRM::ResourceGroup.parse(resource_group))
-          end
-          load(resource_groups)
-        end
-
-        def get(resource_group_name)
-          resource_group = service.get_resource_group(resource_group_name)
-          resource_group_fog = Fog::Resources::AzureRM::ResourceGroup.new(service: service)
-          resource_group_fog.merge_attributes(Fog::Resources::AzureRM::ResourceGroup.parse(resource_group))
-        end
-
-        def check_resource_group_exists(resource_group_name)
-          service.check_resource_group_exists(resource_group_name)
-        end
-      end
-    end
-  end
-end

data/test/integration/storage_account.rb

@@ -1,135 +0,0 @@
-require 'fog/azurerm'
-require 'yaml'
-
-########################################################################################################################
-######################                   Services object required by all actions                  ######################
-######################                              Keep it Uncommented!                          ######################
-########################################################################################################################
-
-azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
-
-rs = Fog::Resources::AzureRM.new(
-  tenant_id: azure_credentials['tenant_id'],
-  client_id: azure_credentials['client_id'],
-  client_secret: azure_credentials['client_secret'],
-  subscription_id: azure_credentials['subscription_id']
-)
-
-storage = Fog::Storage::AzureRM.new(
-  tenant_id: azure_credentials['tenant_id'],
-  client_id: azure_credentials['client_id'],
-  client_secret: azure_credentials['client_secret'],
-  subscription_id: azure_credentials['subscription_id'],
-  environment: azure_credentials['environment']
-)
-
-########################################################################################################################
-######################                               Resource names                                #####################
-########################################################################################################################
-
-time = current_time
-resource_group_name = "TestRG-SA-#{time}"
-storage_account_name = "teststorage#{time}"
-lrs_storage_account = "lrs#{time}"
-grs_storage_account = "grs#{time}"
-premium_storage_acc = "premsa#{time}"
-
-########################################################################################################################
-######################                                 Prerequisites                              ######################
-########################################################################################################################
-
-begin
-  resource_group = rs.resource_groups.create(
-    name: resource_group_name,
-    location: LOCATION
-  )
-
-  ########################################################################################################################
-  ######################                    Check Storage Account name Availability                 ######################
-  ########################################################################################################################
-
-  storage_account_avail = storage.storage_accounts.check_name_availability(storage_account_name)
-  puts storage_account_avail ? 'Storage Account name available' : 'Storage Account name unavailable'
-
-  ########################################################################################################################
-  ######################                         Check Subnet Exists?                               ######################
-  ########################################################################################################################
-
-  flag = storage.storage_accounts.check_storage_account_exists(resource_group_name, lrs_storage_account)
-  puts "Storage Account doesn't exist." unless flag
-
-  ########################################################################################################################
-  ###############  Create A Standard Storage Account of Replication: LRS (Locally-redundant storage)       ###############
-  ########################################################################################################################
-
-  tags = { key1: 'value1', key2: 'value2' }
-
-  storage_account = storage.storage_accounts.create(
-    name: lrs_storage_account,
-    location: LOCATION,
-    resource_group: resource_group_name,
-    tags: tags
-  )
-  puts "Created storage account for standard lrs replication: #{storage_account.name}"
-
-  ########################################################################################################################
-  ###############      Create A Standard Storage Account of Replication: GRS (Geo-redundant storage)     #################
-  ########################################################################################################################
-
-  storage_account = storage.storage_accounts.create(
-    name: grs_storage_account,
-    location: LOCATION,
-    resource_group: resource_group_name,
-    sku_name: Fog::ARM::Storage::Models::SkuTier::Standard,
-    replication: 'GRS',
-    encryption: true,
-    tags: tags
-  )
-  puts "Created storage account for standard grs replication: #{storage_account.name}"
-
-  ########################################################################################################################
-  ###########   Create A Premium(SSD) Storage Account of its only Replication: LRS (Locally-redundant storage)  ##########
-  ########################################################################################################################
-
-  storage_account = storage.storage_accounts.create(
-    name: premium_storage_acc,
-    location: LOCATION,
-    resource_group: resource_group_name,
-    sku_name: Fog::ARM::Storage::Models::SkuTier::Premium,
-    replication: 'LRS',
-    tags: tags
-  )
-  puts "Created storage account for premium lrs replication: #{storage_account.name}"
-
-  ########################################################################################################################
-  ######################                         Get and Update Storage Account                     ######################
-  ########################################################################################################################
-
-  premium_storage_account = storage.storage_accounts.get(resource_group_name, premium_storage_acc)
-  puts "Get storage account: #{premium_storage_account.name}"
-  premium_storage_account.update(encryption: true)
-  puts 'Updated encryption of storage account'
-
-  ########################################################################################################################
-  ######################                         Get and Delete Storage Account                     ######################
-  ########################################################################################################################
-
-  standard_storage_account = storage.storage_accounts.get(resource_group_name, lrs_storage_account)
-  puts "Deleted storage account for standard lrs replication: #{standard_storage_account.destroy}"
-  standard_storage_account = storage.storage_accounts.get(resource_group_name, grs_storage_account)
-  puts "Deleted storage account for standard grs replication: #{standard_storage_account.destroy}"
-  premium_storage_account = storage.storage_accounts.get(resource_group_name, premium_storage_acc)
-  puts "Deleted storage account for premium lrs replication: #{premium_storage_account.destroy}"
-
-  ########################################################################################################################
-  ######################                                   CleanUp                                  ######################
-  ########################################################################################################################
-
-  resource_group = rs.resource_groups.get(resource_group_name)
-  resource_group.destroy
-
-  puts 'Integration test for storage account ran successfully!'
-rescue
-  puts 'Integration Test for storage account is failing'
-  resource_group.destroy unless resource_group.nil?
-end