ey-core 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1735145773a7daa8e7451c0ed1afb9df56331650
-  data.tar.gz: b15e7b305b51ee772b4705a417a7bba24a5fd80e
+  metadata.gz: 269d550338f16307307e6d1bbcf9c515c63fdd0f
+  data.tar.gz: 8629dc4f02afc87b6d1787038c7af137f08b5b07
 SHA512:
-  metadata.gz: d93a039a423036941c0e80c0db46fdbef6e6fdfdddc2d55545b5fca94a8d55a3420b515c55ab2a099c719e628b3138c420f06e08df019b5b1670ff05de69db45
-  data.tar.gz: 42fd085d88c44d9e70b036aeea5ad89988a9bdc098d83468b8a1ad3a028f537b9f7e8f3fdf44d41fc2baa30c68cbd8573c38b8d53d44d6e07bb4a1efd4305f9d
+  metadata.gz: a7deba35785bcbf0e54472e455f0a0617c8c199af99c55a4b51c1d00fb0b4948bb386e3798752991939d194ad3794dec8c15e7cdffcab6c1dd2c4982bc9e629d
+  data.tar.gz: 314171d0e20483463062e695a1f45abe1688658d67979d821bcd827d4b35fdf98ec0792371abe9ef08e06e6e43611845c3ac7c22b1e5ccc8563e0f4375eabcb6

data/lib/ey-core/client.rb

@@ -141,6 +141,7 @@ class Ey::Core::Client < Cistern::Service
   request :create_message
   request :create_password_reset
   request :create_provider
+  request :create_server
   request :create_ssl_certificate
   request :create_storage
   request :create_storage_user

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

@@ -4,11 +4,17 @@ class Ey::Core::Client::Environment < Ey::Core::Model
   identity :id
 
   attribute :classic, type: :boolean
-  attribute :name
   attribute :created_at, type: :time
+  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
 
   has_one :account
   has_one :database_service

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

@@ -32,6 +32,8 @@ class Ey::Core::Client::Server < Ey::Core::Model
   has_many :events, key: :server_events
   has_many :firewalls
 
+  attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id
+
   def reboot
     requires :identity
 
@@ -42,15 +44,22 @@ class Ey::Core::Client::Server < Ey::Core::Model
 
   def save!
     if new_record?
-      raise "adding servers is not yet implemented"
       requires :flavor_id, :role, :environment
 
       server_attributes = {
-        "flavor" => self.flavor_id,
-        "role"   => self.role,
+        "environment" => environment.id,
+        "snapshot"    => self.snapshot_id,
+        "server"      => {
+          "flavor"          => self.flavor_id,
+          "iops"            => self.iops,
+          "location"        => self.location || environment.region,
+          "mnt_volume_size" => self.mnt_volume_size,
+          "name"            => self.name,
+          "role"            => self.role,
+          "volume_size"     => self.volume_size,
+        }
       }
-      server_attributes.merge!("location" => self.location)
-      connection.create_server(server_attributes)
+      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")

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

@@ -11,7 +11,7 @@ class Ey::Core::Client::Volume < Ey::Core::Model
   attribute :mount
   attribute :mount_options
   attribute :name
-  attribute :provisioned_id, type: :integer
+  attribute :provisioned_id, type: :string
   attribute :size, type: :integer
 
   has_one :provider

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

@@ -95,7 +95,7 @@ class Ey::Core::Client
         "token"            => SecureRandom.hex(16),
         "updated_at"       => Time.now.to_s,
         "volumes"          => url_for("/servers/#{id}/volumes"),
-        "role"             => role,
+        "role"             => role || "solo",
       }
     end
 

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

@@ -35,12 +35,15 @@ class Ey::Core::Client
         "classic"               => true,
         "clusters"              => url_for("/environments/#{resource_id}/clusters"),
         "created_at"            => Time.now,
+        "database_stack"        => "postgres9_4",
         "id"                    => resource_id,
         "internal_private_key"  => internal_key[:private_key],
         "internal_public_key"   => internal_key[:public_key],
         "keypairs"              => url_for("/environments/#{resource_id}/keypairs"),
         "logical_databases_url" => url_for("/environments/#{resource_id}/logical-databases"),
+        "release_label"         => "stable-v4-2.0.101",
         "servers"               => url_for("/environments/#{resource_id}/servers"),
+        "stack_name"            => "nginx_passenger4",
         "updated_at"            => Time.now,
       )
 

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

@@ -0,0 +1,119 @@
+class Ey::Core::Client
+  class Real
+    def create_server(params={})
+      request(
+        :method => :post,
+        :path   => "/servers",
+        :url    => params.delete("url"),
+        :body   => params,
+      )
+    end
+  end
+
+  class Mock
+    def create_server(params={})
+      params = Cistern::Hash.stringify_keys(params)
+      server = params["server"]
+
+      require_parameters(params, "environment")
+      require_parameters(params["server"], "role", "location", "flavor")
+      if server["role"] == "util"
+        require_parameters(params["server"], "name")
+      end
+
+      request_id     = self.uuid
+      resource_id    = self.serial_id
+      provisioned_id = "i-#{SecureRandom.hex(4)}"
+      environment_id = resource_identity(params["environment"])
+      environment    = find(:environments, environment_id)
+      account        = resource_identity(environment["account"])
+      provider       = self.data[:providers].values.detect { |p| p["account"] == url_for("/accounts/#{account}") }
+
+      servers = self.data[:servers].values.select { |s| s["environment"] == url_for("/environments/#{environment_id}") }
+
+      if servers.count == 1 && servers.first["role"] == "solo" && server["role"] == "db_slave"
+        response(
+          :status => 422,
+          :body   => {"errors" => ["Cannot add a DB Slave"]},
+        )
+      end
+
+      resource = {
+        "account"          => url_for("/accounts/#{account}"),
+        "alerts"           => url_for("/servers/#{resource_id}/alerts"),
+        "created_at"       => Time.now.to_s,
+        "deprovisioned_at" => nil,
+        "devices"          => block_device_map(server),
+        "enabled"          => true,
+        "environment"      => url_for("/environments/#{environment["id"]}"),
+        "flavor"           => { "id" => server["flavor"] },
+        "id"               => resource_id,
+        "location"         => environment["region"],
+        "logs"             => url_for("/servers/#{resource_id}/logs"),
+        "name"             => server["name"],
+        "private_hostname" => "#{provisioned_id}.private.example.org",
+        "provider"         => url_for("/providers/#{provider["id"]}"),
+        "provisioned_at"   => Time.now.to_s,
+        "provisioned_id"   => provisioned_id,
+        "public_hostname"  => "#{provisioned_id}.public.example.org",
+        "public_key"       => mock_ssh_key[:fingerprint],
+        "ssh_port"         => 22,
+        "state"            => "running",
+        "token"            => SecureRandom.hex(16),
+        "updated_at"       => Time.now.to_s,
+        "volumes"          => url_for("/servers/#{resource_id}/volumes"),
+        "role"             => server["role"],
+      }
+
+      request = {
+        "id"           => request_id,
+        "type"         => "provision_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
+
+    def block_device_map(params={})
+      [
+        {
+          "mount"                 => "/",
+          "file_system"           => "ext4",
+          "device"                => "/dev/sda",
+          "size"                  => 100,
+          "delete_on_termination" => true,
+          "volume_type"           => "gp2",
+        },
+        {
+          "mount"                 => "/mnt",
+          "file_system"           => "ext4",
+          "device"                => "/dev/sdo",
+          "delete_on_termination" => true,
+          "size"                  => params["mnt_volume_size"] || 100,
+          "volume_type"           => "gp2",
+        },
+        {
+          "mount"                 => nil,
+          "file_system"           => "swap",
+          "device"                => "/dev/sdp",
+          "delete_on_termination" => true,
+          "size"                  => 8,
+          "volume_type"           => "gp2",
+        },
+        { "device" => "/dev/sdb", "name"   => "ephemeral0", },
+      ]
+    end
+  end
+end

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

data/spec/servers_spec.rb

@@ -34,6 +34,47 @@ describe 'servers' do
         environment.servers.all(role: "solo").to contain_exactly(server)
       }
     end
+
+    it "adds an app server" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "app",
+          :flavor_id   => "m3.large",
+        ).resource!
+      }.to change { environment.servers.count }.by(1)
+    end
+
+    it "adds a util server" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "util",
+          :flavor_id   => "m3.large",
+          :name        => "resque",
+        ).resource!
+      }.to change { environment.servers.count }.by(1)
+    end
+
+    it "does not add a util server without a name" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "util",
+          :flavor_id   => "m3.large",
+        ).resource!
+      }.to raise_error(Ey::Core::Response::BadRequest, /value is empty: name/)
+    end
+
+    it "does not add a db slave" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "db_slave",
+          :flavor_id   => "m3.large",
+        )
+      }.to raise_error(Ey::Core::Response::Unprocessable, /cannot add a db slave/i)
+    end
   end
 
   context "with multiple servers" do
@@ -51,5 +92,46 @@ describe 'servers' do
       expect(environment.servers.first(role: "app")).to be
       expect(environment.servers.first(role: "db_master")).to be
     end
+
+    it "adds an app server" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "app",
+          :flavor_id   => "m3.large",
+        ).resource!
+      }.to change { environment.servers.count }.by(1)
+    end
+
+    it "adds a util server" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "util",
+          :flavor_id   => "m3.large",
+          :name        => "resque",
+        ).resource!
+      }.to change { environment.servers.count }.by(1)
+    end
+
+    it "does not add a util server without a name" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "util",
+          :flavor_id   => "m3.large",
+        ).resource!
+      }.to raise_error(Ey::Core::Response::BadRequest, /value is empty: name/)
+    end
+
+    it "adds a db slave" do
+      expect {
+        client.servers.create!(
+          :environment => environment,
+          :role        => "db_slave",
+          :flavor_id   => "m3.large",
+        ).resource!
+      }.to change { environment.servers.count }.by(1)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -279,6 +279,7 @@ files:
 - lib/ey-core/requests/create_message.rb
 - lib/ey-core/requests/create_password_reset.rb
 - lib/ey-core/requests/create_provider.rb
+- lib/ey-core/requests/create_server.rb
 - lib/ey-core/requests/create_ssl_certificate.rb
 - lib/ey-core/requests/create_storage.rb
 - lib/ey-core/requests/create_storage_user.rb