ruby_aem_aws 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cd5259db49091f98e9697a3af15805c17e41a2
-  data.tar.gz: d4900116bedbdd096c20d3a7f2bacaaa35a9d31c
+  metadata.gz: 127f5b90f64b8f1bd149bb34c3b1a6bfaf2d3348
+  data.tar.gz: 412586db736b7bcb7fc4737cae3f18a392ef22aa
 SHA512:
-  metadata.gz: 9c2e3351dceefc15ff96a2b3d5e8b9caa4629ac771e2d381e63d6ca27cff1ebd59f0d8c9331eed4388711af205e83a38bdb7a8069e8f2e44fe60e1cc3fe8ffd6
-  data.tar.gz: 8600e31f276230b59f5f5edb9614909b15d7d54444bddb77486515c802d13db688cf2010860486b0650001de0ff04beaeb771c8b26f3021a8a0bfb0010215275
+  metadata.gz: 3ad3b0e2d3d321f59d614a4a4bdb4522db74c73568da452a67ffd61deb93f67eedde53c4019630159ad1330a2e0c017e77e8a77b912ce1d4a9c53bd6a5668140
+  data.tar.gz: 024e9c16f7e8cbd5e9d2a63382b8ce6f9041372949d03e51583547fcc901af1356a7eefb4559821c1f53011ebb5bdca4eaa617a91c1e2d95a5090665a443d271

data/conf/gem.yaml

@@ -1 +1 @@
-version: 2.3.1
+version: 2.4.1

data/lib/ruby_aem_aws/architecture/full_set_stack.rb

@@ -18,6 +18,8 @@ require_relative '../component/chaos_monkey'
 require_relative '../component/orchestrator'
 require_relative '../component/publish_dispatcher'
 require_relative '../component/publish'
+require_relative '../component/preview_publish_dispatcher'
+require_relative '../component/preview_publish'
 require_relative '../mixins/metric_verifier'
 
 module RubyAemAws
@@ -96,9 +98,19 @@ module RubyAemAws
       RubyAemAws::Component::Publish.new(@stack_prefix, @publish_aws_clients)
     end
 
+    # @return new RubyAemAws::Component::PreviewPublish instance
+    def preview_publish
+      RubyAemAws::Component::PreviewPublish.new(@stack_prefix, @publish_aws_clients)
+    end
+
     # @return new RubyAemAws::Component::PublishDispatcher instance
     def publish_dispatcher
       RubyAemAws::Component::PublishDispatcher.new(@stack_prefix, @dispatcher_aws_clients)
     end
+
+    # @return new RubyAemAws::Component::PreviewPublishDispatcher instance
+    def preview_publish_dispatcher
+      RubyAemAws::Component::PreviewPublishDispatcher.new(@stack_prefix, @dispatcher_aws_clients)
+    end
   end
 end

data/lib/ruby_aem_aws/client/cloudwatch.rb

@@ -52,7 +52,8 @@ module RubyAemAws
       until curr_response.next_token.nil?
         next_token = { next_token: curr_response.next_token }
         filter.update(next_token)
-        response = curr_response
+        # empty events should be ignored
+        response = curr_response unless curr_response.events.empty?
         curr_response = cloud_watch_log_client.filter_log_events(filter)
       end
 

data/lib/ruby_aem_aws/component/preview_publish.rb

@@ -0,0 +1,79 @@
+# Copyright 2018-2021 Shine Solutions Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../abstract/grouped_component'
+require_relative '../abstract/snapshot'
+require_relative '../constants'
+require_relative '../mixins/healthy_resource_verifier'
+require_relative '../mixins/metric_verifier'
+require_relative '../mixins/snapshot_verifier'
+
+module RubyAemAws
+  module Component
+    # Interface to the AWS instance running the Preview Publish component of a full-set AEM stack.
+    class PreviewPublish
+      attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :asg_client, :cloud_watch_log_client
+
+      include AbstractGroupedComponent
+      include AbstractSnapshot
+      include HealthyResourceVerifier
+      include MetricVerifier
+      include SnapshotVerifier
+
+      EC2_COMPONENT = 'preview-publish'.freeze
+      EC2_NAME = 'AEM Preview Publish'.freeze
+
+      # @param stack_prefix AWS tag: StackPrefix
+      # @param params Array of AWS Clients and Resource connections:
+      # - AutoScalingClient: AWS AutoScalingGroup Client.
+      # - CloudWatchClient: AWS Cloudwatch Client.
+      # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+      # - Ec2Resource: AWS EC2 Resource connection.
+      # @return new RubyAemAws::FullSet::PreviewPublish
+      def initialize(stack_prefix, params)
+        @descriptor = ComponentDescriptor.new(stack_prefix,
+                                              EC2Descriptor.new(EC2_COMPONENT, EC2_NAME))
+        @asg_client = params[:AutoScalingClient]
+        @cloud_watch_client = params[:CloudWatchClient]
+        @cloud_watch_log_client = params[:CloudWatchLogsClient]
+        @ec2_resource = params[:Ec2Resource]
+      end
+
+      def terminate_all_instances
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          i.terminate
+          i.wait_until_terminated
+        end
+      end
+
+      def terminate_random_instance
+        instance = get_random_instance
+        instance.terminate
+        instance.wait_until_terminated
+      end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
+    end
+  end
+end

data/lib/ruby_aem_aws/component/preview_publish_dispatcher.rb

@@ -0,0 +1,84 @@
+# Copyright 2018-2021 Shine Solutions Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../abstract/grouped_component'
+require_relative '../abstract/snapshot'
+require_relative '../constants'
+require_relative '../mixins/healthy_resource_verifier'
+require_relative '../mixins/metric_verifier'
+require_relative '../mixins/snapshot_verifier'
+
+module RubyAemAws
+  module Component
+    # Interface to the AWS instance running the Preview PublishDispatcher component of a full-set AEM stack.
+    class PreviewPublishDispatcher
+      attr_reader :descriptor, :ec2_resource, :asg_client, :elb_client, :cloud_watch_client, :cloud_watch_log_client
+
+      include AbstractGroupedComponent
+      include AbstractSnapshot
+      include HealthyResourceVerifier
+      include MetricVerifier
+      include SnapshotVerifier
+
+      EC2_COMPONENT = 'preview-publish-dispatcher'.freeze
+      EC2_NAME = 'AEM Preview Publish Dispatcher'.freeze
+      ELB_ID = 'PreviewPublishDispatcherLoadBalancer'.freeze
+      ELB_NAME = 'AEM Preview Publish Dispatcher Load Balancer'.freeze
+
+      # @param stack_prefix AWS tag: StackPrefix
+      # @param params Array of AWS Clients and Resource connections:
+      # - AutoScalingClient: AWS AutoScalingGroup Client.
+      # - CloudWatchClient: AWS Cloudwatch Client.
+      # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+      # - Ec2Resource: AWS EC2 Resource connection.
+      # - ElbClient: AWS ElasticLoadBalancer v2 Client.
+      # @return new RubyAemAws::FullSet::PreviewPublishDispatcher
+      def initialize(stack_prefix, params)
+        @descriptor = ComponentDescriptor.new(stack_prefix,
+                                              EC2Descriptor.new(EC2_COMPONENT, EC2_NAME),
+                                              ELBDescriptor.new(ELB_ID, ELB_NAME))
+        @asg_client = params[:AutoScalingClient]
+        @cloud_watch_client = params[:CloudWatchClient]
+        @cloud_watch_log_client = params[:CloudWatchLogsClient]
+        @ec2_resource = params[:Ec2Resource]
+        @elb_client = params[:ElbClient]
+      end
+
+      def terminate_all_instances
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          i.terminate
+          i.wait_until_terminated
+        end
+      end
+
+      def terminate_random_instance
+        instance = get_random_instance
+        instance.terminate
+        instance.wait_until_terminated
+      end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
+    end
+  end
+end

data/lib/ruby_aem_aws/component/publish.rb

@@ -40,7 +40,7 @@ module RubyAemAws
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
       # - Ec2Resource: AWS EC2 Resource connection.
-      # @return new RubyAemAws::FullSet::AuthorPrimary
+      # @return new RubyAemAws::FullSet::Publish
       def initialize(stack_prefix, params)
         @descriptor = ComponentDescriptor.new(stack_prefix,
                                               EC2Descriptor.new(EC2_COMPONENT, EC2_NAME))

data/lib/ruby_aem_aws/mixins/instance_describer.rb

@@ -28,7 +28,7 @@ module RubyAemAws
     end
 
     def describe_instance(instance)
-      "#{instance.instance_id} (#{instance.state.name})"
+      "#{instance.instance_id} (#{instance.state.name} #{instance.state.code})"
     end
   end
 end

data/lib/ruby_aem_aws/mixins/metric_verifier.rb

@@ -139,7 +139,6 @@ module RubyAemAws
       dimension_filter = dimensions_filter_for_cloudwatch_metric(dimension_values)
 
       response = get_metrics(namespace, metric_name, dimension_filter)
-
       return true unless response.metrics.empty?
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -223,6 +223,8 @@ files:
 - lib/ruby_aem_aws/component/chaos_monkey.rb
 - lib/ruby_aem_aws/component/component_descriptor.rb
 - lib/ruby_aem_aws/component/orchestrator.rb
+- lib/ruby_aem_aws/component/preview_publish.rb
+- lib/ruby_aem_aws/component/preview_publish_dispatcher.rb
 - lib/ruby_aem_aws/component/publish.rb
 - lib/ruby_aem_aws/component/publish_dispatcher.rb
 - lib/ruby_aem_aws/component/stack_manager_resources.rb