circuitry 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d200bb856db00d87237c6425d03a31ab5953ac4962f7af81e9797b85f94ee921
-  data.tar.gz: 1bc9b5eac4c058f5f30ad035ae8f10dabf4921d0f3b35781a528856ba75459c0
+  metadata.gz: 97df62f8343b6567a34117f0689cd76347bfcc10df90bd4d16dc21b6b2a8725d
+  data.tar.gz: 1f0ad6c207c527eb49c2693afd40d8ca47c911ff8cec739e40d7299744e873a5
 SHA512:
-  metadata.gz: be4a3411b0e5a4535049dda1343e901a4abcb2ec81d2b76762dfe75460b1b5941031c0e50d5d3c1bca0b23700350497dfd40e5243b90e449b93ef36b76ab14d2
-  data.tar.gz: 245564d9b1d16e53b9086acc44446967705dcef54062f0747ae6b8cb50a601fb8822c3ef7444c09bb2e7355519667bb8c1cbfd45e16da29ea018f11d04cc7602
+  metadata.gz: e5414b437a23afe45f35ec2f9102a391af8e3f3e6bfec3b585a485891972ed84fe26822f530c0018af82d24da92034ec8c026b4b45295afa580b87b72a478741
+  data.tar.gz: 8331142f98db79ef0a72e72fc5075d783ca7b520dd678b0e4a5d6efaa8bfd5140fa603af4cb02c61402cf0d0e6995804936f9441faeb4ddfc484205d5e42bea2

data/.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/circuitry
     docker:
-      - image: kapost/ruby:2.4.3-node-6.11.5
+      - image: kapost/ruby:2.6.3-node-6.11.5
     steps:
       - checkout
       - run: bundle install

data/CHANGELOG.md

@@ -1,7 +1,18 @@
+## Circuitry 3.5.0 (Jan 27, 2023)
+
+* Changes the way SQL Policy statements are generated to avoid triggering an error when more a
+  queue subscribes to more than 20 SNS topics.
+
+## Circuitry 3.4.0 (Sep 16, 2020)
+
+* Adds an option for publisher and subscriber configs to override the AWS client options. *wahlg*
+  See: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SQS/Client.html
+  See: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SNS/Client.html
+
 ## Circuitry 3.3.0 (June 23, 2020)
 
 * Update AWS SDK to version 3 and use module sdk gems. *thogg4*
-  See https://github.com/aws/aws-sdk-ruby 
+  See https://github.com/aws/aws-sdk-ruby
   Version 3 is backwards compatible with version 2.
 * Catch `Aws::SNS::Errors::InvalidParameter` and rethrow with the topic
   and message that caused the problem for improved debugging.

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in circuitry.gemspec
 gemspec
 
-gem 'memcache_mock', '0.0.14', github: 'mhuggins/MemcacheMock', branch: 'expiry-and-add'
+gem 'memcache_mock', '0.0.14', git: 'https://github.com/mhuggins/MemcacheMock', branch: 'expiry-and-add'

data/README.md

@@ -150,6 +150,8 @@ Available configuration options for *both* subscriber and publisher applications
 * `middleware`: A chain of middleware that messages must go through when sent or received.
   Please refer to the [Middleware](#middleware) section for more details regarding this
   option.
+* `aws_options_overrides`: A key/value hash of option overrides and additions passed through to the
+   [`AWS::SQS::Client`](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SQS/Client.html)(for subscriber config) or [`AWS::SNS::Client`](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SNS/Client.html)(for publisher config)
 
 Available configuration options for subscriber applications include:
 

data/circuitry.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'virtus', '~> 1.0'
   spec.add_dependency 'thor'
 
-  spec.add_development_dependency 'bundler', '~> 1.8'
+  spec.add_development_dependency 'bundler', '~> 1.17.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'connection_pool'
   spec.add_development_dependency 'dalli'

data/lib/circuitry/config/shared_settings.rb

@@ -15,6 +15,7 @@ module Circuitry
         base.attribute :topic_names, Array[String], default: []
         base.attribute :on_async_exit
         base.attribute :async_strategy, Symbol, default: ->(_page, _att) { :fork }
+        base.attribute :aws_options_overrides, Hash, default: {}
       end
 
       def middleware
@@ -27,7 +28,8 @@ module Circuitry
         {
           access_key_id:     access_key,
           secret_access_key: secret_key,
-          region:            region
+          region:            region,
+          **aws_options_overrides
         }
       end
 

data/lib/circuitry/provisioning/subscription_creator.rb

@@ -43,20 +43,20 @@ module Circuitry
           'Policy' => {
             'Version'   => '2012-10-17',
             'Id'        => "#{queue.arn}/SNSPolicy",
-            'Statement' => topics.map { |t| build_policy_statement(t) }
+            'Statement' => [build_policy_statement]
           }.to_json
         }
       end
 
-      def build_policy_statement(topic)
+      def build_policy_statement
         {
-          'Sid'       => "Sid#{topic.name}",
+          'Sid'       => "Sid-#{queue.name}-subscriptions",
           'Effect'    => 'Allow',
           'Principal' => { 'AWS' => '*' },
           'Action'    => 'SQS:SendMessage',
           'Resource'  => queue.arn,
           'Condition' => {
-            'ArnEquals' => { 'aws:SourceArn' => topic.arn }
+            'ForAnyValue:ArnEquals' => { 'aws:SourceArn' => topics.map(&:arn) }
           }
         }
       end

data/lib/circuitry/version.rb

@@ -1,3 +1,3 @@
 module Circuitry
-  VERSION = '3.3.0'
+  VERSION = '3.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitry
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Matt Huggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement