fog-azure-rm-temp 0.0.4 → 0.0.5

data/lib/fog/azurerm/requests/resources/check_azure_resource_exists.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def check_azure_resource_exists(resource_id, api_version)
+        def check_azure_resource_exists(resource_id, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           raise 'Invalid Resource Id' if split_resource.count != 9
 
@@ -16,9 +16,9 @@ module Fog
           msg = "Checking Resource #{resource_name}"
           Fog::Logger.debug msg
           begin
-            @rmc.resources.check_existence(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version)
-            Fog::Logger.debug "Resource #{resource_name} exists."
-            true
+            resource_exists = @rmc.resources.check_existence(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version)
+            Fog::Logger.debug "Resource #{resource_name} exists." if resource_exists
+            resource_exists
           rescue MsRestAzure::AzureOperationError => e
             if e.response.status == 405
               Fog::Logger.debug "Resource #{resource_name} doesn't exist."

data/lib/fog/azurerm/requests/resources/create_resource_group.rb

@@ -3,11 +3,12 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def create_resource_group(name, location)
+        def create_resource_group(name, location, tags)
           msg = "Creating Resource Group: #{name}."
           Fog::Logger.debug msg
           resource_group = Azure::ARM::Resources::Models::ResourceGroup.new
           resource_group.location = location
+          resource_group.tags = tags
           begin
             resource_group = @rmc.resource_groups.create_or_update(name, resource_group)
           rescue  MsRestAzure::AzureOperationError => e

data/lib/fog/azurerm/requests/resources/delete_resource_tag.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def delete_resource_tag(resource_id, tag_name, tag_value)
+        def delete_resource_tag(resource_id, tag_name, tag_value, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           if split_resource.count != 9
             raise 'Invalid Resource Id'
@@ -18,12 +18,12 @@ module Fog
           Fog::Logger.debug msg
 
           begin
-            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION)
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version)
 
             if resource.tags.key?(tag_name)
               resource.tags.delete_if { |key, value| key == tag_name && value == tag_value }
             end
-            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION, resource)
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version, resource)
           rescue  MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -34,7 +34,7 @@ module Fog
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        def delete_resource_tag(_resource_id, tag_name, _tag_value)
+        def delete_resource_tag(_resource_id, tag_name, _tag_value, _api_version)
           Fog::Logger.debug "Tag #{tag_name} deleted successfully from Resource your-resource-name"
           true
         end

data/lib/fog/azurerm/requests/resources/tag_resource.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def tag_resource(resource_id, tag_name, tag_value)
+        def tag_resource(resource_id, tag_name, tag_value, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           if split_resource.count != 9
             raise 'Invalid Resource Id'
@@ -19,10 +19,10 @@ module Fog
           Fog::Logger.debug msg
 
           begin
-            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION)
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version)
             resource.tags = {} if resource.tags.nil?
             resource.tags[tag_name] = tag_value
-            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION, resource)
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version, resource)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -33,7 +33,7 @@ module Fog
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        def tag_resource(_resource_id, tag_name, _tag_value)
+        def tag_resource(_resource_id, tag_name, _tag_value, _api_version)
           Fog::Logger.debug "Tag #{tag_name} created successfully for Resource 'resource_name'"
           true
         end

data/lib/fog/azurerm/requests/sql/create_or_update_database.rb

@@ -6,19 +6,21 @@ module Fog
         def create_or_update_database(database_hash)
           msg = "Creating SQL Database: #{database_hash[:name]}."
           Fog::Logger.debug msg
+          formatted_database_params = format_database_parameters(database_hash[:location],
+                                                                 database_hash[:create_mode],
+                                                                 database_hash[:edition],
+                                                                 database_hash[:source_database_id],
+                                                                 database_hash[:collation],
+                                                                 database_hash[:max_size_bytes],
+                                                                 database_hash[:requested_service_objective_name],
+                                                                 database_hash[:elastic_pool_name],
+                                                                 database_hash[:requested_service_objective_id],
+                                                                 database_hash[:tags])
           begin
             sql_database = @sql_mgmt_client.databases.create_or_update(database_hash[:resource_group],
                                                                        database_hash[:server_name],
                                                                        database_hash[:name],
-                                                                       format_database_parameters(database_hash[:location],
-                                                                                                  database_hash[:create_mode],
-                                                                                                  database_hash[:edition],
-                                                                                                  database_hash[:source_database_id],
-                                                                                                  database_hash[:collation],
-                                                                                                  database_hash[:max_size_bytes],
-                                                                                                  database_hash[:requested_service_objective_name],
-                                                                                                  database_hash[:elastic_pool_name],
-                                                                                                  database_hash[:requested_service_objective_id]))
+                                                                       formatted_database_params)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -28,7 +30,7 @@ module Fog
 
         private
 
-        def format_database_parameters(location, create_mode, edition, source_database_id, collation, max_size_bytes, requested_service_objective_name, elastic_pool_name, requested_service_objective_id)
+        def format_database_parameters(location, create_mode, edition, source_database_id, collation, max_size_bytes, requested_service_objective_name, elastic_pool_name, requested_service_objective_id, tags)
           database = Azure::ARM::SQL::Models::Database.new
           database.location = location
           database.edition = edition unless edition.nil?
@@ -39,6 +41,7 @@ module Fog
           database.source_database_id = source_database_id unless source_database_id.nil?
           database.requested_service_objective_id = requested_service_objective_id unless requested_service_objective_id.nil?
           database.requested_service_objective_name = requested_service_objective_name unless requested_service_objective_name.nil?
+          database.tags = tags
           database
         end
       end

data/lib/fog/azurerm/requests/sql/create_or_update_sql_server.rb

@@ -6,13 +6,15 @@ module Fog
         def create_or_update_sql_server(server_hash)
           msg = "Creating SQL Server: #{server_hash[:name]}."
           Fog::Logger.debug msg
+          formatted_server_params = format_server_parameters(server_hash[:location],
+                                                             server_hash[:version],
+                                                             server_hash[:administrator_login],
+                                                             server_hash[:administrator_login_password],
+                                                             server_hash[:tags])
           begin
             sql_server = @sql_mgmt_client.servers.create_or_update(server_hash[:resource_group],
                                                                    server_hash[:name],
-                                                                   format_server_parameters(server_hash[:location],
-                                                                                            server_hash[:version],
-                                                                                            server_hash[:administrator_login],
-                                                                                            server_hash[:administrator_login_password]))
+                                                                   formatted_server_params)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -22,12 +24,13 @@ module Fog
 
         private
 
-        def format_server_parameters(location, version, admin_login, admin_password)
+        def format_server_parameters(location, version, admin_login, admin_password, tags)
           server = Azure::ARM::SQL::Models::Server.new
           server.version = version
           server.location = location
           server.administrator_login = admin_login
           server.administrator_login_password = admin_password
+          server.tags = tags
           server
         end
       end

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

@@ -9,7 +9,7 @@ module Fog
           begin
             storage_account = @storage_mgmt_client.storage_accounts.get_properties(resource_group_name, storage_account_name)
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Storage Account #{storage_account_name} doesn't exist."
               return false
             else

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

@@ -9,7 +9,8 @@ module Fog
           storage_account_params = get_storage_account_params(storage_account_hash[:sku_name],
                                                               storage_account_hash[:location],
                                                               storage_account_hash[:replication],
-                                                              storage_account_hash[:encryption])
+                                                              storage_account_hash[:encryption],
+                                                              storage_account_hash[:tags])
           begin
             storage_account = @storage_mgmt_client.storage_accounts.create(storage_account_hash[:resource_group],
                                                                            storage_account_hash[:name],
@@ -23,7 +24,7 @@ module Fog
 
         private
 
-        def get_storage_account_params(sku_name, location, replication, encryption_enabled)
+        def get_storage_account_params(sku_name, location, replication, encryption_enabled, tags)
           params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
           sku = Azure::ARM::Storage::Models::Sku.new
           sku.name = "#{sku_name}_#{replication}"
@@ -40,6 +41,7 @@ module Fog
             encryption.services = encryption_services
             params.encryption = encryption
           end
+          params.tags = tags
           params
         end
       end

data/lib/fog/azurerm/requests/traffic_manager/check_traffic_manager_endpoint_exists.rb

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Traffic Manager Endpoint #{traffic_manager_end_point} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['code'] == 'NotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Traffic Manager Endpoint #{traffic_manager_end_point} doesn't exist."
               false
             else

data/lib/fog/azurerm/requests/traffic_manager/check_traffic_manager_profile_exists.rb

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Traffic Manager Profile #{traffic_manager_profile_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Traffic Manager Profile #{traffic_manager_profile_name} doesn't exist."
               false
             else

data/lib/fog/azurerm/requests/traffic_manager/create_or_update_traffic_manager_profile.rb

@@ -6,9 +6,18 @@ module Fog
         def create_or_update_traffic_manager_profile(profile_hash)
           msg = "Creating Traffic Manager Profile: #{profile_hash[:name]}."
           Fog::Logger.debug msg
-          profile_parameters = get_profile_object(profile_hash[:traffic_routing_method], profile_hash[:relative_name], profile_hash[:ttl], profile_hash[:protocol], profile_hash[:port], profile_hash[:path], profile_hash[:endpoints])
+          profile_parameters = get_profile_object(profile_hash[:traffic_routing_method],
+                                                  profile_hash[:relative_name],
+                                                  profile_hash[:ttl],
+                                                  profile_hash[:protocol],
+                                                  profile_hash[:port],
+                                                  profile_hash[:path],
+                                                  profile_hash[:endpoints],
+                                                  profile_hash[:tags])
           begin
-            traffic_manager_profile = @traffic_mgmt_client.profiles.create_or_update(profile_hash[:resource_group], profile_hash[:name], profile_parameters)
+            traffic_manager_profile = @traffic_mgmt_client.profiles.create_or_update(profile_hash[:resource_group],
+                                                                                     profile_hash[:name],
+                                                                                     profile_parameters)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -18,7 +27,7 @@ module Fog
 
         private
 
-        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path, endpoints)
+        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path, endpoints, tags)
           traffic_manager_profile = Azure::ARM::TrafficManager::Models::Profile.new
           traffic_manager_profile.traffic_routing_method = traffic_routing_method
           traffic_manager_profile.location = GLOBAL
@@ -26,6 +35,7 @@ module Fog
           traffic_manager_profile.dns_config = get_traffic_manager_dns_config(relative_name, ttl)
           traffic_manager_profile.monitor_config = get_traffic_manager_monitor_config(protocol, port, path)
           traffic_manager_profile.endpoints = get_endpoints(endpoints) unless endpoints.nil?
+          traffic_manager_profile.tags = tags
           traffic_manager_profile
         end
 

data/lib/fog/azurerm/storage.rb

@@ -64,22 +64,6 @@ module Fog
       request :save_page_blob
       request :multipart_save_block_blob
 
-      # Azure Recovery Vault requests
-      request :create_or_update_recovery_vault
-      request :get_recovery_vault
-      request :list_recovery_vaults
-      request :delete_recovery_vault
-      request :enable_backup_protection
-      request :set_recovery_vault_context
-      request :get_backup_protection_policy
-      request :start_backup
-      request :get_backup_item
-      request :get_backup_container
-      request :disable_backup_protection
-      request :get_all_backup_jobs
-      request :get_all_backup_jobs
-      request :get_backup_job_for_vm
-
       model_path 'fog/azurerm/models/storage'
       model :storage_account
       collection :storage_accounts
@@ -87,8 +71,6 @@ module Fog
       collection :directories
       model :file
       collection :files
-      model :recovery_vault
-      collection :recovery_vaults
 
       # This class provides the mock implementation for unit tests.
       class Mock

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

@@ -47,16 +47,8 @@ def get_record_type(type)
 end
 
 def raise_azure_exception(exception, msg)
-  if exception.respond_to? 'body'
-    message = if exception.body['error'].nil?
-                exception.body['message']
-              else
-                exception.body['error']['message']
-              end
-    exception_message = "Exception in #{msg} #{message} Type: #{exception.class}\n#{exception.backtrace.join("\n")}"
-  else
-    exception_message = "#{exception.inspect}\n#{exception.backtrace.join("\n")}"
-  end
+  description = exception.is_a?(Azure::Core::Http::HTTPError) ? exception.description : exception.error_message
+  exception_message = "Exception in #{msg} #{description} Type: #{exception.class}\n#{exception.backtrace.join('\n')}"
 
   Fog::Logger.debug exception.backtrace
   raise exception_message
@@ -166,3 +158,22 @@ def parse_storage_object(object)
   data['etag'].delete!('"')
   data
 end
+
+def resource_not_found?(azure_operation_error)
+  is_found = false
+  if azure_operation_error.response.status == HTTP_NOT_FOUND
+    if azure_operation_error.body['code']
+      is_found = azure_operation_error.body['code'] == ERROR_CODE_NOT_FOUND
+    elsif azure_operation_error.body['error']
+      is_found = azure_operation_error.body['error']['code'] == ERROR_CODE_NOT_FOUND ||
+                 azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_GROUP_NOT_FOUND ||
+                 azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND ||
+                 azure_operation_error.body['error']['code'] == ERROR_CODE_PARENT_RESOURCE_NOT_FOUND
+    end
+  end
+  is_found
+end
+
+def get_image_name(id)
+  id.split('/').last
+end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
   end
 end

data/rake-script.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 rake cc_coverage
+R=$?
 export CODECLIMATE_REPO_TOKEN="b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd"
-codeclimate-test-reporter
+codeclimate-test-reporter
+if [ $R == 1 ]; then
+  exit 1
+else
+  exit 0
+fi

data/rakefile

@@ -26,4 +26,4 @@ end
 desc 'Generates a coverage report for integration tests'
 task :integration_tests do
   Dir.glob('test/smoke_tests/**/test_*.rb').each { |file| require File.expand_path file, __dir__ }
-end
+end

data/test/api_stub.rb

@@ -1,6 +1,7 @@
 # Module for API Stub
 module ApiStub
   module Models
+    # Load test Compute models
     module Compute
       autoload :Server, File.expand_path('api_stub/models/compute/server', __dir__)
       autoload :AvailabilitySet, File.expand_path('api_stub/models/compute/availability_set', __dir__)
@@ -8,19 +9,21 @@ module ApiStub
       autoload :ManagedDisk, File.expand_path('api_stub/models/compute/managed_disk', __dir__)
     end
 
+    # Load test Resources models
     module Resources
       autoload :ResourceGroup, File.expand_path('api_stub/models/resources/resource_group', __dir__)
       autoload :Deployment, File.expand_path('api_stub/models/resources/deployment', __dir__)
       autoload :Resource, File.expand_path('api_stub/models/resources/resource', __dir__)
     end
 
+    # Load test Storage models
     module Storage
       autoload :StorageAccount, File.expand_path('api_stub/models/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/models/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/models/storage/directory', __dir__)
-      autoload :RecoveryVault, ::File.expand_path('api_stub/models/storage/recovery_vault', __dir__)
     end
 
+    # Load test Network models
     module Network
       autoload :PublicIp, File.expand_path('api_stub/models/network/public_ip', __dir__)
       autoload :Subnet, File.expand_path('api_stub/models/network/subnet', __dir__)
@@ -38,52 +41,61 @@ module ApiStub
       autoload :LocalNetworkGateway, File.expand_path('api_stub/models/network/local_network_gateway', __dir__)
     end
 
+    # Load test ApplicationGateway models
     module ApplicationGateway
       autoload :Gateway, File.expand_path('api_stub/models/application_gateway/gateway', __dir__)
     end
 
+    # Load test TrafficManager models
     module TrafficManager
       autoload :TrafficManagerEndPoint, File.expand_path('api_stub/models/traffic_manager/traffic_manager_end_point', __dir__)
       autoload :TrafficManagerProfile, File.expand_path('api_stub/models/traffic_manager/traffic_manager_profile', __dir__)
     end
 
+    # Load test DNS models
     module DNS
       autoload :Zone, File.expand_path('api_stub/models/dns/zone', __dir__)
       autoload :RecordSet, File.expand_path('api_stub/models/dns/record_set', __dir__)
     end
 
+    # Load test Sql models
     module Sql
       autoload :SqlServer, File.expand_path('api_stub/models/sql/sql_server', __dir__)
       autoload :SqlDatabase, File.expand_path('api_stub/models/sql/sql_database', __dir__)
       autoload :SqlFirewallRule, File.expand_path('api_stub/models/sql/sql_firewall_rule', __dir__)
     end
 
+    # Load test KeyVault models
     module KeyVault
       autoload :Vault, File.expand_path('api_stub/models/key_vault/vault', __dir__)
     end
   end
 
   module Requests
+    # Load test Compute requests
     module Compute
       autoload :AvailabilitySet, File.expand_path('api_stub/requests/compute/availability_set', __dir__)
       autoload :VirtualMachine, File.expand_path('api_stub/requests/compute/virtual_machine', __dir__)
       autoload :VirtualMachineExtension, File.expand_path('api_stub/requests/compute/virtual_machine_extension', __dir__)
       autoload :ManagedDisk, File.expand_path('api_stub/requests/compute/managed_disk', __dir__)
+      autoload :Image, File.expand_path('api_stub/requests/compute/image', __dir__)
     end
 
+    # Load test Resources requests
     module Resources
       autoload :ResourceGroup, File.expand_path('api_stub/requests/resources/resource_group', __dir__)
       autoload :Deployment, File.expand_path('api_stub/requests/resources/deployment', __dir__)
       autoload :AzureResource, File.expand_path('api_stub/requests/resources/resource', __dir__)
     end
 
+    # Load test Storage requests
     module Storage
       autoload :StorageAccount, File.expand_path('api_stub/requests/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/requests/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/requests/storage/directory', __dir__)
-      autoload :RecoveryVault, ::File.expand_path('api_stub/requests/storage/recovery_vault', __dir__)
     end
 
+    # Load test Network requests
     module Network
       autoload :PublicIp, File.expand_path('api_stub/requests/network/public_ip', __dir__)
       autoload :Subnet, File.expand_path('api_stub/requests/network/subnet', __dir__)
@@ -101,26 +113,31 @@ module ApiStub
       autoload :LocalNetworkGateway, File.expand_path('api_stub/requests/network/local_network_gateway', __dir__)
     end
 
+    # Load test ApplicationGateway requests
     module ApplicationGateway
       autoload :Gateway, File.expand_path('api_stub/requests/application_gateway/gateway', __dir__)
     end
 
+    # Load test TrafficManager requests
     module TrafficManager
       autoload :TrafficManagerEndPoint, File.expand_path('api_stub/requests/traffic_manager/traffic_manager_endpoint', __dir__)
       autoload :TrafficManagerProfile, File.expand_path('api_stub/requests/traffic_manager/traffic_manager_profile', __dir__)
     end
 
+    # Load test DNS requests
     module DNS
       autoload :Zone, File.expand_path('api_stub/requests/dns/zone', __dir__)
       autoload :RecordSet, File.expand_path('api_stub/requests/dns/record_set', __dir__)
     end
 
+    # Load test Sql requests
     module Sql
       autoload :SqlServer, File.expand_path('api_stub/requests/sql/sql_server', __dir__)
       autoload :SqlDatabase, File.expand_path('api_stub/requests/sql/database', __dir__)
       autoload :FirewallRule, File.expand_path('api_stub/requests/sql/firewall_rule', __dir__)
     end
 
+    # Load test KeyVault requests
     module KeyVault
       autoload :Vault, File.expand_path('api_stub/requests/key_vault/vault', __dir__)
     end