fog-azure-rm 0.1.1 → 0.1.2

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

@@ -1,52 +1,60 @@
-module Fog
-  module Sql
-    class AzureRM
-      # Sql Server model for Server Firewall Rule Service
-      class FirewallRule < Fog::Model
-        identity :name
-        attribute :id
-        attribute :type
-        attribute :resource_group
-        attribute :location
-        attribute :start_ip
-        attribute :end_ip
-        attribute :server_name
-
-        def self.parse(firewall)
-          {
-            id: firewall['id'],
-            type: firewall['type'],
-            name: firewall['name'],
-            location: firewall['location'],
-            resource_group: get_resource_group_from_id(firewall['id']),
-            server_name: get_server_name_from_id(firewall['id']),
-            start_ip: firewall['properties']['startIpAddress'],
-            end_ip: firewall['properties']['endIpAddress']
-          }
-        end
-
-        def save
-          requires :resource_group, :server_name, :name, :start_ip, :end_ip
-          firewall_rule = service.create_or_update_firewall_rule(firewall_params)
-          merge_attributes(Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule))
-        end
-
-        def destroy
-          service.delete_firewall_rule(resource_group, server_name, name)
-        end
-
-        private
-
-        def firewall_params
-          {
-            resource_group: resource_group,
-            server_name: server_name,
-            name: name,
-            start_ip: start_ip,
-            end_ip: end_ip
-          }
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Sql
+    class AzureRM
+      # Sql Server model for Server Firewall Rule Service
+      class FirewallRule < Fog::Model
+        identity :name
+        attribute :id
+        attribute :type
+        attribute :resource_group
+        attribute :location
+        attribute :start_ip, aliases: %w(startIpAddress)
+        attribute :end_ip, aliases: %w(endIpAddress)
+        attribute :server_name
+
+        def self.parse(firewall)
+          data = {}
+          if firewall.is_a? Hash
+            firewall.each do |k, v|
+              if k == 'properties'
+                v.each do |j, l|
+                  data[j] = l
+                end
+              else
+                data[k] = v
+              end
+            end
+            data['resource_group'] = get_resource_group_from_id(firewall['id'])
+            data['server_name'] = get_resource_from_resource_id(firewall['id'], 8)
+          else
+            raise 'Object is not a hash. Parsing SQL Server firewall object failed.'
+          end
+
+          data
+        end
+
+        def save
+          requires :resource_group, :server_name, :name, :start_ip, :end_ip
+          firewall_rule = service.create_or_update_firewall_rule(format_firewall_params)
+          merge_attributes(Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule))
+        end
+
+        def destroy
+          service.delete_firewall_rule(resource_group, server_name, name)
+        end
+
+        private
+
+        def format_firewall_params
+          {
+            resource_group: resource_group,
+            server_name: server_name,
+            name: name,
+            start_ip: start_ip,
+            end_ip: end_ip
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -1,28 +1,28 @@
-module Fog
-  module Sql
-    class AzureRM
-      # Sql Server Collection for Firewall Rules Service
-      class FirewallRules < Fog::Collection
-        attribute :resource_group
-        attribute :server_name
-        model Fog::Sql::AzureRM::FirewallRule
-
-        def all
-          requires :resource_group, :server_name
-
-          firewall_rules = []
-          service.list_firewall_rules(resource_group, server_name).each do |firewall_rule|
-            firewall_rules << Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule)
-          end
-          load(firewall_rules)
-        end
-
-        def get(resource_group, server_name, rule_name)
-          firewall_rule = service.get_firewall_rule(resource_group, server_name, rule_name)
-          firewall_rule_fog = Fog::Sql::AzureRM::FirewallRule.new(service: service)
-          firewall_rule_fog.merge_attributes(Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule))
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Sql
+    class AzureRM
+      # Sql Server Collection for Firewall Rules Service
+      class FirewallRules < Fog::Collection
+        attribute :resource_group
+        attribute :server_name
+        model Fog::Sql::AzureRM::FirewallRule
+
+        def all
+          requires :resource_group, :server_name
+
+          firewall_rules = []
+          service.list_firewall_rules(resource_group, server_name).each do |firewall_rule|
+            firewall_rules << Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule)
+          end
+          load(firewall_rules)
+        end
+
+        def get(resource_group, server_name, rule_name)
+          firewall_rule = service.get_firewall_rule(resource_group, server_name, rule_name)
+          firewall_rule_fog = Fog::Sql::AzureRM::FirewallRule.new(service: service)
+          firewall_rule_fog.merge_attributes(Fog::Sql::AzureRM::FirewallRule.parse(firewall_rule))
+        end
+      end
+    end
+  end
+end

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

@@ -1,93 +1,84 @@
-module Fog
-  module Sql
-    class AzureRM
-      # Sql Database model for Database Service
-      class SqlDatabase < Fog::Model
-        identity :name
-        attribute :id
-        attribute :resource_group
-        attribute :server_name
-        attribute :type
-        attribute :collation
-        attribute :create_mode
-        attribute :creation_date
-        attribute :current_service_level_objective_id
-        attribute :database_id
-        attribute :default_secondary_location
-        attribute :edition
-        attribute :earliest_restore_date
-        attribute :elastic_pool_name
-        attribute :location
-        attribute :max_size_bytes
-        attribute :requested_service_objective_id
-        attribute :requested_service_objective_name
-        attribute :restore_point_in_time
-        attribute :service_level_objective
-        attribute :source_database_id
-        attribute :source_database_deletion_date
-
-        def self.parse(database)
-          sql_database = {}
-          sql_database['id'] = database['id'] unless database['id'].nil?
-          sql_database['type'] = database['type'] unless database['type'].nil?
-          sql_database['name'] = database['name'] unless database['name'].nil?
-          sql_database['location'] = database['location'] unless database['location'].nil?
-          sql_database['elastic_pool_name'] = database['elasticPoolName'] unless database['elasticPoolName'].nil?
-          unless database['id'].nil?
-            sql_database['server_name'] = get_server_name_from_id(database['id'])
-            sql_database['resource_group'] = get_resource_group_from_id(database['id'])
-          end
-          unless database['properties'].nil?
-            sql_database['edition'] = database['properties']['edition']
-            sql_database['collation'] = database['properties']['collation']
-            sql_database['create_mode'] = database['properties']['createMode']
-            sql_database['database_id'] = database['properties']['databaseId']
-            sql_database['creation_date'] = database['properties']['creationDate']
-            sql_database['max_size_bytes'] = database['properties']['maxSizeBytes']
-            sql_database['source_database_id'] = database['properties']['sourceDatabaseId']
-            sql_database['restore_point_in_time'] = database['properties']['restorePointInTime']
-            sql_database['earliest_restore_date'] = database['properties']['earliestRestoreDate']
-            sql_database['service_level_objective'] = database['properties']['serviceLevelObjective']
-            sql_database['default_secondary_location'] = database['properties']['defaultSecondaryLocation']
-            sql_database['source_database_deletion_date'] = database['properties']['sourceDatabaseDeletionDate']
-            sql_database['requested_service_objective_id'] = database['properties']['requestedServiceObjectiveId']
-            sql_database['requested_service_objective_name'] = database['properties']['requestedServiceObjectiveName']
-            sql_database['current_service_level_objective_id'] = database['properties']['currentServiceLevelObjectiveId']
-          end
-          sql_database
-        end
-
-        def save
-          requires :resource_group, :server_name, :name, :location
-          sql_database = service.create_or_update_database(database_params)
-          merge_attributes(Fog::Sql::AzureRM::SqlDatabase.parse(sql_database))
-        end
-
-        def destroy
-          service.delete_database(resource_group, server_name, name)
-        end
-
-        private
-
-        def database_params
-          {
-            resource_group: resource_group,
-            server_name: server_name,
-            name: name,
-            location: location,
-            create_mode: create_mode,
-            edition: edition,
-            source_database_id: source_database_id,
-            collation: collation,
-            max_size_bytes: max_size_bytes,
-            requested_service_objective_name: requested_service_objective_name,
-            restore_point_in_time: restore_point_in_time,
-            source_database_deletion_date: source_database_deletion_date,
-            elastic_pool_name: elastic_pool_name,
-            requested_service_objective_id: requested_service_objective_id
-          }
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Sql
+    class AzureRM
+      # Sql Database model for Database Service
+      class SqlDatabase < Fog::Model
+        identity :name
+        attribute :id
+        attribute :resource_group
+        attribute :server_name
+        attribute :type
+        attribute :collation
+        attribute :edition
+        attribute :location
+        attribute :create_mode, aliases: %w(createMode)
+        attribute :creation_date, aliases: %w(creationDate)
+        attribute :current_service_level_objective_id, aliases: %w(currentServiceLevelObjectiveId)
+        attribute :database_id, aliases: %w(databaseId)
+        attribute :default_secondary_location, aliases: %w(defaultSecondaryLocation)
+        attribute :earliest_restore_date, aliases: %w(earliestRestoreDate)
+        attribute :elastic_pool_name, aliases: %w(elasticPoolName)
+        attribute :max_size_bytes, aliases: %w(maxSizeBytes)
+        attribute :requested_service_objective_id, aliases: %w(requestedServiceObjectiveId)
+        attribute :requested_service_objective_name, aliases: %w(requestedServiceObjectiveName)
+        attribute :restore_point_in_time, aliases: %w(restorePointInTime)
+        attribute :service_level_objective, aliases: %w(serviceLevelObjective)
+        attribute :source_database_id, aliases: %w(sourceDatabaseId)
+        attribute :source_database_deletion_date, aliases: %w(sourceDatabaseDeletionDate)
+
+        def self.parse(database)
+          data = {}
+          data['resource_group'] = get_resource_group_from_id(database['id'])
+          data['server_name'] = get_resource_from_resource_id(database['id'], 8)
+
+          if database.is_a? Hash
+            database.each do |k, v|
+              if k == 'properties'
+                v.each do |j, l|
+                  data[j] = l
+                end
+              else
+                data[k] = v
+              end
+            end
+          else
+            raise 'Object is not a hash. Parsing SQL Database object failed.'
+          end
+
+          data
+        end
+
+        def save
+          requires :resource_group, :server_name, :name, :location
+          sql_database = service.create_or_update_database(format_database_params)
+          merge_attributes(Fog::Sql::AzureRM::SqlDatabase.parse(sql_database))
+        end
+
+        def destroy
+          service.delete_database(resource_group, server_name, name)
+        end
+
+        private
+
+        def format_database_params
+          {
+            resource_group: resource_group,
+            server_name: server_name,
+            name: name,
+            location: location,
+            create_mode: create_mode,
+            edition: edition,
+            source_database_id: source_database_id,
+            collation: collation,
+            max_size_bytes: max_size_bytes,
+            requested_service_objective_name: requested_service_objective_name,
+            restore_point_in_time: restore_point_in_time,
+            source_database_deletion_date: source_database_deletion_date,
+            elastic_pool_name: elastic_pool_name,
+            requested_service_objective_id: requested_service_objective_id
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -1,28 +1,28 @@
-module Fog
-  module Sql
-    class AzureRM
-      # Sql Server Collection for Database Service
-      class SqlDatabases < Fog::Collection
-        attribute :resource_group
-        attribute :server_name
-        model Fog::Sql::AzureRM::SqlDatabase
-
-        def all
-          requires :resource_group, :server_name
-
-          databases = []
-          service.list_databases(resource_group, server_name).each do |database|
-            databases << Fog::Sql::AzureRM::SqlDatabase.parse(database)
-          end
-          load(databases)
-        end
-
-        def get(resource_group, server_name, name)
-          database = service.get_database(resource_group, server_name, name)
-          database_fog = Fog::Sql::AzureRM::SqlDatabase.new(service: service)
-          database_fog.merge_attributes(Fog::Sql::AzureRM::SqlDatabase.parse(database))
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Sql
+    class AzureRM
+      # Sql Server Collection for Database Service
+      class SqlDatabases < Fog::Collection
+        attribute :resource_group
+        attribute :server_name
+        model Fog::Sql::AzureRM::SqlDatabase
+
+        def all
+          requires :resource_group, :server_name
+
+          databases = []
+          service.list_databases(resource_group, server_name).each do |database|
+            databases << Fog::Sql::AzureRM::SqlDatabase.parse(database)
+          end
+          load(databases)
+        end
+
+        def get(resource_group, server_name, name)
+          database = service.get_database(resource_group, server_name, name)
+          database_fog = Fog::Sql::AzureRM::SqlDatabase.new(service: service)
+          database_fog.merge_attributes(Fog::Sql::AzureRM::SqlDatabase.parse(database))
+        end
+      end
+    end
+  end
+end

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

@@ -1,57 +1,62 @@
-module Fog
-  module Sql
-    class AzureRM
-      # Sql Server model for Server Service
-      class SqlServer < Fog::Model
-        identity :name
-        attribute :id
-        attribute :type
-        attribute :resource_group
-        attribute :location
-        attribute :version
-        attribute :state
-        attribute :administrator_login
-        attribute :administrator_login_password
-        attribute :fully_qualified_domain_name
-
-        def self.parse(server)
-          {
-            id: server['id'],
-            type: server['type'],
-            name: server['name'],
-            location: server['location'],
-            state: server['properties']['state'],
-            version: server['properties']['version'],
-            resource_group: get_resource_group_from_id(server['id']),
-            administrator_login: server['properties']['administratorLogin'],
-            administrator_login_password: server['properties']['administratorLoginPassword'],
-            fully_qualified_domain_name: server['properties']['fullyQualifiedDomainName']
-          }
-        end
-
-        def save
-          requires :name, :resource_group, :location, :version, :administrator_login, :administrator_login_password
-          sql_server = service.create_or_update_sql_server(database_params)
-          merge_attributes(Fog::Sql::AzureRM::SqlServer.parse(sql_server))
-        end
-
-        def destroy
-          service.delete_sql_server(resource_group, name)
-        end
-
-        private
-
-        def database_params
-          {
-            resource_group: resource_group,
-            name: name,
-            version: version,
-            location: location,
-            administrator_login: administrator_login,
-            administrator_login_password: administrator_login_password
-          }
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Sql
+    class AzureRM
+      # Sql Server model for Server Service
+      class SqlServer < Fog::Model
+        identity :name
+        attribute :id
+        attribute :type
+        attribute :resource_group
+        attribute :location
+        attribute :version
+        attribute :state
+        attribute :administrator_login, aliases: %w(administratorLogin)
+        attribute :administrator_login_password, aliases: %w(administratorLoginPassword)
+        attribute :fully_qualified_domain_name, aliases: %w(fullyQualifiedDomainName)
+
+        def self.parse(server)
+          data = {}
+          data['resource_group'] = get_resource_group_from_id(server['id'])
+          if server.is_a? Hash
+            server.each do |k, v|
+              if k == 'properties'
+                v.each do |j, l|
+                  data[j] = l
+                end
+              else
+                data[k] = v
+              end
+            end
+          else
+            raise 'Object is not a hash. Parsing SQL Server object failed.'
+          end
+
+          data
+        end
+
+        def save
+          requires :name, :resource_group, :location, :version, :administrator_login, :administrator_login_password
+          sql_server = service.create_or_update_sql_server(format_sql_server_params)
+          merge_attributes(Fog::Sql::AzureRM::SqlServer.parse(sql_server))
+        end
+
+        def destroy
+          service.delete_sql_server(resource_group, name)
+        end
+
+        private
+
+        def format_sql_server_params
+          {
+            resource_group: resource_group,
+            name: name,
+            version: version,
+            location: location,
+            administrator_login: administrator_login,
+            administrator_login_password: administrator_login_password
+          }
+        end
+      end
+    end
+  end
+end