ey-core 3.6.4 → 3.6.5

data/lib/ey-core/models/database_service.rb

@@ -1,52 +1,52 @@
-class Ey::Core::Client::DatabaseService < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :location
-  attribute :name
-  attribute :deleted_at, type: :time
-  attribute :service_level
-
-  has_one :provider
-
-  has_many :databases, model: :logical_databases
-  has_many :servers,   model: :database_servers
-  has_many :snapshots, model: :database_server_snapshots
-
-  # @todo remove me next major revision
-  attr_accessor :database_server
-
-  def save!
-    requires :name, :provider_id
-
-    server_info  = self.servers.map { |c| c.is_a?(Ey::Core::Client::DatabaseServer) ? c.attributes : c }
-
-    server_info += [database_server] if database_server
-
-    if server_info.size > 1
-      raise ArgumentError, "only one server can be specified"
-    elsif server_info.size < 1
-      raise ArgumentError, "you must specify at least one server dude"
-    end
-
-    params = {
-      "url"              => self.collection.url,
-      "provider"         => self.provider_id,
-      "database_server"  => server_info.first,
-      "database_service" => {
-        "name"          => self.name,
-        "service_level" => self.service_level,
-      },
-    }
-
-    if new_record?
-      self.connection.requests.new(self.connection.create_database_service(params).body["request"])
-    else raise NotImplementedError
-    end
-  end
-
-  def destroy!
-    connection.requests.new(self.connection.destroy_database_service("id" => self.id).body["request"])
-  end
-end
+class Ey::Core::Client::DatabaseService < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :location
+  attribute :name
+  attribute :deleted_at, type: :time
+  attribute :service_level
+
+  has_one :provider
+
+  has_many :databases, model: :logical_databases
+  has_many :servers,   model: :database_servers
+  has_many :snapshots, model: :database_server_snapshots
+
+  # @todo remove me next major revision
+  attr_accessor :database_server
+
+  def save!
+    requires :name, :provider_id
+
+    server_info  = self.servers.map { |c| c.is_a?(Ey::Core::Client::DatabaseServer) ? c.attributes : c }
+
+    server_info += [database_server] if database_server
+
+    if server_info.size > 1
+      raise ArgumentError, "only one server can be specified"
+    elsif server_info.size < 1
+      raise ArgumentError, "you must specify at least one server dude"
+    end
+
+    params = {
+      "url"              => self.collection.url,
+      "provider"         => self.provider_id,
+      "database_server"  => server_info.first,
+      "database_service" => {
+        "name"          => self.name,
+        "service_level" => self.service_level,
+      },
+    }
+
+    if new_record?
+      self.connection.requests.new(self.connection.create_database_service(params).body["request"])
+    else raise NotImplementedError
+    end
+  end
+
+  def destroy!
+    connection.requests.new(self.connection.destroy_database_service("id" => self.id).body["request"])
+  end
+end

data/lib/ey-core/models/deployment.rb

@@ -1,31 +1,31 @@
-class Ey::Core::Client::Deployment < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id, type: :integer
-
-  attribute :commit
-  attribute :finished_at,    type: :time
-  attribute :migrate,        type: :boolean
-  attribute :migrate_command
-  attribute :ref
-  attribute :resolved_ref
-  attribute :serverside_version
-  attribute :started_at,     type: :time
-  attribute :successful,     type: :boolean
-  attribute :verbose
-  attribute :streaming
-  attribute :request_url, aliases: :request
-
-  has_one :account
-  has_one :environment
-  has_one :application
-  has_one :user
-
-  def request
-    self.request_url && self.connection.requests.get(self.request_url.split("/").last)
-  end
-
-  def timeout(message=nil)
-    merge_attributes(self.connection.timeout_deployment("id" => self.id, "message" => message).body["deployment"])
-  end
-end
+class Ey::Core::Client::Deployment < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id, type: :integer
+
+  attribute :commit
+  attribute :finished_at,    type: :time
+  attribute :migrate,        type: :boolean
+  attribute :migrate_command
+  attribute :ref
+  attribute :resolved_ref
+  attribute :serverside_version
+  attribute :started_at,     type: :time
+  attribute :successful,     type: :boolean
+  attribute :verbose
+  attribute :streaming
+  attribute :request_url, aliases: :request
+
+  has_one :account
+  has_one :environment
+  has_one :application
+  has_one :user
+
+  def request
+    self.request_url && self.connection.requests.get(self.request_url.split("/").last)
+  end
+
+  def timeout(message=nil)
+    merge_attributes(self.connection.timeout_deployment("id" => self.id, "message" => message).body["deployment"])
+  end
+end

data/lib/ey-core/models/environment.rb

@@ -1,248 +1,248 @@
-class Ey::Core::Client::Environment < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :classic, type: :boolean
-  attribute :created_at, type: :time
-  attribute :custom_recipes
-  attribute :database_stack
-  attribute :deleted_at, type: :time
-  attribute :deploy_method
-  attribute :framework_env
-  attribute :language
-  attribute :monitor_url
-  attribute :name
-  attribute :region
-  attribute :release_label
-  attribute :stack_name
-  attribute :username
-  attribute :service_level
-  attribute :database_backup_limit
-  attribute :encrypted_ebs_for_everything
-
-  has_one :account
-  has_one :database_service
-  has_one :firewall
-  has_one :auto_scaling_group
-  has_one :assignee, assoc_name: :user, resource: :user
-
-  has_many :costs
-  has_many :keypairs
-  has_many :servers
-  has_many :applications
-  has_many :logical_databases
-  has_many :deployments
-  has_many :environment_variables
-
-  attr_accessor :application_id
-
-  def latest_deploy(app)
-    deployments = connection.deployments.all(environment_id: self.id, application_id: app.id)
-    deployments.first
-  end
-
-  # @param application [Ey::Core::Client::Application]
-  # @option opts [Ey::Core::Client::ApplicationArchive] :archive
-  def deploy(application, opts={})
-    raise "Environment does not contain an app deployment for this application" unless self.applications.get(application.id)
-    raise ":ref is a required key" unless opts[:ref]
-    connection.requests.new(connection.deploy_environment_application({"deploy" => opts}.merge("id" => self.id, "application_id" => application.id)).body["request"])
-  end
-
-  # @param application [Ey::Core::Client::Application]
-  # @param action [String]
-  # @option opts [Ey::Core::Client::ApplicationArchive] :archive
-  def run_action(application, action, task={})
-    requires :id
-
-    response = self.connection.run_environment_application_action(
-      "environment" => self.id,
-      "application" => application.id,
-      "task"        => task,
-      "action"      => action,
-    )
-    connection.requests.new(response.body["request"])
-  end
-
-  def apply(type="main", data={})
-    connection.requests.new(self.connection.apply_environment_updates("id" => self.id, "type" => type, "data" => data).body["request"])
-  end
-
-  def deprovision
-    connection.requests.new(self.connection.deprovision_environment("id" => self.id).body["request"])
-  end
-
-  def destroy!
-    connection.requests.new(self.connection.destroy_environment("id" => self.id).body["request"])
-  end
-
-  def application
-    if self.application_id
-      connection.applications.get(self.application_id)
-    end
-  end
-
-  def blueprints
-    requires :id
-    self.connection.blueprints.all(environment: self.identity)
-  end
-
-  def save_blueprint(options={})
-    requires :id
-    raise "name is a required key" unless options["name"]
-    self.connection.blueprints.new(self.connection.blueprint_environment("id" => self.id, "name" => options["name"]).body["blueprint"])
-  end
-
-  def upload_recipes(file)
-    # file should be a StringIO
-    self.connection.upload_recipes_for_environment("file" => file, "id" => self.identity)
-  end
-
-  def maintenance(application, action)
-    requires :identity
-
-    params = {
-      "id"             => self.identity,
-      "application_id" => application.id,
-      "maintenance"    => {
-        "action" => action
-      }
-    }
-
-    self.connection.requests.new(self.connection.change_environment_maintenance(params).body["request"])
-  end
-
-  def restart_app_servers
-    params = {
-      "id"             => self.identity,
-      "application_id" => self.applications.first.id,
-    }
-
-    self.connection.requests.new(self.connection.restart_environment_app_servers(params).body["request"])
-  end
-
-  def download_recipes
-    tempfile = Tempfile.new("cookbooks-#{self.name}.tar.gz")
-    File.open(tempfile, 'wb') { |f| f.write self.connection.request(url: self.custom_recipes).body }
-    tempfile
-  end
-
-  def boot(options={})
-    options = Cistern::Hash.stringify_keys(options)
-    connection.requests.new(self.connection.boot_environment(boot_params(options)).body["request"])
-  end
-
-  def unassign!
-    requires :id
-    merge_attributes(self.connection.unassign_environment("id" => self.id).body["environment"])
-  end
-
-  def save!
-    if new_record?
-      requires :application_id, :account_id, :region
-
-      params = {
-        "url"         => self.collection.url,
-        "account"     => self.account_id,
-        "environment" => {
-          "name"                         => self.name,
-          "application_id"               => self.application_id,
-          "region"                       => self.region,
-          "stack_name"                   => self.stack_name,
-          "database_stack"               => self.database_stack,
-          "release_label"                => self.release_label,
-          "language"                     => self.language,
-          "database_backup_limit"        => self.database_backup_limit,
-          "encrypted_ebs_for_everything" => self.encrypted_ebs_for_everything,
-        },
-      }
-
-      params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
-
-      merge_attributes(self.connection.create_environment(params).body["environment"])
-    else
-      requires :identity
-      attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "nane", "release_label")
-      connection.update_environment(
-        "id"     => self.identity,
-        "environment" => attributes,
-      )
-    end
-  end
-
-  private
-
-  def boot_params(options)
-    params = {
-      "cluster_configuration" => {}
-    }
-    
-    if options["blueprint_id"]
-      params = {
-        "cluster_configuration" => {
-          "blueprint_id" => options["blueprint_id"],
-          "configuration" => {}
-        }
-      }
-      if ip_id = options["ip_id"]
-        params["cluster_configuration"]["configuration"]["ip_id"] = ip_id
-      end
-    else
-      raise "configuration is a required key" unless options["configuration"]
-      raise "configuration['type'] is required" unless options["configuration"]["type"]
-    end
-
-    if options['configuration']
-      missing_keys = []
-
-      configuration = options["configuration"]
-      required_keys = %w(flavor volume_size mnt_volume_size)
-
-      if self.database_service
-        raise "application_id is a required key" unless options["application_id"]
-
-        configuration["logical_database"] = "#{self.name}_#{self.application.name}"
-      end
-
-      if configuration["type"] == 'custom'
-        apps      = configuration["apps"]      ||= {}
-        db_master = configuration["db_master"] ||= {}
-        db_slaves = configuration["db_slaves"] ||= []
-        utils     = configuration["utils"]     ||= []
-
-        missing_keys << "apps" unless apps.any?
-        (required_keys + ["count"]).each do |required|
-          missing_keys << "apps[#{required}]" unless apps[required]
-        end
-
-        unless configuration["database_service_id"]
-          missing_keys << "db_master" unless db_master.any?
-
-          required_keys.each do |key|
-            missing_keys << "db_master[#{key}]" unless db_master[key]
-          end
-        end
-
-        db_slaves.each_with_index do |slave, i|
-          (required_keys - ["volume_size", "mnt_volume_size"]).each do |key|
-            missing_keys << "db_slaves[#{i}][#{key}]" unless slave[key]
-          end
-        end
-
-        utils.each_with_index do |util, i|
-          required_keys.each do |key|
-            missing_keys << "utils[#{i}][#{key}]" unless util[key]
-          end
-        end
-      end
-
-      if missing_keys.any?
-        raise "Invalid configuration - The following keys are missing from the configuration:\n#{missing_keys.join(",\n")}"
-      end
-
-      params["cluster_configuration"]["configuration"] = configuration
-    end
-    params.merge("id" => self.id)
-  end
-end
+class Ey::Core::Client::Environment < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :classic, type: :boolean
+  attribute :created_at, type: :time
+  attribute :custom_recipes
+  attribute :database_stack
+  attribute :deleted_at, type: :time
+  attribute :deploy_method
+  attribute :framework_env
+  attribute :language
+  attribute :monitor_url
+  attribute :name
+  attribute :region
+  attribute :release_label
+  attribute :stack_name
+  attribute :username
+  attribute :service_level
+  attribute :database_backup_limit
+  attribute :encrypted_ebs_for_everything
+
+  has_one :account
+  has_one :database_service
+  has_one :firewall
+  has_one :auto_scaling_group
+  has_one :assignee, assoc_name: :user, resource: :user
+
+  has_many :costs
+  has_many :keypairs
+  has_many :servers
+  has_many :applications
+  has_many :logical_databases
+  has_many :deployments
+  has_many :environment_variables
+
+  attr_accessor :application_id
+
+  def latest_deploy(app)
+    deployments = connection.deployments.all(environment_id: self.id, application_id: app.id)
+    deployments.first
+  end
+
+  # @param application [Ey::Core::Client::Application]
+  # @option opts [Ey::Core::Client::ApplicationArchive] :archive
+  def deploy(application, opts={})
+    raise "Environment does not contain an app deployment for this application" unless self.applications.get(application.id)
+    raise ":ref is a required key" unless opts[:ref]
+    connection.requests.new(connection.deploy_environment_application({"deploy" => opts}.merge("id" => self.id, "application_id" => application.id)).body["request"])
+  end
+
+  # @param application [Ey::Core::Client::Application]
+  # @param action [String]
+  # @option opts [Ey::Core::Client::ApplicationArchive] :archive
+  def run_action(application, action, task={})
+    requires :id
+
+    response = self.connection.run_environment_application_action(
+      "environment" => self.id,
+      "application" => application.id,
+      "task"        => task,
+      "action"      => action,
+    )
+    connection.requests.new(response.body["request"])
+  end
+
+  def apply(type="main", data={})
+    connection.requests.new(self.connection.apply_environment_updates("id" => self.id, "type" => type, "data" => data).body["request"])
+  end
+
+  def deprovision
+    connection.requests.new(self.connection.deprovision_environment("id" => self.id).body["request"])
+  end
+
+  def destroy!
+    connection.requests.new(self.connection.destroy_environment("id" => self.id).body["request"])
+  end
+
+  def application
+    if self.application_id
+      connection.applications.get(self.application_id)
+    end
+  end
+
+  def blueprints
+    requires :id
+    self.connection.blueprints.all(environment: self.identity)
+  end
+
+  def save_blueprint(options={})
+    requires :id
+    raise "name is a required key" unless options["name"]
+    self.connection.blueprints.new(self.connection.blueprint_environment("id" => self.id, "name" => options["name"]).body["blueprint"])
+  end
+
+  def upload_recipes(file)
+    # file should be a StringIO
+    self.connection.upload_recipes_for_environment("file" => file, "id" => self.identity)
+  end
+
+  def maintenance(application, action)
+    requires :identity
+
+    params = {
+      "id"             => self.identity,
+      "application_id" => application.id,
+      "maintenance"    => {
+        "action" => action
+      }
+    }
+
+    self.connection.requests.new(self.connection.change_environment_maintenance(params).body["request"])
+  end
+
+  def restart_app_servers
+    params = {
+      "id"             => self.identity,
+      "application_id" => self.applications.first.id,
+    }
+
+    self.connection.requests.new(self.connection.restart_environment_app_servers(params).body["request"])
+  end
+
+  def download_recipes
+    tempfile = Tempfile.new("cookbooks-#{self.name}.tar.gz")
+    File.open(tempfile, 'wb') { |f| f.write self.connection.request(url: self.custom_recipes).body }
+    tempfile
+  end
+
+  def boot(options={})
+    options = Cistern::Hash.stringify_keys(options)
+    connection.requests.new(self.connection.boot_environment(boot_params(options)).body["request"])
+  end
+
+  def unassign!
+    requires :id
+    merge_attributes(self.connection.unassign_environment("id" => self.id).body["environment"])
+  end
+
+  def save!
+    if new_record?
+      requires :application_id, :account_id, :region
+
+      params = {
+        "url"         => self.collection.url,
+        "account"     => self.account_id,
+        "environment" => {
+          "name"                         => self.name,
+          "application_id"               => self.application_id,
+          "region"                       => self.region,
+          "stack_name"                   => self.stack_name,
+          "database_stack"               => self.database_stack,
+          "release_label"                => self.release_label,
+          "language"                     => self.language,
+          "database_backup_limit"        => self.database_backup_limit,
+          "encrypted_ebs_for_everything" => self.encrypted_ebs_for_everything,
+        },
+      }
+
+      params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
+
+      merge_attributes(self.connection.create_environment(params).body["environment"])
+    else
+      requires :identity
+      attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "nane", "release_label")
+      connection.update_environment(
+        "id"     => self.identity,
+        "environment" => attributes,
+      )
+    end
+  end
+
+  private
+
+  def boot_params(options)
+    params = {
+      "cluster_configuration" => {}
+    }
+    
+    if options["blueprint_id"]
+      params = {
+        "cluster_configuration" => {
+          "blueprint_id" => options["blueprint_id"],
+          "configuration" => {}
+        }
+      }
+      if ip_id = options["ip_id"]
+        params["cluster_configuration"]["configuration"]["ip_id"] = ip_id
+      end
+    else
+      raise "configuration is a required key" unless options["configuration"]
+      raise "configuration['type'] is required" unless options["configuration"]["type"]
+    end
+
+    if options['configuration']
+      missing_keys = []
+
+      configuration = options["configuration"]
+      required_keys = %w(flavor volume_size mnt_volume_size)
+
+      if self.database_service
+        raise "application_id is a required key" unless options["application_id"]
+
+        configuration["logical_database"] = "#{self.name}_#{self.application.name}"
+      end
+
+      if configuration["type"] == 'custom'
+        apps      = configuration["apps"]      ||= {}
+        db_master = configuration["db_master"] ||= {}
+        db_slaves = configuration["db_slaves"] ||= []
+        utils     = configuration["utils"]     ||= []
+
+        missing_keys << "apps" unless apps.any?
+        (required_keys + ["count"]).each do |required|
+          missing_keys << "apps[#{required}]" unless apps[required]
+        end
+
+        unless configuration["database_service_id"]
+          missing_keys << "db_master" unless db_master.any?
+
+          required_keys.each do |key|
+            missing_keys << "db_master[#{key}]" unless db_master[key]
+          end
+        end
+
+        db_slaves.each_with_index do |slave, i|
+          (required_keys - ["volume_size", "mnt_volume_size"]).each do |key|
+            missing_keys << "db_slaves[#{i}][#{key}]" unless slave[key]
+          end
+        end
+
+        utils.each_with_index do |util, i|
+          required_keys.each do |key|
+            missing_keys << "utils[#{i}][#{key}]" unless util[key]
+          end
+        end
+      end
+
+      if missing_keys.any?
+        raise "Invalid configuration - The following keys are missing from the configuration:\n#{missing_keys.join(",\n")}"
+      end
+
+      params["cluster_configuration"]["configuration"] = configuration
+    end
+    params.merge("id" => self.id)
+  end
+end