ey-core 3.4.2 → 3.6.3

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

@@ -0,0 +1,29 @@
+class Ey::Core::Client
+  class Real
+    def get_environment_variables(params={})
+      query = Ey::Core.paging_parameters(params)
+      url   = params.delete("url")
+
+      request(
+        :params => params,
+        :path   => "/environment_variables",
+        :query  => params,
+        :url    => url,
+      )
+    end
+  end
+
+  class Mock
+    def get_environment_variables(params={})
+      extract_url_params!(params)
+
+      headers, environment_variables_page = search_and_page(params, :environment_variables, search_keys: %w(environment application))
+
+      response(
+        :body    => {"environment_variables" => environment_variables_page},
+        :status  => 200,
+        :headers => headers
+      )
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ class Ey::Core::Client
     def get_environments(params={})
       extract_url_params!(params)
 
-      headers, environments_page = search_and_page(params, :environments, search_keys: %w[account name])
+      headers, environments_page = search_and_page(params, :environments, search_keys: %w[id account name])
 
       response(
         :body    => {"environments" => environments_page},

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

@@ -5,7 +5,7 @@ class Ey::Core::Client
       url = params["url"]
 
       request(
-        :path => "ssl_certificates/#{id}",
+        :path => "ssl-certificates/#{id}",
         :url  => url,
       )
     end

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

@@ -0,0 +1,24 @@
+class Ey::Core::Client
+  class Real
+    def retrieve_docker_registry_credentials(account_id, location_id)
+      request(
+        :path => "/accounts/#{account_id}/docker-registry/#{location_id}/credentials"
+      )
+    end
+  end
+
+  class Mock
+    def retrieve_docker_registry_credentials(account_id, location_id)
+      response(
+        :body => {
+          'docker_registry_credentials' => {
+            'username'          => 'foo',
+            'password'          => 'bar',
+            'registry_endpoint' => "https://012345678901.dkr.ecr.#{location_id}.amazonaws.com",
+            'expires_at'        => (Time.now + 8 * 3600).to_i
+          }
+        }
+      )
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+class Ey::Core::Client
+  class Real
+    def update_auto_scaling_alarm(params = {})
+      id = params.delete("id")
+
+      request(
+        :method => :put,
+        :path   => "/auto_scaling_alarms/#{id}",
+        :body   => { "auto_scaling_alarm" => params.fetch("auto_scaling_alarm") },
+      )
+    end
+  end
+
+  class Mock
+    def update_auto_scaling_alarm(params = {})
+      resource_id = params.delete("id")
+      now = Time.now
+      resource = find(:auto_scaling_alarms, resource_id)
+        .merge(params["auto_scaling_alarm"])
+        .merge("updated_at" => now)
+      resource.merge!(params)
+
+      request = {
+        "id"           => self.uuid,
+        "type"         => "update_auto_scaling_alarm",
+        "successful"   => true,
+        "created_at"   => now - 5,
+        "started_at"   => now - 3,
+        "finished_at"  => now,
+        "updated_at"   => now,
+        "message"      => nil,
+        "read_channel" => nil,
+        "resource"     => [:auto_scaling_alarms, resource_id, resource],
+        "resource_url" => url_for("/auto_scaling_alarms/#{resource_id}")
+      }
+
+      self.data[:requests][request["id"]] = request
+
+      response(
+        body:   { "request" => request },
+        status: 200
+      )
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+class Ey::Core::Client
+  class Real
+    def update_auto_scaling_group(params = {})
+      id = params.delete("id")
+
+      request(
+        :method => :put,
+        :path   => "/auto_scaling_groups/#{id}",
+        :body   => { "auto_scaling_group" => params.fetch("auto_scaling_group") },
+      )
+    end
+  end
+
+  class Mock
+    def update_auto_scaling_group(params = {})
+      url = params.delete("url")
+
+      resource_id = params.delete("id")
+      resource = find(:auto_scaling_groups, resource_id).merge(params["auto_scaling_group"])
+
+      now = Time.now
+
+      request = {
+        "id"           => self.uuid,
+        "type"         => "update_auto_scaling_group",
+        "successful"   => true,
+        "created_at"   => now - 5,
+        "updated_at"   => now,
+        "started_at"   => now - 3,
+        "finished_at"  => now,
+        "message"      => nil,
+        "read_channel" => nil,
+        "resource"     => [:auto_scaling_groups, resource_id, resource],
+        "resource_url" => url_for("/auto_scaling_groups/#{resource_id}")
+      }
+
+      self.data[:requests][request["id"]] = request
+
+      response(
+        :body   => {"request" => request},
+        :status => 200
+      )
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+class Ey::Core::Client
+  class Real
+    def update_auto_scaling_policy(params = {})
+      id = params.delete("id")
+
+      request(
+        :method => :put,
+        :path   => "/auto_scaling_policies/#{id}",
+        :body   => { "auto_scaling_policy" => params.fetch("auto_scaling_policy") },
+      )
+    end
+  end
+
+  class Mock
+    def update_auto_scaling_policy(params = {})
+      resource_id = params.delete("id")
+      now = Time.now
+
+      resource = find(:auto_scaling_policies, resource_id)
+        .merge(params["auto_scaling_policy"])
+        .merge("updated_at" => now)
+      resource.merge!(params)
+
+      request = {
+        "id"           => self.uuid,
+        "type"         => "update_auto_scaling_policy",
+        "successful"   => true,
+        "created_at"   => now - 5,
+        "updated_at"   => now,
+        "started_at"   => now - 3,
+        "finished_at"  => now,
+        "message"      => nil,
+        "read_channel" => nil,
+        "resource"     => [:auto_scaling_policies, resource_id, resource],
+        "resource_url" => url_for("/auto_scaling_policies/#{resource_id}")
+      }
+
+      self.data[:requests][request["id"]] = request
+
+      response(
+        body:   { "request" => request },
+        status: 200
+      )
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+class Ey::Core::Client
+  class Real
+    def update_environment_variable(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+      id = params.delete("id")
+      body = { environment_variable: params }
+
+      request(
+        :method => :put,
+        :path   => "/environment_variables/#{id}",
+        :body   => body
+      )
+    end
+  end
+
+  class Mock
+    def update_environment_variable(_params={})
+      params = Cistern::Hash.stringify_keys(_params).merge!("updated_at" => Time.now)
+      environment_variable  = find(:environment_variables, params.delete("id"))
+      environment_variable.merge!(params)
+
+      response(:body => { "environment_variable" => environment_variable })
+    end
+  end
+end

data/lib/ey-core/test_helpers/auto_scaling_helpers.rb

@@ -0,0 +1,35 @@
+module Ey
+  module Core
+    module TestHelpers
+      module AutoScalingHelpers
+        def create_auto_scaling_group(options = {})
+          environment = options[:environment] || create_environment
+
+          groups = client.auto_scaling_groups
+
+          groups.create!(
+            minimum_size: 2,
+            maximum_size: 6,
+            environment: environment
+          ).resource!
+        end
+
+        def create_auto_scaling_policy(options = {})
+          group = options.delete(:auto_scaling_group) || create_auto_scaling_group
+          policies = client.auto_scaling_policies
+
+          policies.create!(
+            {
+              auto_scaling_group_id: group.id,
+              action_value: 2,
+              action_unit: "instances",
+              action_type: "add",
+              name: SecureRandom.hex(16),
+              type: "simple"
+            }.merge(options)
+          ).resource!
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/test_helpers.rb

@@ -2,6 +2,7 @@ require 'ey-core/test_helpers/account_helpers'
 require 'ey-core/test_helpers/alert_helpers'
 require 'ey-core/test_helpers/client_helpers'
 require 'ey-core/test_helpers/resource_helpers'
+require 'ey-core/test_helpers/auto_scaling_helpers'
 
 module Ey
   module Core
@@ -10,6 +11,7 @@ module Ey
       include AlertHelpers
       include ClientHelpers
       include ResourceHelpers
+      include AutoScalingHelpers
     end
   end
 end

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.4.2"
+    VERSION = "3.6.3"
   end
 end

data/spec/addresses_spec.rb

@@ -6,12 +6,13 @@ describe 'addresses' do
   let!(:provider) { create_provider(account: account) }
 
   it "creates an address" do
-    request = client.addresses.create!(provider: provider, location: "us-west-2")
+    request = client.addresses.create!(provider: provider, location: "us-west-2", scope: "vpc")
     address = request.resource!
     expect(address.id).not_to be_nil
     expect(address.ip_address).not_to be_nil
     expect(address.provisioned_id).not_to be_nil
     expect(address.provider).to eq(provider)
+    expect(address.scope).to eq("vpc")
   end
 
   context "with an address" do

data/spec/auto_scaling_alarms_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+RSpec.describe "Auto scaling alarms" do
+  let!(:client) { create_client }
+  let!(:account) { create_account(client: client) }
+  let(:policy) { create_auto_scaling_policy }
+
+  let(:params) do
+    {
+      "name" => SecureRandom.hex(16),
+      "aggregation_type" => "avg",
+      "metric_type" => "cpu",
+      "operand" => "gt",
+      "trigger_value" => 0.5,
+      "number_of_periods" => 1,
+      "period_length" => 30,
+      "auto_scaling_policy_id" => policy.id
+    }
+  end
+
+  let!(:alarm) { client.auto_scaling_alarms.create!(params).resource! }
+
+  it "creates a new alarm for an auto scaling policy" do
+    expect(alarm).not_to be_nil
+    expect(policy.auto_scaling_alarms).not_to be_empty
+    expect(client.auto_scaling_alarms).not_to be_empty
+  end
+
+  it "updates an alarm" do
+    expect do
+      alarm.update("name" => "new name")
+    end.to change { alarm.name }.to("new name")
+  end
+
+  it "destroys auto scalig alarm by it's id" do
+    expect do
+      alarm.destroy!
+    end.to change { policy.reload.auto_scaling_alarms.count }.from(1).to(0)
+  end
+end

data/spec/auto_scaling_groups_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'as a user' do
+  let!(:client) { create_client }
+
+  context "with an environment" do
+    let!(:account)     { create_account(client: client) }
+    let!(:provider)    { create_provider(account: account) }
+    let!(:app)         { create_application(account: account, client: client) }
+    let!(:environment) { create_environment(client: client, account: account, application: app, configuration: { type: "production"}) }
+
+    it "adds an auto scaling group" do
+      expect {
+        client.auto_scaling_groups.create!(minimum_size: 2, maximum_size: 6, environment: environment).resource!
+      }.to change { environment.reload.auto_scaling_group }.from(nil).and change { client.auto_scaling_groups.count }.by(1)
+    end
+
+    context "with an auto scaling group" do
+      let!(:group) { client.auto_scaling_groups.create!(minimum_size: 2, maximum_size: 6, environment: environment).resource! }
+
+      it "destroys the auto scaling group" do
+        expect {
+          group.destroy.ready!
+        }.to change { group.reload.deleted_at }.from(nil).and change { client.environments.get(environment.id).auto_scaling_group }.to(nil)
+      end
+    end
+  end
+end

data/spec/auto_scaling_policies_spec.rb

@@ -0,0 +1,94 @@
+require "spec_helper"
+
+RSpec.describe "Auto scaling policies" do
+  let!(:client) { create_client }
+  let!(:account) { create_account(client: client) }
+  let!(:environment) { create_environment(account: account) }
+  let(:auto_scaling_group) { create_auto_scaling_group(environment: environment.id) }
+  let(:simple_policy_params) do
+    {
+      name: SecureRandom.hex(16),
+      action_value: 2,
+      action_type: "add",
+      action_unit: "instances",
+      auto_scaling_group_id: auto_scaling_group.id,
+      type: "simple"
+    }
+  end
+
+  describe "common requests for all policy types" do
+    let!(:policy) { client.auto_scaling_policies.create!(simple_policy_params).resource! }
+
+    it "is able to retrieve auto scaling policy by it's id" do
+      found_policy = client.auto_scaling_policies.get(policy.id)
+      expect(found_policy).not_to be_nil
+      expect(found_policy.id).to eq(policy.id)
+    end
+
+    it "updates auto scaling policy" do
+      expect do
+        policy.update(name: "new name")
+      end.to change { policy.name }.to("new name")
+    end
+
+    it "destroys a policy by it's id" do
+      expect do
+        policy.destroy!
+      end.to change { auto_scaling_group.reload.simple_auto_scaling_policies.count }.from(1).to(0)
+    end
+  end
+
+  context "simple autoscaling policy" do
+    it "adds one to autoscaling group" do
+      expect {
+        client.auto_scaling_policies.create!(simple_policy_params)
+      }.to change { auto_scaling_group.reload.simple_auto_scaling_policies.count }.from(0).to(1)
+        .and not_change { auto_scaling_group.reload.step_auto_scaling_policies.count }
+        .and not_change { auto_scaling_group.reload.target_auto_scaling_policies.count }
+    end
+  end
+
+  context "target tracking auto scaling policy" do
+    let(:params) do
+      {
+        auto_scaling_group_id: auto_scaling_group.id,
+        name: SecureRandom.hex(16),
+        target_value: 0.7,
+        estimated_warmup: 200,
+        metric_type: "avg_cup",
+        disable_scale_in: false,
+        type: "target"
+      }
+    end
+
+    it "adds one to autoscaling group" do
+      expect {
+        client.auto_scaling_policies.create!(params)
+      }.to change { auto_scaling_group.reload.target_auto_scaling_policies.count }.from(0).to(1)
+        .and not_change { auto_scaling_group.reload.simple_auto_scaling_policies.count }
+        .and not_change { auto_scaling_group.reload.step_auto_scaling_policies.count }
+    end
+  end
+
+  context "step auto scaling policy" do
+    let(:params) do
+      {
+        auto_scaling_group_id: auto_scaling_group.id,
+        name:                  SecureRandom.hex(16),
+        estimated_warmup:      200,
+        action_unit:           "instances",
+        action_type:           "add",
+        steps:                 [{ metric_from: 50, metric_to: nil, action_value: 1 }],
+        type:                  "step"
+      }
+    end
+
+    it "adds one to autoscaling group" do
+      expect {
+        client.auto_scaling_policies.create!(params)
+      }.to change { auto_scaling_group.reload.step_auto_scaling_policies.count }.from(0).to(1)
+        .and not_change { auto_scaling_group.reload.simple_auto_scaling_policies.count }
+        .and not_change { auto_scaling_group.reload.target_auto_scaling_policies.count }
+    end
+  end
+end

data/spec/docker_registry_credentials_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'as a user' do
+  let(:client) { create_client }
+  let(:location) { 'us-east-1' }
+  let!(:account) { create_account(client: client) }
+
+  it 'returns a valid docker registry credentials' do
+    credentials = account.retrieve_docker_registry_credentials(location)
+
+    expect(credentials.username).to be
+    expect(credentials.password).to be
+    expect(credentials.registry_endpoint).to match(/#{location}/)
+    expect(credentials.expires_at).to be > (Time.now + 6 * 3600).to_i
+  end
+end

data/spec/environments_spec.rb

@@ -173,6 +173,24 @@ describe 'as a user' do
         expect(account.environments.all.map(&:identity)).to contain_exactly(environment.identity)
       end
 
+      it 'gets the environment attributes' do
+        expect(client.environments.get(environment.id)).to have_attributes(
+          "account"               => account,
+          "classic"               => true,
+          "custom_recipes"        => nil,
+          "database_stack"        => "postgres9_4",
+          "deployments_url"       => client.url_for("/environments/#{environment.id}/deployments"),
+          "id"                    => environment.id,
+          "keypairs"              => environment.keypairs,
+          "logical_databases_url" => client.url_for("/environments/#{environment.id}/logical-databases"),
+          "release_label"         => "stable-v4-2.0.101",
+          "servers"               => environment.servers,
+          "stack_name"            => "nginx_passenger4",
+          "username"              => "deploy",
+          "service_level"         => "default"
+        )
+      end
+
       it "adds a keypair" do
         client.keypairs.create(name: SecureRandom.hex(6), public_key: SSHKey.generate.ssh_public_key)
       end

data/spec/servers_spec.rb

@@ -10,6 +10,14 @@ describe 'servers' do
     let!(:environment) { create_environment(account: account, application: application, name: Faker::Name.first_name) }
     let!(:server)      { environment.servers.first }
 
+    context "discovering" do
+      it "discovers a server that it knows nothing about" do
+        expect {
+          client.servers.discover(provider: account.providers.first.identity, environment: environment.identity, server: {location: "us-east-1b", provisioned_id: "i-newserver"}).resource!
+        }.to change { client.servers.count }.by(1)
+      end
+    end
+
     context "with a second account" do
       let(:account2) { create_account(client: client) }
       let(:app2)     { create_application(account: account2) }

data/spec/spec_helper.rb

@@ -17,4 +17,11 @@ RSpec.configure do |config|
     $stdin = STDIN
     $stderr = STDERR
   end
+
+  #
+  # This allows to have not_change matcher, i.e.
+  #
+  #   expect { something }.to change { other_thing }
+  #     .and not_change { completely_other_things }
+  RSpec::Matchers.define_negated_matcher :not_change, :change
 end

data/spec/support/core.rb

@@ -1,5 +1,3 @@
-Cistern.formatter = Cistern::Formatter::AwesomePrint
-
 if ENV['MOCK_CORE'] == 'true'
   Ey::Core::Client.mock!
 end