ey-core 3.4.4 → 3.5.0

data/lib/ey-core/client.rb

@@ -14,7 +14,9 @@ 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
@@ -29,6 +31,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
@@ -71,8 +74,10 @@ 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
@@ -87,6 +92,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
@@ -109,10 +115,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
@@ -136,12 +145,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
@@ -154,6 +165,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
@@ -165,6 +177,7 @@ 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
@@ -177,6 +190,7 @@ 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
@@ -208,6 +222,8 @@ 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
@@ -236,6 +252,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
@@ -278,6 +296,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
@@ -312,10 +332,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/client/mock.rb

@@ -116,7 +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                     => {},
@@ -137,6 +139,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/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_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/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/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

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

@@ -10,6 +10,8 @@ class Ey::Core::Client::AutoScalingGroup < Ey::Core::Model
   attribute :minimum_size
   attribute :maximum_size
   attribute :desired_capacity
+  attribute :default_cooldown
+  attribute :grace_period
 
   has_one :environment
 
@@ -46,4 +48,28 @@ class Ey::Core::Client::AutoScalingGroup < Ey::Core::Model
       connection.requests.new(connection.update_auto_scaling_group(params).body["request"])
     end
   end
+
+  def simple_auto_scaling_policies
+    auto_scaling_policies("simple")
+  end
+
+  def step_auto_scaling_policies
+    auto_scaling_policies("step")
+  end
+
+  def target_auto_scaling_policies
+    auto_scaling_policies("target")
+  end
+
+  private
+
+  def auto_scaling_policies(types = nil)
+    requires :identity
+    data = connection.get_auto_scaling_policies(
+      "auto_scaling_group" => identity,
+      "types" => [*types]
+    ).body["auto_scaling_policies"]
+
+    connection.auto_scaling_policies.load(data)
+  end
 end

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

@@ -0,0 +1,61 @@
+class Ey::Core::Client::BaseAutoScalingPolicy < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id, type: :integer
+
+  attribute :provisioned_id
+  attribute :provisioner_id
+  attribute :type
+  attribute :name
+  attribute :configuration
+  attribute :auto_scaling_group_id
+
+  has_one :auto_scaling_group
+
+  def save!
+    requires :auto_scaling_group_id, :type
+    params = {
+      "url"                 => self.collection.url,
+      "auto_scaling_policy" => {
+        "name" => self.name
+      }.merge(policy_params),
+      "auto_scaling_group_id"  => self.auto_scaling_group_id
+    }
+
+    if new_record?
+      policy_requires
+      requires :name
+      connection.requests.new(connection.create_auto_scaling_policy(params).body["request"])
+    else
+      requires :identity
+      params.merge("id" => identity)
+      connection.requests.new(connection.update_auto_scaling_policy(params).body["request"])
+    end
+  end
+
+  def destroy!
+    connection.requests.new(
+      self.connection.destroy_auto_scaling_policy("id" => self.id).body["request"]
+    )
+  end
+
+  def alarm
+    requires :identity
+
+    data = self.connection.get_auto_scaling_alarms(
+      "auto_scaling_policy_id" => identity
+    ).body["auto_scaling_alarms"]
+
+    self.connection.auto_scaling_alarms.load(data).first
+  end
+
+  private
+
+  def policy_params
+    raise NotImplementedError
+  end
+
+  def policy_requires
+    raise NotImplementedError
+  end
+end

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

@@ -33,6 +33,7 @@ class Ey::Core::Client::Environment < Ey::Core::Model
   has_many :applications
   has_many :logical_databases
   has_many :deployments
+  has_many :environment_variables
 
   attr_accessor :application_id
 
@@ -129,6 +130,54 @@ class Ey::Core::Client::Environment < Ey::Core::Model
 
   def boot(options={})
     options = Cistern::Hash.stringify_keys(options)
+    connection.requests.new(self.connection.boot_environment(boot_params(options)).body["request"])
+  end
+
+  def unassign!
+    requires :id
+    merge_attributes(self.connection.unassign_environment("id" => self.id).body["environment"])
+  end
+
+  def save!
+    if new_record?
+      requires :application_id, :account_id, :region
+
+      params = {
+        "url"         => self.collection.url,
+        "account"     => self.account_id,
+        "environment" => {
+          "name"                         => self.name,
+          "application_id"               => self.application_id,
+          "region"                       => self.region,
+          "stack_name"                   => self.stack_name,
+          "database_stack"               => self.database_stack,
+          "release_label"                => self.release_label,
+          "language"                     => self.language,
+          "database_backup_limit"        => self.database_backup_limit,
+          "encrypted_ebs_for_everything" => self.encrypted_ebs_for_everything,
+        },
+      }
+
+      params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
+
+      merge_attributes(self.connection.create_environment(params).body["environment"])
+    else
+      requires :identity
+      attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "nane", "release_label")
+      connection.update_environment(
+        "id"     => self.identity,
+        "environment" => attributes,
+      )
+    end
+  end
+
+  private
+
+  def boot_params(options)
+    params = {
+      "cluster_configuration" => {}
+    }
+    
     if options["blueprint_id"]
       params = {
         "cluster_configuration" => {
@@ -139,12 +188,12 @@ class Ey::Core::Client::Environment < Ey::Core::Model
       if ip_id = options["ip_id"]
         params["cluster_configuration"]["configuration"]["ip_id"] = ip_id
       end
-
-      self.connection.requests.new(self.connection.boot_environment(params.merge("id" => self.id)).body["request"])
     else
       raise "configuration is a required key" unless options["configuration"]
       raise "configuration['type'] is required" unless options["configuration"]["type"]
+    end
 
+    if options['configuration']
       missing_keys = []
 
       configuration = options["configuration"]
@@ -192,51 +241,8 @@ class Ey::Core::Client::Environment < Ey::Core::Model
         raise "Invalid configuration - The following keys are missing from the configuration:\n#{missing_keys.join(",\n")}"
       end
 
-      params = {
-        "cluster_configuration" => {
-          "configuration" => configuration
-        }
-      }
-
-      connection.requests.new(self.connection.boot_environment(params.merge("id" => self.id)).body["request"])
-    end
-  end
-
-  def unassign!
-    requires :id
-    merge_attributes(self.connection.unassign_environment("id" => self.id).body["environment"])
-  end
-
-  def save!
-    if new_record?
-      requires :application_id, :account_id, :region
-
-      params = {
-        "url"         => self.collection.url,
-        "account"     => self.account_id,
-        "environment" => {
-          "name"                         => self.name,
-          "application_id"               => self.application_id,
-          "region"                       => self.region,
-          "stack_name"                   => self.stack_name,
-          "database_stack"               => self.database_stack,
-          "release_label"                => self.release_label,
-          "language"                     => self.language,
-          "database_backup_limit"        => self.database_backup_limit,
-          "encrypted_ebs_for_everything" => self.encrypted_ebs_for_everything,
-        },
-      }
-
-      params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
-
-      merge_attributes(self.connection.create_environment(params).body["environment"])
-    else
-      requires :identity
-      attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "nane", "release_label")
-      connection.update_environment(
-        "id"     => self.identity,
-        "environment" => attributes,
-      )
+      params["cluster_configuration"]["configuration"] = configuration
     end
+    params.merge("id" => self.id)
   end
 end