ey-core 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269d550338f16307307e6d1bbcf9c515c63fdd0f
-  data.tar.gz: 8629dc4f02afc87b6d1787038c7af137f08b5b07
+  metadata.gz: 211941aaeeb4aa4287a63a54d47cabc37637e69f
+  data.tar.gz: bc49c5e7785bc9ce59b86ae8bd61d4870ae097a6
 SHA512:
-  metadata.gz: a7deba35785bcbf0e54472e455f0a0617c8c199af99c55a4b51c1d00fb0b4948bb386e3798752991939d194ad3794dec8c15e7cdffcab6c1dd2c4982bc9e629d
-  data.tar.gz: 314171d0e20483463062e695a1f45abe1688658d67979d821bcd827d4b35fdf98ec0792371abe9ef08e06e6e43611845c3ac7c22b1e5ccc8563e0f4375eabcb6
+  metadata.gz: 0af79f96731322e573b6a543cccfd65bb0ff3c5815cea46eadc698f5b7e8554408003f1eeb49d83abf0d0eb36039c979a980bb2532ceafc9ae2bc29292a8cf58
+  data.tar.gz: d67529719c20a554a4ed226ca2dfc8d5f1fc2061734de03b8d9647e552a47971d4de01b20590216e6c4965621ce4987d825b66c58b9c98744c82b7ad62737e8e

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-Uses [cistern](https://github.com/lanej/cistern) to wrap RESTful resources nicely. See [rdoc](https://docbox.engineyard.com/core/branch/master/index.html).
+Uses [cistern](https://github.com/lanej/cistern) to wrap RESTful resources nicely.
 
 ```ruby
 client.users.current  # =>
@@ -68,10 +68,6 @@ Ey::Core::Client.reset!
 
 By default, specs are run against the core mock. In order to run them against awsm mocked mode instead, run `MOCK_CORE=false bundle exec rspec`
 
-## Releasing
-
-    $ gem install gem-release
-    $ gem bump -trv (major|minor|patch) --host https://geminst:XXX@nextgem.engineyard.com/
 
 ## Contributing
 

data/lib/ey-core/client.rb

@@ -114,6 +114,8 @@ class Ey::Core::Client < Cistern::Service
   model :user
   model :volume
 
+  request :apply_environment_updates
+  request :apply_server_updates
   request :attach_address
   request :authorized_channel
   request :boot_environment
@@ -265,6 +267,8 @@ class Ey::Core::Client < Cistern::Service
   request :get_support_trial
   request :get_task
   request :get_tasks
+  request :get_token
+  request :get_tokens
   request :get_untracked_server
   request :get_untracked_servers
   request :get_user

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

@@ -136,6 +136,7 @@ class Ey::Core::Client::Mock
                  :features                    => {},
                  :firewall_rules              => {},
                  :firewalls                   => {},
+                 :instance_updates            => {},
                  :keypair_deployments         => {},
                  :keypairs                    => {},
                  :legacy_alerts               => {},
@@ -160,6 +161,7 @@ class Ey::Core::Client::Mock
                  :support_trials              => {},
                  :tasks                       => {},
                  :temp_files                  => {},
+                 :tokens                      => {},
                  :untracked_servers           => {},
                  :users                       => {},
                  :volumes                     => {},

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

@@ -3,6 +3,7 @@ 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/models/environment.rb

@@ -51,6 +51,10 @@ class Ey::Core::Client::Environment < Ey::Core::Model
     connection.requests.new(response.body["request"])
   end
 
+  def apply(type="main")
+    connection.requests.new(self.connection.apply_environment_updates("id" => self.id, "type" => type).body["request"])
+  end
+
   def deprovision
     connection.requests.new(self.connection.deprovision_environment("id" => self.id).body["request"])
   end

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

@@ -21,6 +21,8 @@ class Ey::Core::Client::Server < Ey::Core::Model
   attribute :ssh_port,         type: :integer
   attribute :state
   attribute :updated_at,       type: :time
+  attribute :wait_for_chef,    type: :boolean
+  attribute :release_label
 
   has_one :account
   has_one :address, collection: "addresses"
@@ -34,6 +36,12 @@ class Ey::Core::Client::Server < Ey::Core::Model
 
   attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id
 
+  def apply(type="main")
+    requires :identity
+
+    connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
+  end
+
   def reboot
     requires :identity
 
@@ -48,6 +56,7 @@ class Ey::Core::Client::Server < Ey::Core::Model
 
       server_attributes = {
         "environment" => environment.id,
+        "wait_for_chef" => self.wait_for_chef,
         "snapshot"    => self.snapshot_id,
         "server"      => {
           "flavor"          => self.flavor_id,
@@ -57,6 +66,7 @@ class Ey::Core::Client::Server < Ey::Core::Model
           "name"            => self.name,
           "role"            => self.role,
           "volume_size"     => self.volume_size,
+          "release_label"   => self.release_label,
         }
       }
       connection.requests.new(connection.create_server(server_attributes).body["request"])

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

@@ -1,8 +1,12 @@
 class Ey::Core::Client::Token < Ey::Core::Model
 
-  identity :auth_id
+  identity :id
 
+  attribute :auth_id
   attribute :on_behalf_of
+  attribute :last_seen_at, type: :time
+  attribute :expires_at,   type: :time
+  attribute :revoked_at,   type: :time
 
   def save!
     params = {

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

@@ -10,6 +10,7 @@ class Ey::Core::Client::User < Ey::Core::Model
 
   has_many :accounts
   has_many :keypairs
+  has_many :tokens
 
   attr_accessor :password
 

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

@@ -0,0 +1,54 @@
+class Ey::Core::Client
+  class Real
+    def apply_environment_updates(options={})
+      id  = options.delete("id")
+      url = options.delete("url")
+
+      request(
+        :path   => "environments/#{id}/apply",
+        :method => :post,
+        :url    => url,
+        :body   => options,
+      )
+    end
+  end
+
+  class Mock
+    def apply_environment_updates(options={})
+      id          = options.delete("id")
+      servers     = get_servers("environment" => id).body["servers"]
+      request_id  = self.uuid
+
+      servers.each do |server|
+        update_id = self.uuid
+        self.data[:instance_updates][update_id] = {
+          "id"          => update_id,
+          "instance_id" => server["id"],
+          "data"        => {
+            "type" => options["type"] || "main",
+          }
+        }
+      end
+
+      request = {
+        "id"           => request_id,
+        "type"         => "configure_environment",
+        "successful"   => true,
+        "started_at"   => Time.now,
+        "finished_at"  => Time.now,
+        "resource_url" => nil,
+        "resource"     => nil,
+      }
+
+      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/apply_server_updates.rb

@@ -0,0 +1,52 @@
+class Ey::Core::Client
+  class Real
+    def apply_server_updates(options={})
+      id  = options.delete("id")
+      url = options.delete("url")
+
+      request(
+        :path   => "servers/#{id}/apply",
+        :method => :post,
+        :url    => url,
+        :body   => options,
+      )
+    end
+  end
+
+  class Mock
+    def apply_server_updates(options={})
+      id         = options.delete("id")
+      server     = self.data[:servers][id]
+      request_id = self.uuid
+      update_id  = self.uuid
+
+      self.data[:instance_updates][update_id] = {
+        "id"          => update_id,
+        "instance_id" => server["id"],
+        "data"        => {
+          "type" => options["type"] || "main",
+        }
+      }
+
+      request = {
+        "id"           => request_id,
+        "type"         => "instance_update",
+        "successful"   => true,
+        "started_at"   => Time.now,
+        "finished_at"  => Time.now,
+        "resource_url" => nil,
+        "resource"     => nil,
+      }
+
+      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/create_user.rb

@@ -20,18 +20,26 @@ class Ey::Core::Client
         )
       end
 
-      resource_id = self.uuid
+      resource_id   = self.uuid
+      token_id      = self.uuid
+      token_auth_id = self.uuid
 
       resource = params["user"].dup
-      resource["token"] = SecureRandom.hex(20)
 
       resource.merge!({
         "id"          => resource_id,
         "accounts"    => url_for("/users/#{resource_id}/accounts"),
         "memberships" => url_for("/users/#{resource_id}/memberships"),
         "keypairs"    => url_for("/users/#{resource_id}/keypairs"),
+        "tokens"      => url_for("/users/#{resource_id}/tokens"),
       })
 
+      self.data[:tokens][token_id] = {
+        "id"           => token_id,
+        "auth_id"      => token_auth_id,
+        "on_behalf_of" => url_for("/users/#{resource_id}"),
+      }
+
       self.data[:users][resource_id] = resource
 
       response(

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

@@ -0,0 +1,21 @@
+class Ey::Core::Client
+  class Real
+    def get_token(options={})
+      id  = options.delete("id")
+      url = options.delete("url")
+
+      request(
+        :path => "tokens/#{id}",
+        :url  => url,
+      )
+    end
+  end
+
+  class Mock
+    def get_token(options={})
+      response(
+        :body => {"token" => self.find(:tokens, resource_identity(options))},
+      )
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+class Ey::Core::Client
+  class Real
+    def get_tokens(params={})
+      query = Ey::Core.paging_parameters(params)
+      url   = params.delete("url")
+
+      request(
+        :params => params,
+        :query  => query,
+        :path   => "/tokens",
+        :url    => url,
+      )
+    end
+  end
+
+  class Mock
+    def get_tokens(params={})
+      extract_url_params!(params)
+      find(:users, resource_identity(params["user"]))
+
+      params["on_behalf_of"] = params.delete("user")
+
+      headers, tokens_page = search_and_page(params, :tokens, search_keys: %w(on_behalf_of))
+
+      response(
+        :body    => {"tokens" => tokens_page},
+        :status  => 200,
+        :headers => headers,
+      )
+    end
+  end
+end

data/lib/ey-core/version.rb

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

data/spec/environments_spec.rb

@@ -70,6 +70,24 @@ describe 'as a user' do
       let!(:name)        { Faker::Name.first_name }
       let!(:environment) { create_environment(account: account, application: app, environment: {name: name}) }
 
+      it "applies main" do
+        expect(environment.apply.ready!).to be_successful
+
+        if Ey::Core::Client.mocking?
+          expect(client.data[:instance_updates].count).to eq(environment.servers.count)
+          expect(client.data[:instance_updates].values.map { |iu| iu["data"]["type"] }).to eq(["main"] * environment.servers.count)
+        end
+      end
+
+      it "applies custom" do
+        expect(environment.apply("custom").ready!).to be_successful
+
+        if Ey::Core::Client.mocking?
+          expect(client.data[:instance_updates].count).to eq(environment.servers.count)
+          expect(client.data[:instance_updates].values.map { |iu| iu["data"]["type"] }).to eq(["custom"] * environment.servers.count)
+        end
+      end
+
       it "destroys an environment" do
         expect {
           environment.destroy.ready!

data/spec/servers_spec.rb

@@ -19,6 +19,14 @@ describe 'servers' do
       expect(reboot_request.successful).to be true
     end
 
+    it "applies" do
+      expect(server.apply.ready!).to be_successful
+
+      if Ey::Core::Client.mocking?
+        expect(client.data[:instance_updates].count).to eq(1)
+      end
+    end
+
     it "does not destroy" do
       expect {
         server.destroy

data/spec/tokens_spec.rb

@@ -7,13 +7,31 @@ describe 'tokens' do
     context "with a user" do
       let!(:user) { client.users.create!(name: Faker::Name.name, email: Faker::Internet.email) }
 
-      it "should generate a token" do
+      it "generates a token" do
         token = client.tokens.create!(on_behalf_of: user)
         expect(token.auth_id).not_to be_nil
       end
 
-      # other endpoint: upgrade, which takes a limited token and upgrades to full_access.
+      it "lists tokens" do
+        tokens = user.tokens.all
+        expect(tokens).not_to be_empty
+      end
+
+      it "gets a token" do
+        token = user.tokens.first
+        expect(token.reload).to be
+      end
 
+      context "with multiple users" do
+        let!(:other_user) { client.users.create(name: Faker::Name.name, email: Faker::Internet.email) }
+
+        it "only shows the correct tokens" do
+          expect(user.tokens.all.count).to eq(1)
+          expect(other_user.tokens.all.count).to eq(1)
+          expect(user.tokens.first.on_behalf_of).to eq(client.url_for("/users/#{user.identity}"))
+          expect(other_user.tokens.first.on_behalf_of).to eq(client.url_for("/users/#{other_user.identity}"))
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -252,6 +252,8 @@ files:
 - lib/ey-core/models/volume.rb
 - lib/ey-core/request.rb
 - lib/ey-core/request_failure.rb
+- lib/ey-core/requests/apply_environment_updates.rb
+- lib/ey-core/requests/apply_server_updates.rb
 - lib/ey-core/requests/attach_address.rb
 - lib/ey-core/requests/authorized_channel.rb
 - lib/ey-core/requests/boot_environment.rb
@@ -406,6 +408,8 @@ files:
 - lib/ey-core/requests/get_support_trial.rb
 - lib/ey-core/requests/get_task.rb
 - lib/ey-core/requests/get_tasks.rb
+- lib/ey-core/requests/get_token.rb
+- lib/ey-core/requests/get_tokens.rb
 - lib/ey-core/requests/get_untracked_server.rb
 - lib/ey-core/requests/get_untracked_servers.rb
 - lib/ey-core/requests/get_user.rb