ey-core 3.4.5 → 3.5.0

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

@@ -1,40 +1,40 @@
-class Ey::Core::Client::LogicalDatabase < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :name
-  attribute :username
-  attribute :password
-  attribute :created_at, type: :time
-  attribute :updated_at, type: :time
-  attribute :deleted_at, type: :time
-  attribute :extensions, type: :array
-
-  has_one :service, resource: :database_service
-
-  def save!
-    requires :name
-
-    params = {
-      "url"              => self.collection.url,
-      "database_service" => self.service_id,
-      "logical_database" => Cistern::Hash.slice(attributes, :name, :extensions),
-    }
-
-    if new_record?
-      self.connection.requests.new(self.connection.create_logical_database(params).body["request"])
-    else raise NotImplementedError
-    end
-  end
-
-  def destroy!
-    connection.requests.new(self.connection.destroy_logical_database("id" => self.id).body["request"])
-  end
-
-  def connect(cluster_component, configuration={})
-    requires :identity
-
-    self.connection.connectors.create(source: self, destination: cluster_component, configuration: configuration)
-  end
-end
+class Ey::Core::Client::LogicalDatabase < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :name
+  attribute :username
+  attribute :password
+  attribute :created_at, type: :time
+  attribute :updated_at, type: :time
+  attribute :deleted_at, type: :time
+  attribute :extensions, type: :array
+
+  has_one :service, resource: :database_service
+
+  def save!
+    requires :name
+
+    params = {
+      "url"              => self.collection.url,
+      "database_service" => self.service_id,
+      "logical_database" => Cistern::Hash.slice(attributes, :name, :extensions),
+    }
+
+    if new_record?
+      self.connection.requests.new(self.connection.create_logical_database(params).body["request"])
+    else raise NotImplementedError
+    end
+  end
+
+  def destroy!
+    connection.requests.new(self.connection.destroy_logical_database("id" => self.id).body["request"])
+  end
+
+  def connect(cluster_component, configuration={})
+    requires :identity
+
+    self.connection.connectors.create(source: self, destination: cluster_component, configuration: configuration)
+  end
+end

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

@@ -1,49 +1,49 @@
-class Ey::Core::Client::Membership < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :role
-  attribute :email
-  attribute :redirect_url
-
-  attribute :accepted_at
-  attribute :rejected_at
-
-  attribute :created_at
-  attribute :deleted_at
-  attribute :updated_at
-
-  has_one :account
-  has_one :user
-  has_one :requester, collection: :users, resource: :user
-
-  def accept!
-    params = {
-      "membership" => {
-        "accepted" => true
-      }
-    }
-    params["id"] = self.id
-    merge_attributes(self.connection.update_membership(params).body["membership"])
-  end
-
-  def save!
-    if new_record?
-      params = {
-        "membership" => {
-          "account"      => self.account_id,
-          "user"         => self.user_id,
-          "role"         => self.role,
-          "email"        => self.email,
-          "redirect_url" => self.redirect_url,
-        }
-      }
-
-      merge_attributes(self.connection.create_membership(params).body["membership"])
-    else
-      raise "Updating memberships is not yet supported"
-    end
-  end
-
-end
+class Ey::Core::Client::Membership < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :role
+  attribute :email
+  attribute :redirect_url
+
+  attribute :accepted_at
+  attribute :rejected_at
+
+  attribute :created_at
+  attribute :deleted_at
+  attribute :updated_at
+
+  has_one :account
+  has_one :user
+  has_one :requester, collection: :users, resource: :user
+
+  def accept!
+    params = {
+      "membership" => {
+        "accepted" => true
+      }
+    }
+    params["id"] = self.id
+    merge_attributes(self.connection.update_membership(params).body["membership"])
+  end
+
+  def save!
+    if new_record?
+      params = {
+        "membership" => {
+          "account"      => self.account_id,
+          "user"         => self.user_id,
+          "role"         => self.role,
+          "email"        => self.email,
+          "redirect_url" => self.redirect_url,
+        }
+      }
+
+      merge_attributes(self.connection.create_membership(params).body["membership"])
+    else
+      raise "Updating memberships is not yet supported"
+    end
+  end
+
+end

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

@@ -1,27 +1,27 @@
-class Ey::Core::Client::Message < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :created_at, type: :time
-  attribute :message
-
-  attr_accessor :request_id
-
-  def save!
-    params = {
-      "message" => self.message,
-      "url"     => self.collection.url,
-    }
-
-    if self.request_id
-      params["url"] = self.connection.url_for("/requests/#{self.request_id}/messages")
-    end
-
-    if new_record?
-      message = self.collection.new(self.connection.create_message(params).body["message"])
-      merge_attributes(message.attributes)
-    else raise NotImplementedError
-    end
-  end
-end
+class Ey::Core::Client::Message < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :created_at, type: :time
+  attribute :message
+
+  attr_accessor :request_id
+
+  def save!
+    params = {
+      "message" => self.message,
+      "url"     => self.collection.url,
+    }
+
+    if self.request_id
+      params["url"] = self.connection.url_for("/requests/#{self.request_id}/messages")
+    end
+
+    if new_record?
+      message = self.collection.new(self.connection.create_message(params).body["message"])
+      merge_attributes(message.attributes)
+    else raise NotImplementedError
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-class Ey::Core::Client::PlanUsage < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  attribute :billable
-  attribute :billable_type
-  attribute :description
-  attribute :end_at,      type: :time
-  attribute :flavor_limit
-  attribute :report_time, type: :time
-  attribute :server_limit
-  attribute :start_at,    type: :time
-  attribute :support
-  attribute :type
-end
+class Ey::Core::Client::PlanUsage < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  attribute :billable
+  attribute :billable_type
+  attribute :description
+  attribute :end_at,      type: :time
+  attribute :flavor_limit
+  attribute :report_time, type: :time
+  attribute :server_limit
+  attribute :start_at,    type: :time
+  attribute :support
+  attribute :type
+end

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

@@ -1,59 +1,59 @@
-class Ey::Core::Client::Provider < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id, type: :integer
-
-  attribute :cancelled_at, type: :time
-  attribute :created_at,   type: :time
-  attribute :credentials
-  attribute :provisioned_id
-  attribute :shared,       type: :boolean
-  attribute :type
-  attribute :updated_at,   type: :time
-
-  has_one :account
-
-  has_many :provider_locations
-  has_many :servers
-  has_many :storages
-  has_many :untracked_servers
-
-  def possible_locations(provider_type = self.type)
-    self.connection.get_possible_provider_locations(provider_type).body["locations"].map { |l| l["id"] }
-  end
-
-  def database_server_snapshots
-    connection.database_server_snapshots.load(connection.get_database_server_snapshots("provider" => self.id).body["database_server_snapshots"])
-  end
-
-  def discover_database_server_snapshots
-    connection.requests.new(connection.discover_database_server_snapshots("provider" => self.id).body["request"])
-  end
-
-  # @return [Ey::Core::Client::Account]
-  def account
-    self.connection.accounts.new(self.connection.get_account("url" => self.account_url).body["account"])
-  end
-
-  def destroy!
-    connection.requests.new(self.connection.destroy_provider(self.id).body["request"])
-  end
-
-  def save
-    params = {
-      "url"      => self.collection.url,
-      "account"  => self.account_id,
-      "provider" => {
-        "credentials"    => self.credentials,
-        "provisioned_id" => self.provisioned_id,
-        "type"           => self.type,
-      },
-    }
-    if new_record?
-      connection.requests.new(self.connection.create_provider(params).body["request"])
-    else raise NotImplementedError # update
-    end
-  end
-
-  alias save! save
-end
+class Ey::Core::Client::Provider < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id, type: :integer
+
+  attribute :cancelled_at, type: :time
+  attribute :created_at,   type: :time
+  attribute :credentials
+  attribute :provisioned_id
+  attribute :shared,       type: :boolean
+  attribute :type
+  attribute :updated_at,   type: :time
+
+  has_one :account
+
+  has_many :provider_locations
+  has_many :servers
+  has_many :storages
+  has_many :untracked_servers
+
+  def possible_locations(provider_type = self.type)
+    self.connection.get_possible_provider_locations(provider_type).body["locations"].map { |l| l["id"] }
+  end
+
+  def database_server_snapshots
+    connection.database_server_snapshots.load(connection.get_database_server_snapshots("provider" => self.id).body["database_server_snapshots"])
+  end
+
+  def discover_database_server_snapshots
+    connection.requests.new(connection.discover_database_server_snapshots("provider" => self.id).body["request"])
+  end
+
+  # @return [Ey::Core::Client::Account]
+  def account
+    self.connection.accounts.new(self.connection.get_account("url" => self.account_url).body["account"])
+  end
+
+  def destroy!
+    connection.requests.new(self.connection.destroy_provider(self.id).body["request"])
+  end
+
+  def save
+    params = {
+      "url"      => self.collection.url,
+      "account"  => self.account_id,
+      "provider" => {
+        "credentials"    => self.credentials,
+        "provisioned_id" => self.provisioned_id,
+        "type"           => self.type,
+      },
+    }
+    if new_record?
+      connection.requests.new(self.connection.create_provider(params).body["request"])
+    else raise NotImplementedError # update
+    end
+  end
+
+  alias save! save
+end

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

@@ -1,24 +1,24 @@
-class Ey::Core::Client::ProviderLocation < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :location_id
-  attribute :location_name
-  attribute :limits, type: :hash
-
-  has_one :provider
-
-  def save!
-    params = {
-      "id" => self.id,
-      "provider_location" => {
-        "limits" => self.limits,
-      },
-    }
-
-    unless new_record?
-      merge_attributes(self.connection.update_provider_location(params).body["provider_location"])
-    end
-  end
-end
+class Ey::Core::Client::ProviderLocation < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :location_id
+  attribute :location_name
+  attribute :limits, type: :hash
+
+  has_one :provider
+
+  def save!
+    params = {
+      "id" => self.id,
+      "provider_location" => {
+        "limits" => self.limits,
+      },
+    }
+
+    unless new_record?
+      merge_attributes(self.connection.update_provider_location(params).body["provider_location"])
+    end
+  end
+end

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

@@ -1,105 +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 /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