miasma-aws 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0c6ca7e79700a4062548c7c16393c315346b15
-  data.tar.gz: ac667b1d7c150e6f601aabd4dc5fbf0bc4c234bc
+  metadata.gz: a36b7462b9d20c66ddf295b05ebdf6e040347506
+  data.tar.gz: 0f5d54d5fe39d9875113c9780129bf00b5ecfa10
 SHA512:
-  metadata.gz: 07cfe373155d1416623386a7447661b6f1a65de1e8c0fc00d33a9329906f3775374786e129ad6207a1ad633dc144a99eb12e393ed68eb02c1bfe6e247615a992
-  data.tar.gz: df3a5cb492b0fd378af53baaa32e3008eef47541f915c60feda39e21e8359196bcee1e223b4cb8c14d1976062fa929e920de48b28f5d5320b9a6844ebb5e4e91
+  metadata.gz: 8e3d201264bee490fb391aa998fc57590d270543f4d82556444fcc875f2838b61eb2187a2f29e859a0a8279865bf278c99be651a93f554428a3692c808bc6683
+  data.tar.gz: 9ff5d373105120f4ecc53a94cb0cb3847c1d426b5bf845edd1774b91cad1d917a51d045a0fe4a327400e083c71512c5d57c1dae6d9e363123dd8718aeb1a32e4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.4
+* Fix values set within load balancer reload
+* Ensure state is valid for orchestration stack prior to set
+* Load health status of instances attached to load balancers
+
 ## v0.1.2
 * Migrate spec coverage
 * Update storage behavior to use streamable helper

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.4')
 end

data/lib/miasma/contrib/aws/load_balancer.rb

@@ -103,7 +103,7 @@ module Miasma
         def load_balancer_data(balancer=nil)
           params = Smash.new('Action' => 'DescribeLoadBalancers')
           if(balancer)
-            params.merge('LoadBalancerNames.member.1' => balancer.id || balancer.name)
+            params.merge!('LoadBalancerNames.member.1' => balancer.id || balancer.name)
           end
           result = all_result_pages(nil, :body, 'DescribeLoadBalancersResponse', 'DescribeLoadBalancersResult', 'LoadBalancerDescriptions', 'member') do |options|
             request(
@@ -111,23 +111,42 @@ module Miasma
               :params => options.merge(params)
             )
           end
+          if(balancer)
+            health_result = all_result_pages(nil, :body, 'DescribeInstanceHealthResponse', 'DescribeInstanceHealthResult', 'InstanceStates', 'member') do |options|
+              request(
+                :path => '/',
+                :params => options.merge(
+                  'LoadBalancerName' => balancer.id || balancer.name,
+                  'Action' => 'DescribeInstanceHealth'
+                )
+              )
+            end
+          end
           result.map do |blr|
             (balancer || Balancer.new(self)).load_data(
-              :id => blr['LoadBalancerName'],
-              :name => blr['LoadBalancerName'],
-              :state => :active,
-              :status => 'ACTIVE',
-              :created => blr['CreatedTime'],
-              :updated => blr['CreatedTime'],
-              :public_addresses => [
-                Balancer::Address.new(
-                  :address => blr['DNSName'],
-                  :version => 4
+              Smash.new(
+                :id => blr['LoadBalancerName'],
+                :name => blr['LoadBalancerName'],
+                :state => :active,
+                :status => 'ACTIVE',
+                :created => blr['CreatedTime'],
+                :updated => blr['CreatedTime'],
+                :public_addresses => [
+                  Balancer::Address.new(
+                    :address => blr['DNSName'],
+                    :version => 4
+                  )
+                ],
+                :servers => [blr.get('Instances', 'member')].flatten(1).compact.map{|i|
+                  Balancer::Server.new(self.api_for(:compute), :id => i['InstanceId'])
+                }
+              ).merge(
+                health_result.nil? ? {} : Smash.new(
+                  :server_states => health_result.nil? ? nil : health_result.map{|i|
+                    Balancer::ServerState.new(self.api_for(:compute), :id => i['InstanceId'], :status => i['State'], :reason => i['ReasonCode'], :state => i['State'] == 'InService' ? :up : :down)
+                  }
                 )
-              ],
-              :servers => [blr.get('Instances', 'member')].flatten(1).compact.map{|i|
-                Balancer::Server.new(self.api_for(:compute), :id => i['InstanceId'])
-              }
+              )
             ).valid_state
           end
         end

data/lib/miasma/contrib/aws/orchestration.rb

@@ -72,6 +72,14 @@ module Miasma
             if(stack)
               next if stack.id != stk['StackId'] && stk['StackId'].split('/')[1] != stack.id
             end
+            state = stk['StackStatus'].downcase.to_sym
+            unless(Miasma::Models::Orchestration::VALID_RESOURCE_STATES.include?(state))
+              parts = state.to_s.split('_')
+              state = [state.first, *state.slice(-2, state.size)].join('_').to_sym
+              unless(Miasma::Models::Orchestration::VALID_RESOURCE_STATES.include?(state))
+                state = :unknown
+              end
+            end
             new_stack = stack || Stack.new(self)
             new_stack.load_data(
               :id => stk['StackId'],
@@ -84,7 +92,7 @@ module Miasma
               :timeout_in_minutes => stk['TimeoutInMinutes'] ? stk['TimeoutInMinutes'].to_i : nil,
               :status => stk['StackStatus'],
               :status_reason => stk['StackStatusReason'],
-              :state => stk['StackStatus'].downcase.to_sym,
+              :state => state,
               :template_description => stk['TemplateDescription'],
               :disable_rollback => !!stk['DisableRollback'],
               :outputs => [stk.get('Outputs', 'member')].flatten(1).compact.map{|o|

data/miasma-aws.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Smoggy AWS API'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_development_dependency 'miasma', '>= 0.2.12'
+  s.add_development_dependency 'miasma', '>= 0.2.16'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.16
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement