fog-azure-rm-temp 0.0.4 → 0.0.5

data/lib/fog/azurerm/models/dns/record_set.rb

@@ -15,13 +15,11 @@ module Fog
         attribute :a_records
 
         def self.parse(recordset)
-          hash = {}
-          hash['id'] = recordset.id
-          hash['name'] = recordset.name
+          hash = get_hash_from_object(recordset)
           hash['resource_group'] = get_resource_group_from_id(recordset.id)
           hash['zone_name'] = get_record_set_from_id(recordset.id)
-          hash['type'] = recordset.type
           type = get_type_from_recordset_type(recordset.type)
+
           hash['records'] = []
           if type == 'A'
             record_entries = recordset.arecords
@@ -31,11 +29,25 @@ module Fog
           end
           if type == 'CNAME'
             record_entries = recordset.cname_record
-            hash['records'] << record_entries
+            hash['records'] << record_entries.cname
+          end
+
+          unless recordset.arecords.nil?
+            a_records = []
+            recordset.arecords.each do |record|
+              a_record = Fog::DNS::AzureRM::ARecord.new
+              a_record.merge_attributes(Fog::DNS::AzureRM::ARecord.parse(record))
+              a_records.push(a_record)
+            end
+            hash['a_records'] = a_records
           end
-          hash['a_records'] = recordset.arecords if type == 'A'
-          hash['cname_record'] = recordset.cname_record if type == 'CNAME'
-          hash['ttl'] = recordset.ttl
+
+          unless recordset.cname_record.nil?
+            cname_record = Fog::DNS::AzureRM::CnameRecord.new
+            cname_record.merge_attributes(Fog::DNS::AzureRM::CnameRecord.parse(recordset.cname_record))
+            hash['cname_record'] = cname_record
+          end
+
           hash
         end
 

data/lib/fog/azurerm/models/key_vault/vault.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :enabled_for_deployment
         attribute :enabled_for_disk_encryption
         attribute :enabled_for_template_deployment
+        attribute :tags
 
         def self.parse(vault)
           vault_hash = get_hash_from_object(vault)
@@ -67,7 +68,8 @@ module Fog
             tenant_id: tenant_id,
             sku_family: sku_family,
             sku_name: sku_name,
-            access_policies: access_policies
+            access_policies: access_policies,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/network/load_balancer.rb

@@ -13,6 +13,7 @@ module Fog
         attribute :probes
         attribute :inbound_nat_rules
         attribute :inbound_nat_pools
+        attribute :tags
 
         # @param [Object] load_balancer
         def self.parse(load_balancer)
@@ -22,6 +23,7 @@ module Fog
           hash['location'] = load_balancer.location
           hash['resource_group'] = get_resource_group_from_id(load_balancer.id)
           hash['backend_address_pool_names'] = load_balancer.backend_address_pools.map(&:id) unless load_balancer.backend_address_pools.nil?
+          hash['tags'] = load_balancer.tags
 
           hash['frontend_ip_configurations'] = []
           load_balancer.frontend_ipconfigurations.each do |fic|
@@ -65,7 +67,7 @@ module Fog
           validate_inbound_nat_rules(inbound_nat_rules) unless inbound_nat_rules.nil?
           validate_inbound_nat_pools(inbound_nat_pools) unless inbound_nat_pools.nil?
 
-          load_balancer = service.create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
+          load_balancer = service.create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools, tags)
 
           merge_attributes(Fog::Network::AzureRM::LoadBalancer.parse(load_balancer))
         end

data/lib/fog/azurerm/models/network/local_network_gateway.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :bgp_peering_address
         attribute :peer_weight
         attribute :provisioning_state
+        attribute :tags
 
         def self.parse(local_network_gateway)
           local_network_gateway_hash = get_hash_from_object(local_network_gateway)
@@ -51,7 +52,8 @@ module Fog
             gateway_ip_address: gateway_ip_address,
             asn: asn,
             bgp_peering_address: bgp_peering_address,
-            peer_weight: peer_weight
+            peer_weight: peer_weight,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/network/network_interface.rb

@@ -22,6 +22,7 @@ module Fog
         attribute :applied_dns_servers
         attribute :internal_dns_name_label
         attribute :internal_fqd
+        attribute :tags
 
         def self.parse(nic)
           hash = {}
@@ -33,6 +34,7 @@ module Fog
           hash['mac_address'] = nic.mac_address unless nic.mac_address.nil?
           hash['network_security_group_id'] = nil
           hash['network_security_group_id'] = nic.network_security_group.id unless nic.network_security_group.nil?
+          hash['tags'] = nic.tags
           ip_configuration = nic.ip_configurations[0] unless nic.ip_configurations.nil?
           unless ip_configuration.nil?
             hash['ip_configuration_name'] = ip_configuration.name
@@ -62,7 +64,7 @@ module Fog
           requires :subnet_id
           requires :ip_configuration_name
           requires :private_ip_allocation_method
-          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids, tags)
           merge_attributes(Fog::Network::AzureRM::NetworkInterface.parse(nic))
         end
 

data/lib/fog/azurerm/models/network/network_security_group.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :subnets_ids
         attribute :security_rules
         attribute :default_security_rules
+        attribute :tags
 
         def self.parse(nsg)
           hash = {}
@@ -22,6 +23,7 @@ module Fog
           hash['subnets_ids'] = nsg.subnets.map(&:id) unless nsg.subnets.nil?
           hash['security_rules'] = []
           hash['default_security_rules'] = []
+          hash['tags'] = nsg.tags
 
           nsg.security_rules.each do |sr|
             security_rule = Fog::Network::AzureRM::NetworkSecurityRule.new
@@ -40,7 +42,7 @@ module Fog
           requires :name, :location, :resource_group
 
           validate_security_rules(security_rules) unless security_rules.nil?
-          nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules)
+          nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules, tags)
           merge_attributes(Fog::Network::AzureRM::NetworkSecurityGroup.parse(nsg))
         end
 
@@ -54,7 +56,7 @@ module Fog
           if !security_rule_hash[:security_rules].nil? && security_rule_hash.length == 1
             validate_security_rules(security_rule_hash[:security_rules])
             merge_attributes(security_rule_hash)
-            nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules)
+            nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules, tags)
             return merge_attributes(Fog::Network::AzureRM::NetworkSecurityGroup.parse(nsg))
           end
           raise 'Invalid hash key.'

data/lib/fog/azurerm/models/network/public_ip.rb

@@ -14,6 +14,7 @@ module Fog
         attribute :domain_name_label
         attribute :fqdn
         attribute :reverse_fqdn
+        attribute :tags
 
         def self.parse(public_ip)
           hash = {}
@@ -25,6 +26,7 @@ module Fog
           hash['ip_address'] = public_ip.ip_address
           hash['idle_timeout_in_minutes'] = public_ip.idle_timeout_in_minutes
           hash['ip_configuration_id'] = public_ip.ip_configuration.id unless public_ip.ip_configuration.nil?
+          hash['tags'] = public_ip.tags
 
           unless public_ip.dns_settings.nil?
             hash['domain_name_label'] = public_ip.dns_settings.domain_name_label
@@ -40,7 +42,7 @@ module Fog
           requires :public_ip_allocation_method
           requires :location
           requires :resource_group
-          public_ip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+          public_ip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           merge_attributes(Fog::Network::AzureRM::PublicIp.parse(public_ip))
         end
 
@@ -51,7 +53,7 @@ module Fog
         def update(input_hash)
           validate_input(input_hash)
           merge_attributes(input_hash)
-          pip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+          pip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           merge_attributes(Fog::Network::AzureRM::PublicIp.parse(pip))
         end
 

data/lib/fog/azurerm/models/network/virtual_network.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :dns_servers
         attribute :subnets
         attribute :address_prefixes
+        attribute :tags
 
         def self.parse(vnet)
           hash = {}
@@ -20,6 +21,7 @@ module Fog
           hash['location'] = vnet.location
           hash['dns_servers'] = vnet.dhcp_options.dns_servers unless vnet.dhcp_options.nil?
           hash['address_prefixes'] = vnet.address_space.address_prefixes unless vnet.address_space.address_prefixes.nil?
+          hash['tags'] = vnet.tags
 
           subnets = []
           vnet.subnets.each do |subnet|
@@ -36,7 +38,7 @@ module Fog
           requires :resource_group
           validate_subnets!(subnets) unless subnets.nil?
 
-          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes)
+          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes, tags)
           merge_attributes(Fog::Network::AzureRM::VirtualNetwork.parse(virtual_network))
         end
 
@@ -75,7 +77,7 @@ module Fog
           raise('Provided hash can not be empty.') if vnet_hash.empty? || vnet_hash.nil?
           validate_update_attributes!(vnet_hash)
           merge_attributes(vnet_hash)
-          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes)
+          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes, tags)
           merge_attributes(Fog::Network::AzureRM::VirtualNetwork.parse(virtual_network))
         end
 

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

@@ -7,19 +7,21 @@ module Fog
         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)
+          resource_group = service.create_resource_group(name, location, tags)
           merge_attributes(Fog::Resources::AzureRM::ResourceGroup.parse(resource_group))
         end
 

data/lib/fog/azurerm/models/sql/sql_database.rb

@@ -23,13 +23,12 @@ module Fog
         attribute :requested_service_objective_name, aliases: %w(requestedServiceObjectiveName)
         attribute :service_level_objective, aliases: %w(serviceLevelObjective)
         attribute :source_database_id, aliases: %w(sourceDatabaseId)
+        attribute :tags
 
         def self.parse(database)
           database_hash = get_hash_from_object(database)
-
           database_hash['resource_group'] = get_resource_group_from_id(database.id)
           database_hash['server_name'] = get_resource_from_resource_id(database.id, 8)
-
           database_hash
         end
 
@@ -58,7 +57,8 @@ module Fog
             max_size_bytes: max_size_bytes,
             requested_service_objective_name: requested_service_objective_name,
             elastic_pool_name: elastic_pool_name,
-            requested_service_objective_id: requested_service_objective_id
+            requested_service_objective_id: requested_service_objective_id,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/sql/sql_server.rb

@@ -13,11 +13,11 @@ module Fog
         attribute :administrator_login
         attribute :administrator_login_password
         attribute :fully_qualified_domain_name, aliases: %w(fullyQualifiedDomainName)
+        attribute :tags
 
         def self.parse(server)
           sql_server_hash = get_hash_from_object(server)
           sql_server_hash['resource_group'] = get_resource_group_from_id(server.id)
-
           sql_server_hash
         end
 
@@ -40,7 +40,8 @@ module Fog
             version: version,
             location: location,
             administrator_login: administrator_login,
-            administrator_login_password: administrator_login_password
+            administrator_login_password: administrator_login_password,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/storage/directories.rb

@@ -56,11 +56,16 @@ module Fog
           end
           directory.files.load(blobs)
           directory
-        rescue => error
+        rescue Exception => error
           return nil if error.message == 'NotFound'
           raise error
         end
 
+        def delete_temporary_container(storage_account_name, access_key, container_name)
+          storage_data = Fog::Storage::AzureRM.new(azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+          storage_data.delete_container(container_name)
+        end
+
         def check_container_exists(name)
           service.check_container_exists(name)
         end

data/lib/fog/azurerm/models/storage/file.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module Fog
   module Storage
     class AzureRM

data/lib/fog/azurerm/models/storage/storage_account.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :sku_name
         attribute :replication
         attribute :encryption
+        attribute :tags
 
         def self.parse(storage_account)
           hash = {}
@@ -21,6 +22,7 @@ module Fog
           hash['sku_name'] = storage_account.sku.name.split('_').first
           hash['replication'] = storage_account.sku.name.split('_').last
           hash['encryption'] = storage_account.encryption.services.blob.enabled unless storage_account.encryption.nil?
+          hash['tags'] = storage_account.tags
           hash
         end
 
@@ -43,7 +45,8 @@ module Fog
             sku_name: sku_name,
             location: location,
             replication: replication,
-            encryption: encryption
+            encryption: encryption,
+            tags: tags
           }
         end
 

data/lib/fog/azurerm/models/storage/storage_accounts.rb

@@ -31,6 +31,13 @@ module Fog
           service.check_storage_account_name_availability(name, type)
         end
 
+        def delete_storage_account_from_tag(resource_group_name, tag_key, tag_value)
+          storage_accounts = service.storage_accounts(resource_group: resource_group_name)
+          storage_accounts.each do |account|
+            account.destroy if account.tags[tag_key].eql? tag_value
+          end
+        end
+
         def check_storage_account_exists(resource_group_name, storage_account_name)
           service.check_storage_account_exists(resource_group_name, storage_account_name)
         end

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_profile.rb

@@ -17,6 +17,7 @@ module Fog
         attribute :port
         attribute :path
         attribute :endpoints
+        attribute :tags
 
         def self.parse(profile)
           traffic_manager_profile = get_hash_from_object(profile)
@@ -79,7 +80,8 @@ module Fog
             protocol: protocol,
             port: port,
             path: path,
-            endpoints: endpoints
+            endpoints: endpoints,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/requests/application_gateway/check_ag_exists.rb

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

data/lib/fog/azurerm/requests/application_gateway/create_or_update_application_gateway.rb

@@ -33,6 +33,7 @@ module Fog
           application_gateway.http_listeners = define_http_listeners(gateway_params[:http_listeners]) if gateway_params[:http_listeners]
           application_gateway.url_path_maps = define_url_path_maps(gateway_params[:url_path_maps]) if gateway_params[:url_path_maps]
           application_gateway.request_routing_rules = define_request_routing_rules(gateway_params[:request_routing_rules]) if gateway_params[:request_routing_rules]
+          application_gateway.tags = gateway_params[:tags]
 
           gateway_sku = Azure::ARM::Network::Models::ApplicationGatewaySku.new
           gateway_sku.name = gateway_params[:sku_name]

data/lib/fog/azurerm/requests/compute/attach_data_disk_to_vm.rb

@@ -87,12 +87,12 @@ module Fog
           managed_disk.name = disk_name
           managed_disk.lun = lun
           managed_disk.create_option = Azure::ARM::Compute::Models::DiskCreateOptionTypes::Attach
-          
+
           # Managed disk parameter
           managed_disk_params = Azure::ARM::Compute::Models::ManagedDiskParameters.new
           managed_disk_params.id = disk.id
           managed_disk.managed_disk = managed_disk_params
-          
+
           managed_disk
         end
 

data/lib/fog/azurerm/requests/compute/check_availability_set_exists.rb

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

data/lib/fog/azurerm/requests/compute/check_managed_disk_exists.rb

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Managed Disk #{disk_name} exist."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.error_code == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Managed Disk #{disk_name} doesn't exist."
               false
             else

data/lib/fog/azurerm/requests/compute/check_vm_exists.rb

@@ -13,7 +13,7 @@ module Fog
               @compute_mgmt_client.virtual_machines.get(resource_group, name, 'instanceView')
             end
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Virtual machine #{name} doesn't exist."
               return false
             else