ey-core 3.4.2 → 3.4.5

data/lib/ey-core/requests/discover_database_server_snapshots.rb

@@ -1,69 +1,69 @@
-class Ey::Core::Client
-  class Real
-    def discover_database_server_snapshots(params={})
-      url      = params.delete("url")
-      provider = params.delete("provider")
-
-      request(
-        :method => :post,
-        :url    => url,
-        :params => params,
-        :path   => "/providers/#{provider}/database-server-snapshots/discover",
-      )
-    end
-  end
-
-  class Mock
-    def discover_database_server_snapshots(params={})
-      extract_url_params!(params)
-
-      provider     = params.delete('provider')
-      resource_id  = self.uuid
-      request_id   = self.uuid
-      provider_url = url_for("/providers/#{provider}")
-
-      existing_snapshots = self.data[:database_server_snapshots].values.select { |dss| dss["provider"] == provider_url }
-      database_server    = self.data[:database_servers].values.detect { |ds| ds["provider"] == provider_url }
-
-      resources = if existing_snapshots.empty?
-                    if database_server
-                      [{
-                        "id"              => resource_id,
-                        "location"        => database_server["location"],
-                        "engine"          => database_server["engine"],
-                        "engine_version"  => database_server["version"],
-                        "storage"         => database_server["storage"],
-                        "provisioned_id"  => resource_id,
-                        "provisioned_at"  => Time.now - 3600,
-                        "provider"        => provider_url,
-                        "database_server" => url_for("/database-servers/#{database_server["id"]}")
-                      }]
-                    else []
-                    end
-                  else existing_snapshots
-                  end
-
-      request = {
-        "id" => request_id,
-        "type" => "discover_database_server_snapshots",
-        "successful" => true,
-        "started_at" => Time.now,
-        "finished_at" => nil,
-        "resource" => [:database_server_snapshots, resource_id, resources, "providers/#{provider}/database-server-snapshots"]
-      }
-
-      self.data[:requests][request_id] = request
-
-      response_hash = request.dup
-      response_hash.delete("resource")
-
-      response(
-        :body    => {"request" => response_hash},
-        :status  => 200,
-        :headers => {
-          "Content-Type" => "application/json; charset=utf8"
-        }
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def discover_database_server_snapshots(params={})
+      url      = params.delete("url")
+      provider = params.delete("provider")
+
+      request(
+        :method => :post,
+        :url    => url,
+        :params => params,
+        :path   => "/providers/#{provider}/database-server-snapshots/discover",
+      )
+    end
+  end
+
+  class Mock
+    def discover_database_server_snapshots(params={})
+      extract_url_params!(params)
+
+      provider     = params.delete('provider')
+      resource_id  = self.uuid
+      request_id   = self.uuid
+      provider_url = url_for("/providers/#{provider}")
+
+      existing_snapshots = self.data[:database_server_snapshots].values.select { |dss| dss["provider"] == provider_url }
+      database_server    = self.data[:database_servers].values.detect { |ds| ds["provider"] == provider_url }
+
+      resources = if existing_snapshots.empty?
+                    if database_server
+                      [{
+                        "id"              => resource_id,
+                        "location"        => database_server["location"],
+                        "engine"          => database_server["engine"],
+                        "engine_version"  => database_server["version"],
+                        "storage"         => database_server["storage"],
+                        "provisioned_id"  => resource_id,
+                        "provisioned_at"  => Time.now - 3600,
+                        "provider"        => provider_url,
+                        "database_server" => url_for("/database-servers/#{database_server["id"]}")
+                      }]
+                    else []
+                    end
+                  else existing_snapshots
+                  end
+
+      request = {
+        "id" => request_id,
+        "type" => "discover_database_server_snapshots",
+        "successful" => true,
+        "started_at" => Time.now,
+        "finished_at" => nil,
+        "resource" => [:database_server_snapshots, resource_id, resources, "providers/#{provider}/database-server-snapshots"]
+      }
+
+      self.data[:requests][request_id] = request
+
+      response_hash = request.dup
+      response_hash.delete("resource")
+
+      response(
+        :body    => {"request" => response_hash},
+        :status  => 200,
+        :headers => {
+          "Content-Type" => "application/json; charset=utf8"
+        }
+      )
+    end
+  end
+end

data/lib/ey-core/requests/discover_provider_location.rb

@@ -1,57 +1,57 @@
-class Ey::Core::Client
-  class Real
-    def discover_provider_location(url, location_id)
-      id          = url.split("/")[-2]
-      location_id = URI.escape(location_id)
-
-      request(
-        :method => :put,
-        :path   => "/providers/#{id}/locations/#{location_id}/discover",
-      )
-    end
-  end
-
-  class Mock
-    def discover_provider_location(url, location_id)
-      resource_id = self.uuid
-      request_id  = self.uuid
-      provider_id = url.split("/")[-2]
-      provider    = self.data[:providers][provider_id.to_i]
-      type        = provider["type"]
-
-      possible_location = self.data[:possible_provider_locations][type].detect { |l| l["id"] == location_id }
-
-      resource = {
-        "id"            => resource_id,
-        "provider"      => url_for("/providers/#{provider_id}"),
-        "location_id"   => location_id,
-        "location_name" => possible_location["name"],
-        "resource_url"  => "/provider_locations/#{resource_id}"
-      }
-
-      self.data[:provider_locations][resource_id] = resource
-
-      request = {
-        "id"          => request_id,
-        "type"        => "discover_provider_location",
-        "successful"  => "true",
-        "started_at"  => Time.now,
-        "finished_at" => nil,
-        "resource"    => [:provider_locations, resource_id, resource],
-      }
-
-      self.data[:requests][request_id] = request
-
-      response_hash = request.dup
-      response_hash.delete("resource")
-
-      response(
-        :body    => {"request" => response_hash},
-        :status  => 200,
-        :headers => {
-          "Content-Type" => "application/json; charset=utf8"
-        }
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def discover_provider_location(url, location_id)
+      id          = url.split("/")[-2]
+      location_id = URI.escape(location_id)
+
+      request(
+        :method => :put,
+        :path   => "/providers/#{id}/locations/#{location_id}/discover",
+      )
+    end
+  end
+
+  class Mock
+    def discover_provider_location(url, location_id)
+      resource_id = self.uuid
+      request_id  = self.uuid
+      provider_id = url.split("/")[-2]
+      provider    = self.data[:providers][provider_id.to_i]
+      type        = provider["type"]
+
+      possible_location = self.data[:possible_provider_locations][type].detect { |l| l["id"] == location_id }
+
+      resource = {
+        "id"            => resource_id,
+        "provider"      => url_for("/providers/#{provider_id}"),
+        "location_id"   => location_id,
+        "location_name" => possible_location["name"],
+        "resource_url"  => "/provider_locations/#{resource_id}"
+      }
+
+      self.data[:provider_locations][resource_id] = resource
+
+      request = {
+        "id"          => request_id,
+        "type"        => "discover_provider_location",
+        "successful"  => "true",
+        "started_at"  => Time.now,
+        "finished_at" => nil,
+        "resource"    => [:provider_locations, resource_id, resource],
+      }
+
+      self.data[:requests][request_id] = request
+
+      response_hash = request.dup
+      response_hash.delete("resource")
+
+      response(
+        :body    => {"request" => response_hash},
+        :status  => 200,
+        :headers => {
+          "Content-Type" => "application/json; charset=utf8"
+        }
+      )
+    end
+  end
+end

data/lib/ey-core/requests/discover_server.rb

@@ -0,0 +1,60 @@
+class Ey::Core::Client
+  class Real
+    def discover_server(options={})
+      provider_id = options.delete("provider")
+
+      request(
+        :method => :post,
+        :path   => "/providers/#{provider_id}/servers/discover",
+        :body   => options
+      )
+    end
+  end
+
+  class Mock
+    def discover_server(options={})
+      options = Cistern::Hash.stringify_keys(options)
+
+      provider_id = options.delete("provider")
+      request_id = self.uuid
+
+      options["server"]["role"] ||= "app"
+      options["server"]["flavor"] ||= "m4.large"
+
+      server = self.data[:servers].values.detect do |s|
+        !s["deleted_at"] && s["provider"] == url_for("/providers/#{provider_id}") && s["provisioned_id"] == options["server"]["provisioned_id"]
+      end
+
+      resource = if server
+                   server
+                 else
+                   if auto_scaling_group_id = options["auto_scaling_group"]
+                     find(:auto_scaling_groups, auto_scaling_group_id)
+                   end
+
+                   s = self.requests.new(create_server(options).body["request"]).resource! # cheating
+                   self.data[:servers][s.id]
+                 end
+
+      request = {
+        "id"           => request_id,
+        "type"         => "discover_server",
+        "successful"   => true,
+        "started_at"   => Time.now,
+        "finished_at"  => nil,
+        "resource_url" => url_for("/servers/#{resource["id"]}"),
+        "resource"     => [:servers, resource["id"], resource],
+      }
+
+      self.data[:requests][request_id] = request
+
+      response_hash = request.dup
+      response_hash.delete("resource")
+
+      response(
+        :body   => {"request" => response_hash},
+        :status => 201,
+      )
+    end
+  end
+end

data/lib/ey-core/requests/download_file.rb

@@ -1,25 +1,25 @@
-class Ey::Core::Client
-  class Real
-    def download_file(params={})
-      url = params["url"]
-
-      request(
-        :method => :get,
-        :url    => url,
-      )
-    end
-  end # Real
-
-  class Mock
-    def download_file(params={})
-      url = params["url"]
-
-      body = File.read(self.data[:temp_files][url])
-
-      response(
-        :body   => body,
-        :status => 200,
-      )
-    end
-  end # Mock
-end # Ey::Core::Client
+class Ey::Core::Client
+  class Real
+    def download_file(params={})
+      url = params["url"]
+
+      request(
+        :method => :get,
+        :url    => url,
+      )
+    end
+  end # Real
+
+  class Mock
+    def download_file(params={})
+      url = params["url"]
+
+      body = File.read(self.data[:temp_files][url])
+
+      response(
+        :body   => body,
+        :status => 200,
+      )
+    end
+  end # Mock
+end # Ey::Core::Client

data/lib/ey-core/requests/enable_feature.rb

@@ -1,35 +1,35 @@
-class Ey::Core::Client
-  class Real
-    def enable_feature(params={})
-      account_id = params["account"]
-      feature_id = params["feature"]["id"]
-
-      request(
-        :method => :post,
-        :path   => "accounts/#{account_id}/features/#{feature_id}"
-      )
-    end
-  end # Real
-
-  class Mock
-    def enable_feature(params={})
-      account_id  = params["account"]
-      resource_id = params["feature"]["id"]
-
-      account = self.data[:accounts][account_id]
-      feature = self.data[:features][resource_id]
-
-      account_url = url_for("/accounts/#{account_id}")
-      feature["account"] = account_url
-
-      response(
-        :body   => {"feature" => {
-                      "id" => feature[:id],
-                      "name" => feature[:name],
-                      "description" => feature[:description]}
-                    },
-        :status => 200
-      )
-    end
-  end # Mock
-end # Ey::Core::Client
+class Ey::Core::Client
+  class Real
+    def enable_feature(params={})
+      account_id = params["account"]
+      feature_id = params["feature"]["id"]
+
+      request(
+        :method => :post,
+        :path   => "accounts/#{account_id}/features/#{feature_id}"
+      )
+    end
+  end # Real
+
+  class Mock
+    def enable_feature(params={})
+      account_id  = params["account"]
+      resource_id = params["feature"]["id"]
+
+      account = self.data[:accounts][account_id]
+      feature = self.data[:features][resource_id]
+
+      account_url = url_for("/accounts/#{account_id}")
+      feature["account"] = account_url
+
+      response(
+        :body   => {"feature" => {
+                      "id" => feature[:id],
+                      "name" => feature[:name],
+                      "description" => feature[:description]}
+                    },
+        :status => 200
+      )
+    end
+  end # Mock
+end # Ey::Core::Client

data/lib/ey-core/requests/get_account.rb

@@ -1,29 +1,29 @@
-class Ey::Core::Client
-  class Real
-    def get_account(params={})
-      id  = params["id"]
-      url = params["url"]
-
-      request(
-        :path => "accounts/#{id}",
-        :url  => url,
-      )
-    end
-  end # Real
-
-  class Mock
-    def get_account(params={})
-      identity = resource_identity(params)
-
-      account = self.find(:accounts, identity)
-      resource = account.dup
-
-      resource.delete(:users)
-      resource.delete(:owners)
-
-      response(
-        :body => {"account" => resource},
-      )
-    end
-  end # Mock
-end # Ey::Core::Client
+class Ey::Core::Client
+  class Real
+    def get_account(params={})
+      id  = params["id"]
+      url = params["url"]
+
+      request(
+        :path => "accounts/#{id}",
+        :url  => url,
+      )
+    end
+  end # Real
+
+  class Mock
+    def get_account(params={})
+      identity = resource_identity(params)
+
+      account = self.find(:accounts, identity)
+      resource = account.dup
+
+      resource.delete(:users)
+      resource.delete(:owners)
+
+      response(
+        :body => {"account" => resource},
+      )
+    end
+  end # Mock
+end # Ey::Core::Client

data/lib/ey-core/requests/get_account_cancellation.rb

@@ -1,21 +1,21 @@
-class Ey::Core::Client
-  class Real
-    def get_account_cancellation(params={})
-      url = params["url"]
-      request(
-        :url  => url,
-      )
-    end
-  end # Real
-
-  class Mock
-    def get_account_cancellation(params={})
-      identity = resource_identity(params)
-
-      cancellation = self.find(:account_cancellations, identity)
-      response(
-        :body => {"cancellation" => cancellation},
-      )
-    end
-  end # Mock
-end # Ey::Core::Client
+class Ey::Core::Client
+  class Real
+    def get_account_cancellation(params={})
+      url = params["url"]
+      request(
+        :url  => url,
+      )
+    end
+  end # Real
+
+  class Mock
+    def get_account_cancellation(params={})
+      identity = resource_identity(params)
+
+      cancellation = self.find(:account_cancellations, identity)
+      response(
+        :body => {"cancellation" => cancellation},
+      )
+    end
+  end # Mock
+end # Ey::Core::Client

data/lib/ey-core/requests/get_account_referrals.rb

@@ -1,28 +1,28 @@
-class Ey::Core::Client
-  class Real
-    def get_account_referrals(params={})
-      request(
-        :url => params.delete("url"),
-        :path => "/account-referrals",
-      )
-    end
-  end
-
-  class Mock
-    def get_account_referrals(params={})
-      extract_url_params!(params)
-
-      if params["account"]
-        params["referrer"] = params.delete("account")
-      end
-
-      headers, account_referrals_page = search_and_page(params, :account_referrals, search_keys: %w[referrer])
-
-      response(
-        :body    => {"account_referrals" => account_referrals_page},
-        :status  => 200,
-        :headers => headers
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def get_account_referrals(params={})
+      request(
+        :url => params.delete("url"),
+        :path => "/account-referrals",
+      )
+    end
+  end
+
+  class Mock
+    def get_account_referrals(params={})
+      extract_url_params!(params)
+
+      if params["account"]
+        params["referrer"] = params.delete("account")
+      end
+
+      headers, account_referrals_page = search_and_page(params, :account_referrals, search_keys: %w[referrer])
+
+      response(
+        :body    => {"account_referrals" => account_referrals_page},
+        :status  => 200,
+        :headers => headers
+      )
+    end
+  end
+end

data/lib/ey-core/requests/get_account_trial.rb

@@ -1,32 +1,32 @@
-class Ey::Core::Client
-  class Real
-    def get_account_trial(params={})
-      url = params["url"]
-      request(
-        :url => url,
-      )
-    end
-  end # Real
-
-  class Mock
-    def get_account_trial(params={})
-      account_id = resource_identity(params)
-
-      find(:accounts, account_id)
-
-      resource = self.data[:account_trials][account_id]
-      resource ||= {
-        "id"         => Cistern::Mock.random_numbers(4),
-        "duration"   => 500,
-        "used"       => 30,
-        "created_at" => Time.now.to_s,
-      }
-      resource["account"] = url_for("/accounts/#{account_id}")
-
-      response(
-        :body   => {"account_trial" => resource},
-        :status => 200,
-      )
-    end
-  end
-end
+class Ey::Core::Client
+  class Real
+    def get_account_trial(params={})
+      url = params["url"]
+      request(
+        :url => url,
+      )
+    end
+  end # Real
+
+  class Mock
+    def get_account_trial(params={})
+      account_id = resource_identity(params)
+
+      find(:accounts, account_id)
+
+      resource = self.data[:account_trials][account_id]
+      resource ||= {
+        "id"         => Cistern::Mock.random_numbers(4),
+        "duration"   => 500,
+        "used"       => 30,
+        "created_at" => Time.now.to_s,
+      }
+      resource["account"] = url_for("/accounts/#{account_id}")
+
+      response(
+        :body   => {"account_trial" => resource},
+        :status => 200,
+      )
+    end
+  end
+end