ruby_aem_aws 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 143bcd08d3dcf1d4bf7955a43031c7734b5048c9
-  data.tar.gz: 7b61a8d54896d4021158fd9ce0dce4c50bb05264
+  metadata.gz: ae2d23eb45fce95d159684a8b556feb24c638046
+  data.tar.gz: c127bec2c5002dcb157577c9f70ae16a6ace5d1c
 SHA512:
-  metadata.gz: 2a3c723d12b9cbb095f175b8503300e997ff980374355170fb51acb6d10101c298f271577f6ed4847954c4fe2b326ac3f61f9582e73d33c42ed1a288dcfabe70
-  data.tar.gz: 4d25ad2d48f49ad2cc1d87f2492f2d112d7c5625f385210eb770524f1a9130df0e20eb3331c914469a69fd5220e49374c6cf5af8d00a85c2afdfbda17fbe8f94
+  metadata.gz: 0cfee40d46a45d145c413ceab6811188210a6a1495bb277aa596d0497fd099f5440c4aebddbd461dc5fd2bab100d9ecd778726192beca13fd47f89332e4b7232
+  data.tar.gz: eaaadb2ebfd4f17e720cc4ad9578fc30b8247d8d2f95e44cb44d40f8524a8c5c3b744e2cc90a9a6d7b434ba46a8e029c197527ae3c1f2a0beda4b39f37a37431

data/conf/gem.yaml

@@ -1 +1 @@
-version: 1.4.0
+version: 1.5.0

data/lib/ruby_aem_aws.rb

@@ -20,18 +20,18 @@ module RubyAemAws
   # AemAws class represents the AWS stack for AEM.
   class AemAws
     # @param conf configuration hash of the following configuration values:
-    # - region: the AWS region (eg ap-southeast-2)
+    # - aws_region: the AWS region (eg ap-southeast-2)
     # - aws_access_key_id: the AWS access key
     # - aws_secret_access_key: the AWS secret access key
     # - aws_profile: AWS profile name
     # @return new RubyAemAws::AemAws instance
     def initialize(conf = {})
-      conf[:region] ||= Constants::REGION_DEFAULT
+      conf[:aws_region] ||= Constants::REGION_DEFAULT
       conf[:aws_access_key_id] ||= Constants::ACCESS_KEY_ID
       conf[:aws_secret_access_key] ||= Constants::SECRET_ACCESS_KEY
       conf[:aws_profile] ||= Constants::PROFILE
 
-      Aws.config.update(region: conf[:region])
+      Aws.config.update(region: conf[:aws_region])
 
       credentials = Aws::Credentials.new(conf[:aws_access_key_id], conf[:aws_secret_access_key]) unless conf[:aws_access_key_id].nil?
       credentials = Aws::SharedCredentials.new(profile_name: conf[:aws_profile]) unless conf[:aws_profile].nil?
@@ -58,11 +58,6 @@ module RubyAemAws
     # Create a consolidated instance.
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients Array of AWS Clients and Resource connections:
-    # - CloudFormationClient: AWS Cloudformation Client.
-    # - CloudWatchClient: AWS Cloudwatch Client.
-    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
-    # - Ec2Resource: AWS EC2 Resource connection.
     # @return new RubyAemAws::ConsolidatedStack instance
     def consolidated(stack_prefix)
       aws_clients = {
@@ -78,13 +73,6 @@ module RubyAemAws
     # Create a full set instance.
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients Array of AWS Clients and Resource connections:
-    # - AutoScalingClient: AWS AutoScalingGroup Client.
-    # - CloudFormationClient: AWS Cloudformation Client.
-    # - CloudWatchClient: AWS Cloudwatch Client.
-    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
-    # - Ec2Resource: AWS EC2 Resource connection.
-    # - ElbClient: AWS ElasticLoadBalancer Client.
     # @return new RubyAemAws::FullSetStack instance
     def full_set(stack_prefix)
       aws_clients = {
@@ -102,13 +90,6 @@ module RubyAemAws
     # Create Stack Manager resources
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients Array of AWS Clients and Resource connections:
-    # - CloudFormationClient: AWS Cloudformation Client.
-    # - CloudWatchClient: AWS Cloudwatch Client.
-    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
-    # - DynamoDBClient: AWS DynamoDB Client.
-    # - S3Client: AWS S3 Client.
-    # - S3Resource: AWS S3 Resource connection.
     # @return new RubyAemAws::StackManager instance
     def stack_manager(stack_prefix)
       aws_clients = {

data/lib/ruby_aem_aws/abstract/cloudwatch.rb

@@ -39,7 +39,7 @@ module RubyAemAws
       }
     end
 
-    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_group_name Cloudwatch loggroup name
     # @param log_stream_name Cloudwatch logstream name
     # @return Array of a Cloudwatch log stream filter to filter for a specific Cloudwatch log stream
     def filter_for_cloudwatch_log_stream(log_group_name, log_stream_name)
@@ -71,7 +71,7 @@ module RubyAemAws
     end
 
     # @param dimensions_name Cloudwatch Dimension name
-    # @param dimension_values Cloudwatch Dimension value
+    # @param dimensions_value Cloudwatch Dimension value
     # @return Array of a Cloudwatch Dimension value filter for the Cloudwatch dimension filter
     def dimensions_value_filter_for_cloudwatch_metric(dimensions_name, dimensions_value)
       {

data/lib/ruby_aem_aws/abstract/component.rb

@@ -33,7 +33,6 @@ module RubyAemAws
         filters: [
           { name: 'tag:StackPrefix', values: [@descriptor.stack_prefix] },
           { name: 'tag:Component', values: [@descriptor.ec2.component] },
-          { name: 'tag:Name', values: [@descriptor.ec2.name] },
           { name: 'instance-state-name', values: ['running'] }
         ]
       }

data/lib/ruby_aem_aws/abstract/stackmanager.rb

@@ -35,7 +35,7 @@ module RubyAemAws
     end
 
     # @param dynamodb_tablename AWS DynamoDB table name
-    # @param attkey_attribute_valueribute_value Key value to query for
+    # @param key_attribute_value Key value to query for
     # @return Array of a DynamoDB filter to query for a specific value
     def filter_for_db_query(dynamodb_tablename, key_attribute_value)
       {

data/lib/ruby_aem_aws/architecture/consolidated_stack.rb

@@ -36,11 +36,6 @@ module RubyAemAws
       @stack_prefix = stack_prefix
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param consolidated_aws_clients Array of AWS Clients and Resource connections:
-    # - CloudWatchClient: AWS Cloudwatch Client.
-    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
-    # - Ec2Resource: AWS EC2 Resource connection.
     # @return new RubyAemAws::Component::AuthorPublishDispatcher instance
     def author_publish_dispatcher
       RubyAemAws::Component::AuthorPublishDispatcher.new(@stack_prefix, @consolidated_aws_clients)

data/lib/ruby_aem_aws/architecture/full_set_stack.rb

@@ -70,69 +70,31 @@ module RubyAemAws
       @stack_prefix = stack_prefix
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param dispatcher_aws_clients 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 Client.
     # @return new RubyAemAws::Component::AuthorDispatcher instance
     def author_dispatcher
       RubyAemAws::Component::AuthorDispatcher.new(@stack_prefix, @dispatcher_aws_clients)
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param author_aws_clients Array of AWS Clients and Resource connections:
-    # - CloudWatchClient: AWS Cloudwatch Client.
-    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
-    # - Ec2Resource: AWS EC2 Resource connection.
-    # - ElbClient: AWS ElasticLoadBalancer Client.
     # @return new RubyAemAws::Component::Author instance
     def author
       RubyAemAws::Component::Author.new(@stack_prefix, @author_aws_clients)
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param chaos_monkey_aws_clients 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::Component::ChaosMonkey instance
     def chaos_monkey
       RubyAemAws::Component::ChaosMonkey.new(@stack_prefix, @aem_java_aws_clients)
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param orchestrator_aws_clients 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::Component::Orchestrator instance
     def orchestrator
       RubyAemAws::Component::Orchestrator.new(@stack_prefix, @aem_java_aws_clients)
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param publish_aws_clients 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::Component::Publish instance
     def publish
       RubyAemAws::Component::Publish.new(@stack_prefix, @publish_aws_clients)
     end
 
-    # @param stack_prefix AWS tag: StackPrefix
-    # @param dispatcher_aws_clients 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 Client.
     # @return new RubyAemAws::Component::PublishDispatcher instance
     def publish_dispatcher
       RubyAemAws::Component::PublishDispatcher.new(@stack_prefix, @dispatcher_aws_clients)

data/lib/ruby_aem_aws/component/stack_manager_resources.rb

@@ -29,7 +29,6 @@ module RubyAemAws
       include SNSTopic
       include S3Access
 
-      # @param dynamodb_client AWS DynamoDB client connection
       # @param params Array of AWS Clients and Resource connections:
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.

data/lib/ruby_aem_aws/constants.rb

@@ -42,7 +42,7 @@ module RubyAemAws
   end
 
   class Constants
-    REGION_DEFAULT = 'ap-southeast-2'.freeze
+    REGION_DEFAULT = ENV['AWS_DEFAULT_REGION'] || ENV['aws_default_region'] || ENV['AWS_REGION'] || ENV['aws_region'] || 'ap-southeast-2'.freeze
     ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID'] || ENV['aws_access_key_id']
     SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY'] || ENV['aws_scret_access_key']
     PROFILE = ENV['AWS_PROFILE']

data/lib/ruby_aem_aws/error.rb

@@ -43,13 +43,6 @@ module RubyAemAws
 
   # Raise this when a component unexpectedly has more than one instance.
   class ExpectedSingleInstanceError < StandardError
-    # def initialize(count, descriptor)
-    #   message << 'Expected exactly one instance'
-    #   message << " but got #{count}" unless count.nil?
-    #   message << "for (#{descriptor.stack_prefix}, #{descriptor.ec2.component}, #{descriptor.ec2.name})" unless descriptor.nil?
-    #   super(message)
-    # end
-
     def initialize(msg = 'Expected exactly one instance')
       super
     end

data/lib/ruby_aem_aws/mixins/metric_verifier.rb

@@ -170,7 +170,7 @@ module RubyAemAws
       return true unless response.events.empty?
     end
 
-    # @param loggroup Cloudwatch loggroup name
+    # @param loggroup_name Cloudwatch loggroup name
     # @return True if Cloudwatch loggroup exists
     def loggroup?(loggroup_name)
       namespace = 'AWS/Logs'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk