ey-core 3.4.2 → 3.6.3

data/lib/ey-core/cli/helpers/chef.rb

@@ -28,7 +28,7 @@ module Ey
               puts "#{type.capitalize} chef run failed".red
               ap request
               if server = environment.servers.first
-                puts "For logs try `ey logs --server #{server.provisioned_id}` --environment #{environment.name}"
+                puts "For logs try `ey-core logs --server #{server.provisioned_id}` --environment #{environment.name}"
               end
             end
           end

data/lib/ey-core/cli/helpers/core.rb

@@ -45,7 +45,7 @@ module Ey
 
           def core_operator_and_environment_for(options={})
             unless options[:environment]
-              raise "--environment is required (for a list of environments, try `ey environments`)"
+              raise "--environment is required (for a list of environments, try `ey-core environments`)"
             end
             operator = operator(options)
             environment = nil
@@ -61,7 +61,7 @@ module Ey
               end
             end
             unless environment
-              raise "environment '#{options[:environment]}' not found (for a list of environments, try `ey environments`)"
+              raise "environment '#{options[:environment]}' not found (for a list of environments, try `ey-core environments`)"
             end
             [operator, environment]
           end
@@ -131,7 +131,7 @@ module Ey
               write_core_yaml(legacy_token)
               retry
             elsif e.message.match(/missing token/i)
-              abort "Missing credentials: Run 'ey login' to retrieve your Engine Yard Cloud API token.".yellow
+              abort "Missing credentials: Run 'ey-core login' to retrieve your Engine Yard Cloud API token.".yellow
             else
               raise e
             end
@@ -173,6 +173,35 @@ module Ey
             end
           end
 
+          # Fetches a list of environments by given name or ID.
+          #
+          # @param environment_name_or_id [String] name or ID of environment.
+          #
+          # @return [Array<Ey::Core::Client::Environment>] list of environments.
+          def core_environments(environment_name_or_id)
+            core_client.environments.all(name: environment_name_or_id).tap do |result|
+              result << core_client.environments.get(environment_name_or_id) if result.empty?
+            end.to_a.compact
+          end
+
+          # Fetches a list of applications by given name or ID.
+          #
+          # @param application_name_or_id [String] name or ID of application.
+          #
+          # @return [Array<Ey::Core::Client::Environment>] list of environments.
+          def core_applications(application_name_or_id)
+            core_client.applications.all(name: application_name_or_id).tap do |result|
+              result << core_client.applications.get(application_name_or_id) if result.empty?
+            end.to_a.compact
+          end
+
+          # Fetches a list of environment variables available for current user.
+          #
+          # @return [Array<Ey::Core::Client::EnvironmentVariable>] list of environment variables.
+          def core_environment_variables
+            core_client.environment_variables
+          end
+
           def write_core_yaml(token=nil)
             core_yaml[core_url] = token if token
             File.open(self.class.core_file, "w") {|file|

data/lib/ey-core/cli/helpers/server_sieve.rb

@@ -6,6 +6,7 @@ module Ey
           ROLES = [
             :app_servers,
             :db_servers,
+            :app_master,
             :db_master,
             :utilities
           ]
@@ -56,6 +57,12 @@ module Ey
           def db_servers
             db_master + servers_api.all(role: 'db_slave').to_a
           end
+          
+          def app_master
+            ['app_master', 'solo'].
+              map {|role| servers_api.all(role:role).to_a}.
+              flatten
+          end
 
           def db_master
             ['db_master', 'solo'].

data/lib/ey-core/cli/main.rb

@@ -2,7 +2,7 @@
 #require 'ostruct'
 #require 'ey-core'
 require 'ey-core/cli'
-require 'awesome_print'
+require 'amazing_print'
 require 'belafonte'
 require 'rubygems/package'
 require 'escape'
@@ -13,7 +13,9 @@ require 'ey-core/cli/applications'
 require 'ey-core/cli/console'
 require 'ey-core/cli/current_user'
 require 'ey-core/cli/deploy'
+require 'ey-core/cli/docker_registry_login'
 require 'ey-core/cli/environments'
+require 'ey-core/cli/environment_variables'
 require 'ey-core/cli/help'
 require 'ey-core/cli/init'
 require 'ey-core/cli/login'
@@ -29,9 +31,6 @@ require 'ey-core/cli/version'
 require 'ey-core/cli/web'
 require 'ey-core/cli/whoami'
 
-Cistern.formatter = Cistern::Formatter::AwesomePrint
-
-
 module Ey
   module Core
     module Cli
@@ -44,7 +43,9 @@ module Ey
         mount Console
         mount CurrentUser
         mount Deploy
+        mount DockerRegistryLogin
         mount Environments
+        mount EnvironmentVariables
         mount Help
         mount Init
         mount Login

data/lib/ey-core/cli/servers.rb

@@ -4,36 +4,54 @@ module Ey
   module Core
     module Cli
       class Servers < Subcommand
-        title "servers"
-        summary "List servers you have access to"
+        title 'servers'
+        summary 'List servers you have access to'
 
         option :account,
           short: 'c',
           long: 'account',
           description: 'Filter by account name or id',
-          argument: 'Account'
+          argument: 'account'
 
         option :environment,
-          short: "-e",
-          long: "environment",
-          description: "Filter by environment.",
-          argument: "environment"
+          short: 'e',
+          long: 'environment',
+          description: 'Filter by environment.',
+          argument: 'environment'
+
+        option :role,
+          short: 'r',
+          long: 'role',
+          description: 'Filter by server role.',
+          argument: 'role'
 
         def handle
-          puts TablePrint::Printer.
-            new(servers, [{id: {width: 10}}, :role, :provisioned_id]).
-            table_print
+          puts TablePrint::Printer.new(
+            servers,
+            [
+              { id: { width: 10 } },
+              :role,
+              :provisioned_id,
+              { public_hostname: { width: 50 } },
+              :name,
+            ]
+          ).table_print
         end
 
         private
         def servers
-          if option(:account)
-            core_client.servers.all(account: core_account)
-          elsif environment = option(:environment)
-            (core_client.environments.get(environment) || core_client.environments.first(name: environment)).servers.all
-          else
-            core_client.servers.all
-          end
+          filter_opts = {}
+
+          operator =
+            if option(:environment)
+              core_account.environments.first(name: option(:environment))
+            else
+              filter_opts[:account] = core_account.id if option(:account)
+              core_client
+            end
+
+          filter_opts[:role] = option(:role).split(',') if option(:role)
+          operator ? operator.servers.all(filter_opts) : nil
         end
       end
     end

data/lib/ey-core/cli/ssh.rb

@@ -54,6 +54,10 @@ module Ey
           long: "app_servers",
           description: "Run command on all application servers"
 
+	switch :app_master,
+	  long: "app_master",
+	  description: "Run command on app master"
+
         switch :db_servers,
           long: "db_servers",
           description: "Run command on all database servers"
@@ -97,6 +101,7 @@ module Ey
               environment.servers,
               all: switch_active?(:all),
               app_servers: switch_active?(:app_servers),
+              app_master: switch_active?(:app_master),
               db_servers: switch_active?(:db_servers),
               db_master: switch_active?(:db_master),
               utilities: option(:utilities)
@@ -107,12 +112,13 @@ module Ey
             end
 
             if option(:server)
-              servers += [core_server_for(server: option[:server], operator: environment)]
+              servers += [core_server_for(server: option(:server), operator: environment)]
             else
               servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
                 environment.servers,
                 all: switch_active?(:all),
                 app_servers: switch_active?(:app_servers),
+                app_master: switch_active?(:app_master),
                 db_servers: switch_active?(:db_servers),
                 db_master: switch_active?(:db_master),
                 utilities: option(:utilities)

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

@@ -116,6 +116,9 @@ class Ey::Core::Client::Mock
                  :application_archives        => {},
                  :application_deployments     => {},
                  :applications                => {},
+                 :auto_scaling_alarms         => {},
+                 :auto_scaling_groups         => {},
+                 :auto_scaling_policies       => {},
                  :backup_files                => {},
                  :backups                     => {},
                  :billing                     => {},
@@ -124,6 +127,7 @@ class Ey::Core::Client::Mock
                  :components                  => components,
                  :contact_assignments         => [],
                  :contacts                    => {},
+                 :container_service_deployments => {},
                  :costs                       => [],
                  :database_plan_usages        => Hash.new { |h1,k1| h1[k1] = {} },
                  :database_server_firewalls   => [],
@@ -136,6 +140,7 @@ class Ey::Core::Client::Mock
                  :deployments                 => {},
                  :environment_plan_usages     => Hash.new { |h1,k1| h1[k1] = {} },
                  :environments                => {},
+                 :environment_variables       => {},
                  :features                    => {},
                  :firewall_rules              => {},
                  :firewalls                   => {},

data/lib/ey-core/client.rb

@@ -14,10 +14,14 @@ class Ey::Core::Client < Cistern::Service
   collection :application_archives
   collection :application_deployments
   collection :applications
+  collection :auto_scaling_alarms
+  collection :auto_scaling_groups
+  collection :auto_scaling_policies
   collection :backup_files
   collection :blueprints
   collection :components
   collection :contacts
+  collection :container_service_deployments
   collection :costs
   collection :database_plan_usages
   collection :database_server_revisions
@@ -28,6 +32,7 @@ class Ey::Core::Client < Cistern::Service
   collection :deployments
   collection :environment_plan_usages
   collection :environments
+  collection :environment_variables
   collection :features
   collection :firewall_rules
   collection :firewalls
@@ -70,11 +75,15 @@ class Ey::Core::Client < Cistern::Service
   model :application
   model :application_archive
   model :application_deployment
+  model :auto_scaling_alarm
+  model :auto_scaling_group
   model :backup_file
+  model :base_auto_scaling_policy
   model :billing
   model :blueprint
   model :component
   model :contact
+  model :container_service_deployment
   model :cost
   model :database_plan_usage
   model :database_server
@@ -85,6 +94,7 @@ class Ey::Core::Client < Cistern::Service
   model :deployment
   model :environment
   model :environment_plan_usage
+  model :environment_variable
   model :feature
   model :firewall
   model :firewall_rule
@@ -107,10 +117,13 @@ class Ey::Core::Client < Cistern::Service
   model :server_event
   model :server_usage
   model :service
+  model :simple_auto_scaling_policy
   model :ssl_certificate
+  model :step_auto_scaling_policy
   model :storage
   model :storage_user
   model :support_trial
+  model :target_auto_scaling_policy
   model :task
   model :token
   model :untracked_address
@@ -134,11 +147,14 @@ class Ey::Core::Client < Cistern::Service
   request :create_alert
   request :create_application
   request :create_application_archive
+  request :create_auto_scaling_alarm
+  request :create_auto_scaling_group
   request :create_backup_file
   request :create_database_server
   request :create_database_service
   request :create_database_service_snapshot
   request :create_environment
+  request :create_environment_variable
   request :create_firewall
   request :create_firewall_rule
   request :create_keypair
@@ -151,6 +167,7 @@ class Ey::Core::Client < Cistern::Service
   request :create_password_reset
   request :create_provider
   request :create_server
+  request :create_auto_scaling_policy
   request :create_ssl_certificate
   request :create_storage
   request :create_storage_user
@@ -162,6 +179,8 @@ class Ey::Core::Client < Cistern::Service
   request :deploy_environment_application
   request :deprovision_environment
   request :destroy_addon
+  request :destroy_auto_scaling_alarm
+  request :destroy_auto_scaling_group
   request :destroy_blueprint
   request :destroy_database_server
   request :destroy_database_server_snapshot
@@ -173,15 +192,18 @@ class Ey::Core::Client < Cistern::Service
   request :destroy_logical_database
   request :destroy_provider
   request :destroy_server
+  request :destroy_auto_scaling_policy
   request :destroy_ssl_certificate
   request :destroy_storage
   request :destroy_storage_user
   request :destroy_user
   request :detach_address
   request :disable_feature
+  request :discover_container_service_deployments
   request :discover_database_server
   request :discover_database_server_snapshots
   request :discover_provider_location
+  request :discover_server
   request :download_file
   request :enable_feature
   request :get_account
@@ -203,6 +225,10 @@ class Ey::Core::Client < Cistern::Service
   request :get_application_deployment
   request :get_application_deployments
   request :get_applications
+  request :get_auto_scaling_alarm
+  request :get_auto_scaling_alarms
+  request :get_auto_scaling_group
+  request :get_auto_scaling_groups
   request :get_backup_file
   request :get_backup_files
   request :get_billing
@@ -229,6 +255,8 @@ class Ey::Core::Client < Cistern::Service
   request :get_environment_database_services
   request :get_environment_logical_databases
   request :get_environment_plan_usages
+  request :get_environment_variable
+  request :get_environment_variables
   request :get_environments
   request :get_feature
   request :get_features
@@ -271,6 +299,8 @@ class Ey::Core::Client < Cistern::Service
   request :get_server_events
   request :get_server_usages
   request :get_servers
+  request :get_auto_scaling_policy
+  request :get_auto_scaling_policies
   request :get_ssl_certificate
   request :get_ssl_certificates
   request :get_storage
@@ -294,6 +324,7 @@ class Ey::Core::Client < Cistern::Service
   request :reset_password
   request :reset_server_state
   request :restart_environment_app_servers
+  request :retrieve_docker_registry_credentials
   request :run_cluster_application_action
   request :run_environment_application_action
   request :signup
@@ -305,9 +336,13 @@ class Ey::Core::Client < Cistern::Service
   request :update_address
   request :update_alert
   request :update_application_archive
+  request :update_auto_scaling_alarm
+  request :update_auto_scaling_group
+  request :update_auto_scaling_policy
   request :update_billing
   request :update_blueprint
   request :update_environment
+  request :update_environment_variable
   request :update_membership
   request :update_provider_location
   request :update_server

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

@@ -0,0 +1,8 @@
+class Ey::Core::Client::AutoScalingAlarms < Ey::Core::Collection
+  model Ey::Core::Client::AutoScalingAlarm
+
+  self.model_root         = "auto_scaling_alarm"
+  self.model_request      = :get_auto_scaling_alarm
+  self.collection_root    = "auto_scaling_alarms"
+  self.collection_request = :get_auto_scaling_alarms
+end

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

@@ -0,0 +1,8 @@
+class Ey::Core::Client::AutoScalingGroups < Ey::Core::Collection
+  model Ey::Core::Client::AutoScalingGroup
+
+  self.model_root         = "auto_scaling_group"
+  self.model_request      = :get_auto_scaling_group
+  self.collection_root    = "auto_scaling_groups"
+  self.collection_request = :get_auto_scaling_groups
+end

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

@@ -0,0 +1,33 @@
+class Ey::Core::Client::AutoScalingPolicies < Ey::Core::Collection
+  model Ey::Core::Client::BaseAutoScalingPolicy
+
+  MODELS_TO_TYPE = {
+    "simple" => Ey::Core::Client::SimpleAutoScalingPolicy,
+    "step"   => Ey::Core::Client::StepAutoScalingPolicy,
+    "target" => Ey::Core::Client::TargetAutoScalingPolicy
+  }.freeze
+
+  self.model_root         = "auto_scaling_policy"
+  self.model_request      = :get_auto_scaling_policy
+  self.collection_root    = "auto_scaling_policies"
+  self.collection_request = :get_auto_scaling_policies
+
+  def new(attributes = {})
+    unless attributes.is_a?(::Hash)
+      raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
+    end
+
+    params = Cistern::Hash.stringify_keys(attributes)
+    type = params["type"] ||= "simple"
+    model = MODELS_TO_TYPE[type]
+    unless model
+      raise(ArgumentError.new("Unrecognized policy type #{type}. Allowed types are: #{MODELS_TO_TYPE.keys.join(', ')}"))
+    end
+    model.new(
+      {
+        :collection => self,
+        :connection => connection,
+      }.merge(params)
+    )
+  end
+end

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

@@ -0,0 +1,9 @@
+class Ey::Core::Client::ContainerClusters < Ey::Core::Collection
+
+  model Ey::Core::Client::ContainerCluster
+
+  self.model_root         = "container_cluster"
+  self.model_request      = :get_container_cluster
+  self.collection_root    = "container_clusters"
+  self.collection_request = :get_container_clusters
+end

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

@@ -0,0 +1,17 @@
+class Ey::Core::Client::ContainerServiceDeployments < Ey::Core::Collection
+
+  model Ey::Core::Client::ContainerServiceDeployment
+
+  self.model_root         = "container_service_deployment"
+  self.model_request      = :get_container_service_deployment
+  self.collection_root    = "container_service_deployments"
+  self.collection_request = :get_container_service_deployments
+
+  def discover(task_definition_arn)
+    params = {
+      "task_definition_arn" => task_definition_arn
+    }
+
+    connection.requests.new(connection.discover_container_service_deployments(params).body["request"])
+  end
+end

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

@@ -0,0 +1,8 @@
+class Ey::Core::Client::EnvironmentVariables < Ey::Core::Collection
+  model Ey::Core::Client::EnvironmentVariable
+
+  self.model_root         = "environment_variable"
+  self.model_request      = :get_environment_variable
+  self.collection_root    = "environment_variables"
+  self.collection_request = :get_environment_variables
+end

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

@@ -6,4 +6,8 @@ class Ey::Core::Client::Servers < Ey::Core::Collection
   self.model_request      = :get_server
   self.collection_root    = "servers"
   self.collection_request = :get_servers
+
+  def discover(options={})
+    self.connection.requests.new(self.connection.discover_server(Cistern::Hash.stringify_keys(options)).body["request"])
+  end
 end

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

@@ -1,3 +1,5 @@
+require 'hashie'
+
 class Ey::Core::Client::Account < Ey::Core::Model
   extend Ey::Core::Associations
 
@@ -67,4 +69,12 @@ class Ey::Core::Client::Account < Ey::Core::Model
     else raise NotImplementedError # update
     end
   end
+
+  # Get authorization data for an Amazon ECR registry.
+  # @param [String] location_id Aws region
+  # @return [Hashie::Mash]
+  def retrieve_docker_registry_credentials(location_id)
+    result = self.connection.retrieve_docker_registry_credentials(self.id, location_id).body
+    ::Hashie::Mash.new(result['docker_registry_credentials'])
+  end
 end

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

@@ -7,6 +7,7 @@ class Ey::Core::Client::Address < Ey::Core::Model
   attribute :ip_address
   attribute :provisioned_id
   attribute :location
+  attribute :scope
   attribute :disappeared_at, type: :time
 
   has_one :provider
@@ -37,6 +38,7 @@ class Ey::Core::Client::Address < Ey::Core::Model
         "provider" => self.provider_id,
         "address"  => {
           "location"       => self.location,
+          "scope"          => self.scope,
         },
       }
 

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

@@ -12,6 +12,7 @@ class Ey::Core::Client::Application < Ey::Core::Model
 
   has_many :archives, key: :application_archives
   has_many :keypairs
+  has_many :environment_variables
 
   def save!
     params = {

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

@@ -0,0 +1,54 @@
+class Ey::Core::Client::AutoScalingAlarm < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :deleted_at,             type: :time
+  attribute :created_at,             type: :time
+  attribute :updated_at,             type: :time
+  attribute :auto_scaling_policy_id, aliases: "auto_scaling_policy", squash: ["id"]
+  attribute :name
+  attribute :aggregation_type
+  attribute :metric_type
+  attribute :operand
+  attribute :trigger_value,          type: :float
+  attribute :number_of_periods,      type: :integer
+  attribute :period_length,          type: :integer
+  attribute :provisioned_id
+
+  has_one :auto_scaling_policy
+
+  def save!
+    requires :auto_scaling_policy_id, :trigger_value, :period_length
+    params = {
+      "auto_scaling_alarm" => {
+        "name" => name,
+        "trigger_value" => trigger_value,
+        "aggregation_type" => aggregation_type,
+        "metric_type" => metric_type,
+        "operand" => operand,
+        "period_length" => period_length,
+        "number_of_periods" => number_of_periods
+      },
+      "auto_scaling_policy_id"  => auto_scaling_policy_id
+    }
+
+    if new_record?
+      requires :name
+      request_attributes = connection.create_auto_scaling_alarm(params).body["request"]
+      connection.requests.new(request_attributes)
+    else
+      requires :identity
+      params.merge!("id" => identity)
+      connection.requests.new(connection.update_auto_scaling_alarm(params).body["request"])
+    end
+  end
+
+  def destroy!
+    requires :identity
+
+    connection.requests.new(
+      connection.destroy_auto_scaling_alarm("id" => identity).body["request"]
+    )
+  end
+end