train-awsssm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5a20eca471f5a767da71380b22425fd4676d3a435b0da83077cd3d14fc2c2f
-  data.tar.gz: 97f8b4e0d98b1a20f23b58df148696dceda51843da9fdacd51b274fbf3c94af1
+  metadata.gz: 84b93f6b8c8e42c234b406aaeede3112f9eb8a5d2bb8f25973ca6bac555ebe91
+  data.tar.gz: fb7af1a14b231cffdd3de53b52912fc06cd820c683783f4ed2c45415eef157fb
 SHA512:
-  metadata.gz: 19cb91506eb8d0b5db6eeb49f6e94ab071616dca46ebeeac187065958a954d8ef9c2e7a80c2e3b72de3d914f252132e25f75e6b2b43e08467fe9eddb2c230b54
-  data.tar.gz: c81a2c12459fc95e44c451cf7be89f1c1723ce9820c2790e7963b2676384a8623234f84657d4ddbce8316a03926ee73402bc5640bb5b01cd2d33dfcd3c15060e
+  metadata.gz: 39739ed9e732f26a55ac2a748b932e35c74f94aaa3de0a026d25563ef11b376277ed261bfe1a3bb7e2da3fc0260bf3e8f37b619b530a78ee0ba630f5d7149d29
+  data.tar.gz: fe0b339242ef4ee3ca7f88d43eba25bd148d8a080db8530cf7a4e96c94ea7db1d4bb6c2878c989b848e426b6b1c46878619aff6c429bdeac60523cacaaff99eb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## Version 0.2.1
+
+- Fix EC2 instance enumeration to use paging
+
 ## Version 0.2.0
 
 - Add more parameter and status checks

data/README.md

@@ -25,6 +25,7 @@ You can build and install this gem on your local system as well via a Rake task:
 | `execution_timeout`  | Maximum time until timeout                        | 60               |
 | `recheck_invocation` | Interval of rechecking AWS command invocation     | 1.0              |
 | `recheck_execution`  | Interval of rechecking completion of command      | 1.0              |
+| `instance_pagesize`  | Paging size for EC2 instance retrieval            | 100              |
 
 ## Limitations
 

data/lib/train-awsssm/connection.rb

@@ -7,7 +7,7 @@ module TrainPlugins
   module AWSSSM
     class Connection < Train::Plugins::Transport::BaseConnection
       attr_reader :instance_id, :options
-      attr_writer :ssm, :ec2
+      attr_writer :ssm, :ec2, :instances
 
       def initialize(options)
         super(options)
@@ -85,8 +85,6 @@ module TrainPlugins
       def resolve_instance_id(address)
         logger.debug format("[AWS-SSM] Trying to resolve address %s", address)
 
-        instances = ec2.describe_instances.reservations.collect { |r| r.instances.first }
-
         # Resolve, if DNS name and not Amazon default
         if dns_name?(address) && !amazon_dns?(address)
           address = Resolv.getaddress(address)
@@ -112,6 +110,28 @@ module TrainPlugins
         raise ArgumentError, format("Error looking up Instance ID for %s: %s", address, e.message)
       end
 
+      # List up EC2 instances in the account.
+      #
+      # @param [Boolean] cache Cache results
+      # @return [Array] List of instances
+      # @todo Implement paging
+      def instances(caching: true)
+        return @instances unless @instances.nil? || !caching
+
+        results = []
+
+        ec2_instances = ec2.describe_instances(max_results: options[:instance_pagesize])
+        loop do
+          results.concat ec2_instances.reservations.map(&:instances).flatten
+
+          break unless ec2_instances.next_token
+
+          ec2_instances = ec2.describe_instances(max_results: options[:instance_pagesize], next_token: ec2_instances.next_token)
+        end
+
+        @instances = results
+      end
+
       # Check if this is an IP address
       #
       # @param [String] address Host, IP address or other input

data/lib/train-awsssm/transport.rb

@@ -11,6 +11,7 @@ module TrainPlugins
       option :execution_timeout,  default: 60.0
       option :recheck_invocation, default: 1.0
       option :recheck_execution,  default: 1.0
+      option :instance_pagesize,  default: 100
 
       def connection(_instance_opts = nil)
         @connection ||= TrainPlugins::AWSSSM::Connection.new(@options)

data/lib/train-awsssm/version.rb

@@ -1,5 +1,5 @@
 module TrainPlugins
   module AWSSSM
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-awsssm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thomas Heinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump