ey-core 3.6.4 → 3.6.6

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

@@ -1,109 +1,109 @@
-class Ey::Core::Client::Request < Ey::Core::Model
-  extend Ey::Core::Associations
-  include Ey::Core::Subscribable
-
-  identity :id
-
-  attribute :callback_url
-  attribute :created_at,        type: :time
-  attribute :finished_at,       type: :time
-  attribute :message
-  attribute :progress,          type: :integer
-  attribute :resource_url,      aliases: "resource"
-  attribute :stage
-  attribute :started_at,        type: :time
-  attribute :successful,        type: :boolean
-  attribute :type
-  attribute :updated_at,        type: :time
-
-  has_many :dependencies, model: :requests
-
-  def callback
-    requires :callback_url
-
-    merge_attributes(connection.request_callback("url" => self.callback_url).body["request"])
-  end
-
-  def ready!(timeout = self.service.timeout, interval = self.service.poll_interval, raise_on_failure = true, &block)
-    wait_for!(timeout, interval) do
-      yield self if block_given?
-      ready?
-    end
-    if raise_on_failure && !successful?
-      raise Ey::Core::RequestFailure.new(self)
-    end
-    self
-  end
-
-  def ready?
-    !!self.finished_at
-  end
-
-  def successful?
-    self.successful
-  end
-
-  def resource!(timeout = self.service.timeout, interval = self.service.poll_interval)
-    ready!(timeout, interval); resource
-  end
-
-  def resource
-    return nil unless resource_url
-    resource_id = resource_url.split("/").last
-    case type
-    when /address/
-      self.connection.addresses.get!(resource_id)
-    when /auto_scaling_group/
-      self.connection.auto_scaling_groups.get!(resource_id)
-    when /auto_scaling_policy/
-      self.connection.auto_scaling_policies.get(resource_id)
-    when /auto_scaling_alarm/
-      self.connection.auto_scaling_alarms.get(resource_id)
-    when /cluster_update/
-      self.connection.cluster_updates.get!(resource_id)
-    when /database_server_snapshot/
-      collection, id = resource_url.split('/')[-3..-2]
-      if collection == "providers"
-        connection.providers.get!(id).database_server_snapshots
-      elsif collection == "database-servers"
-        connection.database_servers.get!(id).snapshots
-      else
-        connection.database_server_snapshots.get!(resource_id)
-      end
-    when /database_server/
-      self.connection.database_servers.get!(resource_id)
-    when /database_service/
-      self.connection.database_services.get!(resource_id)
-    when /deployment/
-      self.connection.deployments.get!(resource_id)
-    when /firewall(?!_rule)/
-      self.connection.firewalls.get!(resource_id)
-    when /firewall_rule/
-      self.connection.firewall_rules.get!(resource_id)
-    when /logical_database/
-      self.connection.logical_databases.get!(resource_id)
-    when /provider_location/
-      self.connection.provider_locations.get!(resource_id)
-    when /provider_storage_credential/
-      self.connection.storage_users.get!(resource_id)
-    when /provider_storage/
-      self.connection.storages.get!(resource_id)
-    when /provider/
-      self.connection.providers.get!(resource_id)
-    when /server/
-      self.connection.servers.get!(resource_id)
-    when /snapshot/
-      self.connection.snapshots.get!(resource_id)
-    when /task/
-      self.connection.tasks.get!(resource_id)
-    when /volume/
-      self.connection.volumes.get!(resource_id)
-    when /load_balancer/
-      self.connection.load_balancers.get!(resource_id)
-    when /ssl_certificate/
-      self.connection.ssl_certificates.get!(resource_id)
-    else
-      nil # has no coresponding resource
-    end
-  end
-end
+class Ey::Core::Client::Request < Ey::Core::Model
+  extend Ey::Core::Associations
+  include Ey::Core::Subscribable
+
+  identity :id
+
+  attribute :callback_url
+  attribute :created_at,        type: :time
+  attribute :finished_at,       type: :time
+  attribute :message
+  attribute :progress,          type: :integer
+  attribute :resource_url,      aliases: "resource"
+  attribute :stage
+  attribute :started_at,        type: :time
+  attribute :successful,        type: :boolean
+  attribute :type
+  attribute :updated_at,        type: :time
+
+  has_many :dependencies, model: :requests
+
+  def callback
+    requires :callback_url
+
+    merge_attributes(connection.request_callback("url" => self.callback_url).body["request"])
+  end
+
+  def ready!(timeout = self.service.timeout, interval = self.service.poll_interval, raise_on_failure = true, &block)
+    wait_for!(timeout, interval) do
+      yield self if block_given?
+      ready?
+    end
+    if raise_on_failure && !successful?
+      raise Ey::Core::RequestFailure.new(self)
+    end
+    self
+  end
+
+  def ready?
+    !!self.finished_at
+  end
+
+  def successful?
+    self.successful
+  end
+
+  def resource!(timeout = self.service.timeout, interval = self.service.poll_interval)
+    ready!(timeout, interval); resource
+  end
+
+  def resource
+    return nil unless resource_url
+    resource_id = resource_url.split("/").last
+    case type
+    when /address/
+      self.connection.addresses.get!(resource_id)
+    when /auto_scaling_group/
+      self.connection.auto_scaling_groups.get!(resource_id)
+    when /auto_scaling_policy/
+      self.connection.auto_scaling_policies.get(resource_id)
+    when /auto_scaling_alarm/
+      self.connection.auto_scaling_alarms.get(resource_id)
+    when /cluster_update/
+      self.connection.cluster_updates.get!(resource_id)
+    when /database_server_snapshot/
+      collection, id = resource_url.split('/')[-3..-2]
+      if collection == "providers"
+        connection.providers.get!(id).database_server_snapshots
+      elsif collection == "database-servers"
+        connection.database_servers.get!(id).snapshots
+      else
+        connection.database_server_snapshots.get!(resource_id)
+      end
+    when /database_server/
+      self.connection.database_servers.get!(resource_id)
+    when /database_service/
+      self.connection.database_services.get!(resource_id)
+    when /deployment/
+      self.connection.deployments.get!(resource_id)
+    when /firewall(?!_rule)/
+      self.connection.firewalls.get!(resource_id)
+    when /firewall_rule/
+      self.connection.firewall_rules.get!(resource_id)
+    when /logical_database/
+      self.connection.logical_databases.get!(resource_id)
+    when /provider_location/
+      self.connection.provider_locations.get!(resource_id)
+    when /provider_storage_credential/
+      self.connection.storage_users.get!(resource_id)
+    when /provider_storage/
+      self.connection.storages.get!(resource_id)
+    when /provider/
+      self.connection.providers.get!(resource_id)
+    when /server/
+      self.connection.servers.get!(resource_id)
+    when /snapshot/
+      self.connection.snapshots.get!(resource_id)
+    when /task/
+      self.connection.tasks.get!(resource_id)
+    when /volume/
+      self.connection.volumes.get!(resource_id)
+    when /load_balancer/
+      self.connection.load_balancers.get!(resource_id)
+    when /ssl_certificate/
+      self.connection.ssl_certificates.get!(resource_id)
+    else
+      nil # has no coresponding resource
+    end
+  end
+end

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

@@ -1,151 +1,151 @@
-class Ey::Core::Client::Server < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id, type: :integer
-
-  attribute :created_at,       type: :time
-  attribute :dedicated,        type: :boolean
-  attribute :deleted_at,       type: :time
-  attribute :deprovisioned_at, type: :time
-  attribute :devices,          type: :array
-  attribute :disappeared_at,   type: :time
-  attribute :enabled,          type: :boolean
-  attribute :flavor_id,        squash: ["flavor", "id"]
-  attribute :keymaster_id
-  attribute :location
-  attribute :name
-  attribute :private_hostname
-  attribute :provisioned_at,   type: :time
-  attribute :provisioned_id
-  attribute :public_hostname
-  attribute :public_key
-  attribute :role
-  attribute :ssh_port,         type: :integer
-  attribute :state
-  attribute :token
-  attribute :updated_at,       type: :time
-  attribute :wait_for_chef,    type: :boolean
-  attribute :release_label
-  attribute :ip_id
-
-  has_one :account
-  has_one :address, collection: "addresses"
-  has_one :environment
-  has_one :provider
-
-  has_many :alerts
-  has_many :volumes
-  has_many :events, key: :server_events
-  has_many :firewalls
-  has_many :logs
-
-  attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id, :force
-
-  def apply(type="main")
-    requires :identity
-
-    connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
-  end
-
-  def latest_main_log
-    logs.select{|l| l.filename.match(/main/)}.sort_by(&:created_at).last
-  end
-
-  def latest_custom_log
-    logs.select{|l| l.filename.match(/custom/)}.sort_by(&:created_at).last
-  end
-
-  def reboot
-    requires :identity
-
-    connection.requests.new(
-      self.connection.reboot_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def stop
-    requires :identity
-
-    connection.requests.new(
-      self.connection.stop_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def start
-    requires :identity
-
-    connection.requests.new(
-      self.connection.start_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def reconcile
-    requires :identity
-
-    connection.requests.new(
-      self.connection.reconcile_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def reset_state(state)
-    params = {
-      "url"   => self.collection.url,
-      "id"    => self.id,
-      "state" => state
-    }
-
-    unless new_record?
-      merge_attributes(self.connection.reset_server_state(params).body["server"])
-    end
-  end
-
-  def save!
-    if new_record?
-      requires :flavor_id, :role, :environment
-
-      server_attributes = {
-        "environment" => environment.id,
-        "wait_for_chef" => self.wait_for_chef,
-        "snapshot"    => self.snapshot_id,
-        "force"       => self.force,
-        "server"      => {
-          "dedicated"       => self.dedicated,
-          "flavor"          => self.flavor_id,
-          "iops"            => self.iops,
-          "location"        => self.location || environment.region,
-          "mnt_volume_size" => self.mnt_volume_size,
-          "name"            => self.name,
-          "release_label"   => self.release_label,
-          "role"            => self.role,
-          "volume_size"     => self.volume_size,
-          "ip_id"           => self.ip_id
-        }
-      }
-      connection.requests.new(connection.create_server(server_attributes).body["request"])
-    else
-      requires :identity
-      server_attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "provisioned_at", "deprovisioned_at", "disappeared_at")
-      server_attributes.merge!("status" => self.state) if self.state
-      connection.update_server(
-        "id"     => self.identity,
-        "server" => server_attributes,
-      )
-    end
-  end
-
-  def destroy!(skip_snapshot="false")
-    if environment.servers.count == 1
-      raise Ey::Core::Client::NotPermitted, "Terminating the last server in an environment is not allowed.  You must deprovision or destroy the environment instead."
-    end
-
-    requires :identity
-
-    params = {
-       :skip_snapshot => skip_snapshot
-    }
-
-    connection.requests.new(
-      self.connection.destroy_server(self.identity, params).body["request"]
-    )
-  end
-end
+class Ey::Core::Client::Server < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id, type: :integer
+
+  attribute :created_at,       type: :time
+  attribute :dedicated,        type: :boolean
+  attribute :deleted_at,       type: :time
+  attribute :deprovisioned_at, type: :time
+  attribute :devices,          type: :array
+  attribute :disappeared_at,   type: :time
+  attribute :enabled,          type: :boolean
+  attribute :flavor_id,        squash: ["flavor", "id"]
+  attribute :keymaster_id
+  attribute :location
+  attribute :name
+  attribute :private_hostname
+  attribute :provisioned_at,   type: :time
+  attribute :provisioned_id
+  attribute :public_hostname
+  attribute :public_key
+  attribute :role
+  attribute :ssh_port,         type: :integer
+  attribute :state
+  attribute :token
+  attribute :updated_at,       type: :time
+  attribute :wait_for_chef,    type: :boolean
+  attribute :release_label
+  attribute :ip_id
+
+  has_one :account
+  has_one :address, collection: "addresses"
+  has_one :environment
+  has_one :provider
+
+  has_many :alerts
+  has_many :volumes
+  has_many :events, key: :server_events
+  has_many :firewalls
+  has_many :logs
+
+  attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id, :force
+
+  def apply(type="main")
+    requires :identity
+
+    connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
+  end
+
+  def latest_main_log
+    logs.select{|l| l.filename.match(/main/)}.sort_by(&:created_at).last
+  end
+
+  def latest_custom_log
+    logs.select{|l| l.filename.match(/custom/)}.sort_by(&:created_at).last
+  end
+
+  def reboot
+    requires :identity
+
+    connection.requests.new(
+      self.connection.reboot_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def stop
+    requires :identity
+
+    connection.requests.new(
+      self.connection.stop_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def start
+    requires :identity
+
+    connection.requests.new(
+      self.connection.start_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def reconcile
+    requires :identity
+
+    connection.requests.new(
+      self.connection.reconcile_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def reset_state(state)
+    params = {
+      "url"   => self.collection.url,
+      "id"    => self.id,
+      "state" => state
+    }
+
+    unless new_record?
+      merge_attributes(self.connection.reset_server_state(params).body["server"])
+    end
+  end
+
+  def save!
+    if new_record?
+      requires :flavor_id, :role, :environment
+
+      server_attributes = {
+        "environment" => environment.id,
+        "wait_for_chef" => self.wait_for_chef,
+        "snapshot"    => self.snapshot_id,
+        "force"       => self.force,
+        "server"      => {
+          "dedicated"       => self.dedicated,
+          "flavor"          => self.flavor_id,
+          "iops"            => self.iops,
+          "location"        => self.location || environment.region,
+          "mnt_volume_size" => self.mnt_volume_size,
+          "name"            => self.name,
+          "release_label"   => self.release_label,
+          "role"            => self.role,
+          "volume_size"     => self.volume_size,
+          "ip_id"           => self.ip_id
+        }
+      }
+      connection.requests.new(connection.create_server(server_attributes).body["request"])
+    else
+      requires :identity
+      server_attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "provisioned_at", "deprovisioned_at", "disappeared_at")
+      server_attributes.merge!("status" => self.state) if self.state
+      connection.update_server(
+        "id"     => self.identity,
+        "server" => server_attributes,
+      )
+    end
+  end
+
+  def destroy!(skip_snapshot="false")
+    if environment.servers.count == 1
+      raise Ey::Core::Client::NotPermitted, "Terminating the last server in an environment is not allowed.  You must deprovision or destroy the environment instead."
+    end
+
+    requires :identity
+
+    params = {
+       :skip_snapshot => skip_snapshot
+    }
+
+    connection.requests.new(
+      self.connection.destroy_server(self.identity, params).body["request"]
+    )
+  end
+end

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

@@ -1,11 +1,11 @@
-class Ey::Core::Client::ServerEvent < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :type
-  attribute :created_at, type: :time
-  attribute :updated_at, type: :time
-
-  has_one :server
-end
+class Ey::Core::Client::ServerEvent < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :type
+  attribute :created_at, type: :time
+  attribute :updated_at, type: :time
+
+  has_one :server
+end

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

@@ -1,15 +1,15 @@
-class Ey::Core::Client::ServerUsage < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  attribute :start_at,    type: :time
-  attribute :end_at,      type: :time
-  attribute :report_time, type: :time
-  attribute :flavor
-  attribute :dedicated
-  attribute :location
-  attribute :deis
-  attribute :provisioned_id
-
-  has_one :environment
-  has_one :provider
-end
+class Ey::Core::Client::ServerUsage < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  attribute :start_at,    type: :time
+  attribute :end_at,      type: :time
+  attribute :report_time, type: :time
+  attribute :flavor
+  attribute :dedicated
+  attribute :location
+  attribute :deis
+  attribute :provisioned_id
+
+  has_one :environment
+  has_one :provider
+end

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

@@ -1,10 +1,10 @@
-class Ey::Core::Client::Service < Cistern::Model
-
-  identity :name
-
-  attribute :now, type: :time
-  attribute :environment
-  attribute :revision
-  attribute :version
-
-end
+class Ey::Core::Client::Service < Cistern::Model
+
+  identity :name
+
+  attribute :now, type: :time
+  attribute :environment
+  attribute :revision
+  attribute :version
+
+end

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

@@ -1,24 +1,24 @@
-class Ey::Core::Client::SimpleAutoScalingPolicy < Ey::Core::Client::BaseAutoScalingPolicy
-  identity :id
-  attribute :auto_scaling_group_id, aliases: "auto_scaling_group", squash: ["id"]
-  attribute :cooldown, type: :integer
-  attribute :action_unit
-  attribute :action_type
-  attribute :action_value
-
-  has_many :auto_scaling_alarms
-
-  def policy_params
-    {
-      "cooldown"     => cooldown,
-      "action_unit"  => action_unit,
-      "action_type"  => action_type,
-      "action_value" => action_value,
-      "type"         => type
-    }
-  end
-
-  def policy_requires
-    requires :action_value, :action_type, :action_unit
-  end
-end
+class Ey::Core::Client::SimpleAutoScalingPolicy < Ey::Core::Client::BaseAutoScalingPolicy
+  identity :id
+  attribute :auto_scaling_group_id, aliases: "auto_scaling_group", squash: ["id"]
+  attribute :cooldown, type: :integer
+  attribute :action_unit
+  attribute :action_type
+  attribute :action_value
+
+  has_many :auto_scaling_alarms
+
+  def policy_params
+    {
+      "cooldown"     => cooldown,
+      "action_unit"  => action_unit,
+      "action_type"  => action_type,
+      "action_value" => action_value,
+      "type"         => type
+    }
+  end
+
+  def policy_requires
+    requires :action_value, :action_type, :action_unit
+  end
+end