miasma 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a74043b0719d34f3ad9967c6345ad9f26175336
-  data.tar.gz: f58390eaca85d115434f260d6db8cf47869942f2
+  metadata.gz: 039c6245899398e6105945fa52ea6b60a6f8b496
+  data.tar.gz: a50c93103661c9d7919ea9453b095d13d7cbe272
 SHA512:
-  metadata.gz: 25776c602dc8f1b1d2b8815fe8cb2b313ba1a7eada1f64918888a9668b309cc6853ea31de11932159f13ff9782b090c14558425d85bdd0e97a598198e69a3596
-  data.tar.gz: 3c9e161d83a4c092e9fc62bd401245509013bf1c29dd47ca8840f1fe947ec6c9995d3fc175e2182f748f8d1cfc463546b0ca7b71337d32d5322aa4197d94acf3
+  metadata.gz: 30654c515d23a58a58355b7b61ba4fc15179b0cb212dbeaa17bf27879bbba0494516efb1570bb45df29d5d157a6c7f243fdc57c02a0537847524ac651b734528
+  data.tar.gz: e609e7a4a63d73df54f783ee6d33854b1dee23506a25aeaeeac66e14cf2e85a5d4e2ccae0918be602825511c55f12e1b7951e113585dafe7c059c6c6393874eb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# V0.2.10
+* Add auto-follow to paginated results on aws
+* Speed up stack list building on aws
+
 # v0.2.8
 * Allow multiple expected response codes
 * Fix API type provided when building server instance from ASG

data/lib/miasma/contrib/aws.rb

@@ -29,8 +29,9 @@ module Miasma
           else
             list << content
           end
-          if(token = result.get(:body, 'NextToken'))
-            list += all_result_pages(token, *result_key, &block)
+          set = result.get(*result_key.slice(0, 3))
+          if(set && set['NextToken'])
+            list += all_result_pages(set['NextToken'], *result_key, &block)
           end
           list.compact
         end

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

@@ -49,11 +49,12 @@ module Miasma
           if(group)
             params.merge('AutoScalingGroupNames.member.1' => group.id || group.name)
           end
-          result = request(
-            :path => '/',
-            :params => params
-          )
-          [result.get(:body, 'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult', 'AutoScalingGroups', 'member')].flatten(1).compact.map do |grp|
+          result = all_result_pages(nil, :body, 'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult', 'AutoScalingGroups', 'member') do |options|
+            request(
+              :path => '/',
+              :params => options.merge(params)
+            )
+          end.map do |grp|
             (group || Group.new(self)).load_data(
               :id => grp['AutoScalingGroupName'],
               :name => grp['AutoScalingGroupName'],

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

@@ -105,10 +105,12 @@ module Miasma
           if(balancer)
             params.merge('LoadBalancerNames.member.1' => balancer.id || balancer.name)
           end
-          result = request(
-            :path => '/',
-            :params => params
-          )
+          result = all_result_pages(nil, :body, 'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult', 'AutoScalingGroups', 'member') do |options|
+            request(
+              :path => '/',
+              :params => options.merge(params)
+            )
+          end
           [result.get(:body, 'DescribeLoadBalancersResponse', 'DescribeLoadBalancersResult', 'LoadBalancerDescriptions', 'member')].flatten.compact.map do |blr|
             (balancer || Balancer.new(self)).load_data(
               :id => blr['LoadBalancerName'],

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

@@ -50,19 +50,21 @@ module Miasma
           end
           if(stack)
             d_params['StackName'] = stack.id
+            descriptions = all_result_pages(nil, :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member') do |options|
+              request(
+                :path => '/',
+                :params => options.merge(d_params)
+              )
+            end
+          else
+            descriptions = []
           end
-          descriptions = [
-            request(:path => '/', :params => d_params).get(
-              :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member'
-            )
-          ].flatten(1).compact
-          lists = request(:path => '/', :params => l_params)
-          [
-            lists.get(
-              :body, 'ListStacksResponse', 'ListStacksResult',
-              'StackSummaries', 'member'
+          lists = all_result_pages(nil, :body, 'ListStacksResponse', 'ListStacksResult', 'StackSummaries', 'member') do |options|
+            request(
+              :path => '/',
+              :params => options.merge(l_params)
             )
-          ].flatten(1).compact.map do |stk|
+          end.map do |stk|
             desc = descriptions.detect do |d_stk|
               d_stk['StackId'] == stk['StackId']
             end || Smash.new
@@ -79,7 +81,7 @@ module Miasma
               :created => stk['CreationTime'],
               :updated => stk['LastUpdatedTime'],
               :notification_topics => [stk.get('NotificationARNs', 'member')].flatten(1).compact,
-              :timeout_in_minutes => stk['TimeoutInMinutes'],
+              :timeout_in_minutes => stk['TimeoutInMinutes'] ? stk['TimeoutInMinutes'].to_i : nil,
               :status => stk['StackStatus'],
               :status_reason => stk['StackStatusReason'],
               :state => stk['StackStatus'].downcase.to_sym,
@@ -255,20 +257,17 @@ module Miasma
         # @param stack [Models::Orchestration::Stack]
         # @return [Array<Models::Orchestration::Stack::Resource>]
         def resource_all(stack)
-          result = request(
-            :path => '/',
-            :params => Smash.new(
-              'Action' => 'DescribeStackResources',
-              'StackName' => stack.id
-            )
-          )
-          [
-            result.fetch(
-              :body, 'DescribeStackResourcesResponse',
-              'DescribeStackResourcesResult',
-              'StackResources', 'member', []
+          results = all_result_pages(nil, :body, 'DescribeStackResourcesResponse', 'DescribeStackResourcesResult', 'StackResources', 'member') do |options|
+            request(
+              :path => '/',
+              :params => options.merge(
+                Smash.new(
+                  'Action' => 'DescribeStackResources',
+                  'StackName' => stack.id
+                )
+              )
             )
-          ].flatten(1).compact.map do |res|
+          end.map do |res|
             Stack::Resource.new(
               stack,
               :id => res['PhysicalResourceId'],

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

@@ -117,8 +117,13 @@ module Miasma
         #
         # @return [Array<Models::Storage::Bucket>]
         def bucket_all
-          result = request(:path => '/')
-          [result.get(:body, 'ListAllMyBucketsResult', 'Buckets', 'Bucket')].flatten.compact.map do |bkt|
+          result = all_result_pages(nil, :body, 'ListAllMyBucketsResult', 'Buckets', 'Bucket') do |options|
+            request(
+              :path => '/',
+              :params => options
+            )
+          end
+          result.map do |bkt|
             Bucket.new(
               self,
               :id => bkt['Name'],
@@ -160,11 +165,14 @@ module Miasma
         # @param bucket [Bucket]
         # @return [Array<File>]
         def file_all(bucket)
-          result = request(
-            :path => '/',
-            :endpoint => bucket_endpoint(bucket)
-          )
-          [result.get(:body, 'ListBucketResult', 'Contents')].flatten.compact.map do |file|
+          result = all_result_pages(nil, :body, 'ListBucketResult', 'Contents') do |options|
+            request(
+              :path => '/',
+              :params => options,
+              :endpoint => bucket_endpoint(bucket)
+            )
+          end
+          result.map do |file|
             File.new(
               bucket,
               :id => ::File.join(bucket.name, file['Key']),
@@ -335,7 +343,6 @@ module Miasma
                 'X-Amz-Date' => Contrib::AwsApiCore.time_iso8601,
                 'X-Amz-Expires' => timeout_secs
               )
-
             )
           else
             raise Error::ModelPersistError.new "#{file} has not been saved!"

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.8')
+  VERSION = Gem::Version.new('0.2.10')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie