ey-core 3.4.4 → 3.4.5

data/lib/ey-core/collections/storages.rb

@@ -1,9 +1,9 @@
-class Ey::Core::Client::Storages < Ey::Core::Collection
-
-  model Ey::Core::Client::Storage
-
-  self.model_root         = "storage"
-  self.model_request      = :get_storage
-  self.collection_root    = "storages"
-  self.collection_request = :get_storages
-end
+class Ey::Core::Client::Storages < Ey::Core::Collection
+
+  model Ey::Core::Client::Storage
+
+  self.model_root         = "storage"
+  self.model_request      = :get_storage
+  self.collection_root    = "storages"
+  self.collection_request = :get_storages
+end

data/lib/ey-core/collections/tasks.rb

@@ -1,9 +1,9 @@
-class Ey::Core::Client::Tasks < Ey::Core::Collection
-
-  model Ey::Core::Client::Task
-
-  self.collection_request = :get_tasks
-  self.collection_root    = "tasks"
-  self.model_request      = :get_task
-  self.model_root         = "task"
-end
+class Ey::Core::Client::Tasks < Ey::Core::Collection
+
+  model Ey::Core::Client::Task
+
+  self.collection_request = :get_tasks
+  self.collection_root    = "tasks"
+  self.model_request      = :get_task
+  self.model_root         = "task"
+end

data/lib/ey-core/collections/tokens.rb

@@ -1,9 +1,9 @@
-class Ey::Core::Client::Tokens < Ey::Core::Collection
-
-  model Ey::Core::Client::Token
-
-  self.model_root         = "token"
-  self.model_request      = :get_token
-  self.collection_root    = "tokens"
-  self.collection_request = :get_tokens
-end
+class Ey::Core::Client::Tokens < Ey::Core::Collection
+
+  model Ey::Core::Client::Token
+
+  self.model_root         = "token"
+  self.model_request      = :get_token
+  self.collection_root    = "tokens"
+  self.collection_request = :get_tokens
+end

data/lib/ey-core/collections/untracked_addresses.rb

@@ -1,4 +1,4 @@
-class Ey::Core::Client::UntrackedAddresses < Ey::Core::Collection
-  model Ey::Core::Client::UntrackedAddress
-  self.model_root         = "untracked_address"
-end
+class Ey::Core::Client::UntrackedAddresses < Ey::Core::Collection
+  model Ey::Core::Client::UntrackedAddress
+  self.model_root         = "untracked_address"
+end

data/lib/ey-core/collections/untracked_servers.rb

@@ -1,9 +1,9 @@
-class Ey::Core::Client::UntrackedServers < Ey::Core::Collection
-
-  model Ey::Core::Client::UntrackedServer
-
-  self.model_root         = "untracked_server"
-  self.model_request      = :get_untracked_server
-  self.collection_root    = "untracked_servers"
-  self.collection_request = :get_untracked_servers
-end
+class Ey::Core::Client::UntrackedServers < Ey::Core::Collection
+
+  model Ey::Core::Client::UntrackedServer
+
+  self.model_root         = "untracked_server"
+  self.model_request      = :get_untracked_server
+  self.collection_root    = "untracked_servers"
+  self.collection_request = :get_untracked_servers
+end

data/lib/ey-core/collections/users.rb

@@ -1,12 +1,12 @@
-class Ey::Core::Client::Users < Ey::Core::Collection
-  model Ey::Core::Client::User
-
-  self.model_root         = "user"
-  self.model_request      = :get_user
-  self.collection_root    = "users"
-  self.collection_request = :get_users
-
-  def current
-    new(connection.get_current_user.body["user"])
-  end
-end
+class Ey::Core::Client::Users < Ey::Core::Collection
+  model Ey::Core::Client::User
+
+  self.model_root         = "user"
+  self.model_request      = :get_user
+  self.collection_root    = "users"
+  self.collection_request = :get_users
+
+  def current
+    new(connection.get_current_user.body["user"])
+  end
+end

data/lib/ey-core/collections/volumes.rb

@@ -1,9 +1,9 @@
-class Ey::Core::Client::Volumes < Ey::Core::Collection
-
-  model Ey::Core::Client::Volume
-
-  self.model_root         = "volume"
-  self.model_request      = :get_volume
-  self.collection_root    = "volumes"
-  self.collection_request = :get_volumes
-end
+class Ey::Core::Client::Volumes < Ey::Core::Collection
+
+  model Ey::Core::Client::Volume
+
+  self.model_root         = "volume"
+  self.model_request      = :get_volume
+  self.collection_root    = "volumes"
+  self.collection_request = :get_volumes
+end

data/lib/ey-core/logger.rb

@@ -1,31 +1,31 @@
-class Ey::Core::Logger < Faraday::Response::Middleware
-  extend Forwardable
-
-  def initialize(app, logger = nil)
-    super(app)
-    @logger = logger || ::Logger.new(nil)
-  end
-
-  def_delegators :@logger, :debug, :info, :warn, :error, :fatal
-
-  def call(env)
-    debug "REQUEST: #{env[:method].upcase} #{env[:url].to_s}"
-    debug('request') { dump_headers env[:request_headers] }
-    debug('request.body') { env[:body] }
-    debug('')
-    super
-  end
-
-  def on_complete(env)
-    debug "RESPONSE: #{env[:status]}"
-    debug('response') { dump_headers env[:response_headers] }
-    debug('response.body') { env[:body] }
-    debug('')
-  end
-
-  private
-
-  def dump_headers(headers)
-    headers.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
-  end
-end
+class Ey::Core::Logger < Faraday::Response::Middleware
+  extend Forwardable
+
+  def initialize(app, logger = nil)
+    super(app)
+    @logger = logger || ::Logger.new(nil)
+  end
+
+  def_delegators :@logger, :debug, :info, :warn, :error, :fatal
+
+  def call(env)
+    debug "REQUEST: #{env[:method].upcase} #{env[:url].to_s}"
+    debug('request') { dump_headers env[:request_headers] }
+    debug('request.body') { env[:body] }
+    debug('')
+    super
+  end
+
+  def on_complete(env)
+    debug "RESPONSE: #{env[:status]}"
+    debug('response') { dump_headers env[:response_headers] }
+    debug('response.body') { env[:body] }
+    debug('')
+  end
+
+  private
+
+  def dump_headers(headers)
+    headers.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+  end
+end

data/lib/ey-core/memory_cache.rb

@@ -1,17 +1,17 @@
-class Ey::Core::MemoryCache
-  def self.cache
-    @cache ||= {}
-  end
-
-  def self.reset!
-    self.cache.clear
-  end
-
-  def self.read(key)
-    cache[key]
-  end
-
-  def self.write(key, value)
-    cache[key] = value
-  end
-end
+class Ey::Core::MemoryCache
+  def self.cache
+    @cache ||= {}
+  end
+
+  def self.reset!
+    self.cache.clear
+  end
+
+  def self.read(key)
+    cache[key]
+  end
+
+  def self.write(key, value)
+    cache[key] = value
+  end
+end

data/lib/ey-core/mock/helper.rb

@@ -1,104 +1,104 @@
-module Ey::Core::Mock
-  module Helper
-    def create_database_service_resource(params)
-      database_service    = params["database_service"]
-      logical_database    = params["logical_database"]
-      database_service_id = database_service.fetch("id")
-      database_server     = params["database_server"]
-      provider_id         = params["provider_id"]
-
-      contact_attributes = %w[name phone_number email title]
-      contacts = Array(database_service["contacts"]).inject([]) do |r, contact|
-        require_parameters(contact, *contact_attributes)
-
-        r << Cistern::Hash.slice(contact, *contact_attributes).merge!(
-          "id"         => self.uuid,
-          "created_at" => Time.now.to_s,
-          "updated_at" => Time.now.to_s,
-          "deleted_at" => nil,
-        )
-      end
-
-      database_service.merge!(
-        "id"           => database_service_id,
-        "resource_url" => "/database-services/#{database_service_id}",
-        "provider"     => url_for("/providers/#{provider_id}"),
-        "servers"      => url_for("/database-services/#{database_service_id}/servers"),
-        "databases"    => url_for("/database-services/#{database_service_id}/databases"),
-        "messages"     => url_for("/database-services/#{database_service_id}/messages"),
-        "snapshots"    => url_for("/database-services/#{database_service_id}/snapshots"),
-        "contacts"     => url_for("/database-services/#{database_service_id}/contacts"),
-        "deleted_at"   => nil,
-      )
-
-      engine, location, _ = require_parameters(database_server, "engine", "location", "flavor", "version")
-      database_server_id = self.uuid
-
-      port = case engine
-             when /postgres/i then 5432
-             when /mysql/i then 3306
-             else 9922
-             end
-
-      database_server.merge!(
-        "id"               => database_server_id,
-        "provisioned_id"   => "#{database_service["name"].downcase}master",
-        "database_service" => url_for("/database-services/#{database_service_id}"),
-        "provider"         => url_for("/providers/#{provider_id}"),
-        "firewalls"        => url_for("/database-servers/#{database_server_id}/firewalls"),
-        "alerts"           => url_for("/database-servers/#{database_server_id}/alerts"),
-        "endpoint"         => "#{engine}://root@localhost:#{port}",
-        "messages"         => url_for("/database-servers/#{database_server_id}/messages"),
-        "snapshots"        => url_for("/database-servers/#{database_server_id}/snapshots"),
-        "revisions"        => url_for("/database-servers/#{database_server_id}/revisions"),
-        "deleted_at"       => nil,
-      )
-
-      firewall_id = self.serial_id
-
-      #@todo: add service level and contacts
-      #
-      lambda do |r|
-
-        self.data[:firewalls][firewall_id] = {
-          "id"             => firewall_id,
-          "name"           => SecureRandom.hex(4),
-          "provisioned_id" => SecureRandom.hex(10),
-          "resource_url"   => "/firewalls/#{firewall_id}",
-          "provider"       => url_for("/providers/#{provider_id}"),
-          "clusters"       => url_for("/firewalls/#{firewall_id}/clusters"),
-          "location"       => location.gsub(/[a-z]$/, ""),
-          "rules"          => url_for("/firewalls/#{firewall_id}/rules")
-        }
-
-        self.data[:database_server_firewalls] << [database_server_id, firewall_id]
-        self.data[:database_servers][database_server_id] = database_server
-        self.data[:database_services][database_service_id] = database_service
-
-        contacts.each { |contact|
-          self.data[:contacts][contact.fetch("id")] = contact
-          self.data[:contact_assignments] << [contact.fetch("id"), database_service.fetch("id")]
-        }
-
-        if logical_database # only on bootstrap
-          self.data[:logical_databases][logical_database.fetch("id")] = logical_database
-        end
-
-        database_server.delete("resource_url")
-        database_service.delete("resource_url")
-        r.delete("resource_url")
-      end
-    end
-
-    def create_feature(params)
-      params = Cistern::Hash.stringify_keys(params)
-
-      params["id"]      ||= self.serial_id
-      params["privacy"] ||= "private"
-      params["name"]    ||= params["id"]
-
-      self.data[:features][params["id"]] = params
-      self.features.new(params)
-    end
-  end
-end
+module Ey::Core::Mock
+  module Helper
+    def create_database_service_resource(params)
+      database_service    = params["database_service"]
+      logical_database    = params["logical_database"]
+      database_service_id = database_service.fetch("id")
+      database_server     = params["database_server"]
+      provider_id         = params["provider_id"]
+
+      contact_attributes = %w[name phone_number email title]
+      contacts = Array(database_service["contacts"]).inject([]) do |r, contact|
+        require_parameters(contact, *contact_attributes)
+
+        r << Cistern::Hash.slice(contact, *contact_attributes).merge!(
+          "id"         => self.uuid,
+          "created_at" => Time.now.to_s,
+          "updated_at" => Time.now.to_s,
+          "deleted_at" => nil,
+        )
+      end
+
+      database_service.merge!(
+        "id"           => database_service_id,
+        "resource_url" => "/database-services/#{database_service_id}",
+        "provider"     => url_for("/providers/#{provider_id}"),
+        "servers"      => url_for("/database-services/#{database_service_id}/servers"),
+        "databases"    => url_for("/database-services/#{database_service_id}/databases"),
+        "messages"     => url_for("/database-services/#{database_service_id}/messages"),
+        "snapshots"    => url_for("/database-services/#{database_service_id}/snapshots"),
+        "contacts"     => url_for("/database-services/#{database_service_id}/contacts"),
+        "deleted_at"   => nil,
+      )
+
+      engine, location, _ = require_parameters(database_server, "engine", "location", "flavor", "version")
+      database_server_id = self.uuid
+
+      port = case engine
+             when /postgres/i then 5432
+             when /mysql/i then 3306
+             else 9922
+             end
+
+      database_server.merge!(
+        "id"               => database_server_id,
+        "provisioned_id"   => "#{database_service["name"].downcase}master",
+        "database_service" => url_for("/database-services/#{database_service_id}"),
+        "provider"         => url_for("/providers/#{provider_id}"),
+        "firewalls"        => url_for("/database-servers/#{database_server_id}/firewalls"),
+        "alerts"           => url_for("/database-servers/#{database_server_id}/alerts"),
+        "endpoint"         => "#{engine}://root@localhost:#{port}",
+        "messages"         => url_for("/database-servers/#{database_server_id}/messages"),
+        "snapshots"        => url_for("/database-servers/#{database_server_id}/snapshots"),
+        "revisions"        => url_for("/database-servers/#{database_server_id}/revisions"),
+        "deleted_at"       => nil,
+      )
+
+      firewall_id = self.serial_id
+
+      #@todo: add service level and contacts
+      #
+      lambda do |r|
+
+        self.data[:firewalls][firewall_id] = {
+          "id"             => firewall_id,
+          "name"           => SecureRandom.hex(4),
+          "provisioned_id" => SecureRandom.hex(10),
+          "resource_url"   => "/firewalls/#{firewall_id}",
+          "provider"       => url_for("/providers/#{provider_id}"),
+          "clusters"       => url_for("/firewalls/#{firewall_id}/clusters"),
+          "location"       => location.gsub(/[a-z]$/, ""),
+          "rules"          => url_for("/firewalls/#{firewall_id}/rules")
+        }
+
+        self.data[:database_server_firewalls] << [database_server_id, firewall_id]
+        self.data[:database_servers][database_server_id] = database_server
+        self.data[:database_services][database_service_id] = database_service
+
+        contacts.each { |contact|
+          self.data[:contacts][contact.fetch("id")] = contact
+          self.data[:contact_assignments] << [contact.fetch("id"), database_service.fetch("id")]
+        }
+
+        if logical_database # only on bootstrap
+          self.data[:logical_databases][logical_database.fetch("id")] = logical_database
+        end
+
+        database_server.delete("resource_url")
+        database_service.delete("resource_url")
+        r.delete("resource_url")
+      end
+    end
+
+    def create_feature(params)
+      params = Cistern::Hash.stringify_keys(params)
+
+      params["id"]      ||= self.serial_id
+      params["privacy"] ||= "private"
+      params["name"]    ||= params["id"]
+
+      self.data[:features][params["id"]] = params
+      self.features.new(params)
+    end
+  end
+end

data/lib/ey-core/mock/params.rb

@@ -1,31 +1,31 @@
-module Ey::Core::Mock
-  module Params
-    def url_params(url)
-      uri   = URI.parse(url)
-      query = uri.query || ""
-
-      query.split("&").inject({}){|r,e| k,v = e.split("="); r.merge(k => v)}
-    end
-
-    def path_params(url)
-      parts = URI.parse(url).path.split("/").rotate
-      if parts.size % 2 == 1
-        parts.pop
-      end
-      Hash[*parts].reject {|key,val| val.nil? || val.empty? }
-    end
-
-    def extract_url_params!(params)
-      if url = params.delete("url")
-        @logger.debug('request.params') { "Extracted params from url: #{path_params(url).inspect}" }
-
-        path_params(url).each do |resource,id|
-          next unless id && ! id.empty?
-          params[resource.to_s.gsub(/s$/, '').gsub("-", "_")] = url_for("/#{resource}/#{id}")
-        end
-
-        params.merge!(url_params(url))
-      end
-    end
-  end
-end
+module Ey::Core::Mock
+  module Params
+    def url_params(url)
+      uri   = URI.parse(url)
+      query = uri.query || ""
+
+      query.split("&").inject({}){|r,e| k,v = e.split("="); r.merge(k => v)}
+    end
+
+    def path_params(url)
+      parts = URI.parse(url).path.split("/").rotate
+      if parts.size % 2 == 1
+        parts.pop
+      end
+      Hash[*parts].reject {|key,val| val.nil? || val.empty? }
+    end
+
+    def extract_url_params!(params)
+      if url = params.delete("url")
+        @logger.debug('request.params') { "Extracted params from url: #{path_params(url).inspect}" }
+
+        path_params(url).each do |resource,id|
+          next unless id && ! id.empty?
+          params[resource.to_s.gsub(/s$/, '').gsub("-", "_")] = url_for("/#{resource}/#{id}")
+        end
+
+        params.merge!(url_params(url))
+      end
+    end
+  end
+end