ruby_aem_aws 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34448f0994323f7e43c692f579291e49bc7b8d6d
-  data.tar.gz: 6ae2d4f79cf7cecb8ce3e3f958c6d1242d931533
+  metadata.gz: ff1811700428fb65c37eb7e1483880d021409248
+  data.tar.gz: 0a9a738540c1b4ef71c36b4a7d87720f92dc21ca
 SHA512:
-  metadata.gz: aa09b1af950044949917e929bf65db54a81ee86a22afc23d344896c5b93876651f8b500560794ecfcd68cba0bafd30857f1aa1dfc059365e27e89d5122a8ead7
-  data.tar.gz: cb1e8f21104881a61379c9238fe213806b9a6e58925273f3c5f6c5e9aac474b492438963bfd2e947545d74b2143790c3af54aea03eeebc3a767a5947d64f3618
+  metadata.gz: dde9e65199958cda617db9e1c0025c572afd05b66233773ac642dc424003d5913b9b88ee20492ae63dc24c011e082e914ffa58aaaf7ee63b629e4ffd8fc4ac99
+  data.tar.gz: '0342921e2739eb702196395a0f2a9bcbe89395fb631a352ebb7a211453f42a435b3513a8c6b680ddfa7cfdd265e60263d4544bdc4ea40cf5cf37084d5b38f5c4'

data/lib/ruby_aem_aws/abstract/component.rb

@@ -23,7 +23,7 @@ module RubyAemAws
     include InstanceDescriber
 
     def to_s
-      "#{self.class.name.split('::').last}(#{@descriptor.stack_prefix unless @descriptor.nil?})"
+      "#{self.class.name.split('::').last}(#{@descriptor&.stack_prefix})"
     end
 
     private

data/lib/ruby_aem_aws/component/chaos_monkey.rb

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative '../abstract/single_component'
+require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
-require_relative '../mixins/healthy_state_verifier'
+require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
 
@@ -23,10 +23,9 @@ module RubyAemAws
     # Interface to the AWS instance running the ChaosMonkey component of a full-set AEM stack.
     class ChaosMonkey
       attr_reader :descriptor, :ec2_resource, :asg_client, :cloud_watch_client, :cloud_watch_log_client
-      include AbstractSingleComponent
+      include AbstractGroupedComponent
       include AbstractSnapshot
-      # Can't verify state by count as there's no ELB.
-      include HealthyStateVerifier
+      include HealthyResourceVerifier
       include MetricVerifier
       include SnapshotVerifier
 
@@ -49,9 +48,19 @@ module RubyAemAws
         @ec2_resource = params[:Ec2Resource]
       end
 
-      # def terminate_all_instances
+      def terminate_all_instances
+        get_all_instances.each do |i|
+          next if i.nil?
+          i.terminate
+          i.wait_until_terminated
+        end
+      end
 
-      # def terminate_random_instance
+      def terminate_random_instance
+        instance = get_random_instance
+        instance.terminate
+        instance.wait_until_terminated
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/orchestrator.rb

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative '../abstract/single_component'
+require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
-require_relative '../mixins/healthy_state_verifier'
+require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
 
@@ -23,10 +23,9 @@ module RubyAemAws
     # Interface to the AWS instance running the Orchestrator component of a full-set AEM stack.
     class Orchestrator
       attr_reader :descriptor, :ec2_resource, :asg_client, :cloud_watch_client, :cloud_watch_log_client
-      include AbstractSingleComponent
+      include AbstractGroupedComponent
       include AbstractSnapshot
-      # Can't verify state by count as there's no ELB.
-      include HealthyStateVerifier
+      include HealthyResourceVerifier
       include MetricVerifier
       include SnapshotVerifier
 
@@ -49,9 +48,19 @@ module RubyAemAws
         @ec2_resource = params[:Ec2Resource]
       end
 
-      # def terminate_all_instances
+      def terminate_all_instances
+        get_all_instances.each do |i|
+          next if i.nil?
+          i.terminate
+          i.wait_until_terminated
+        end
+      end
 
-      # def terminate_random_instance
+      def terminate_random_instance
+        instance = get_random_instance
+        instance.terminate
+        instance.wait_until_terminated
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: AEM on AWS API Ruby client