simnos 0.1.2 → 0.1.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73fc966ae4921824425776121a1e1ebd4d37565a
-  data.tar.gz: 96ecfd4f27f3623f298146756bf12a96feadd0f1
+SHA256:
+  metadata.gz: 0f059e245208fe4b7cf670b9e439c551fb5f7474942f1018b6af99a45404a977
+  data.tar.gz: ae316c74adc659d468743006c5f801a48989ac8e1ed3804a9e4f021728baab0a
 SHA512:
-  metadata.gz: d07e4938a546a9f96f0fc6676dcb8b5eafd39484a90875507039c5f2878f5f739107eefc8c1db1cc353dfaf88eb3ac2c4acd733e7cb54113d4cf1e03bb5fc679
-  data.tar.gz: c218d9d6faf53d223188d23e048a84024f52edcc0a977cef0aa0ee40f65043645fd52dda7243905d06b43d4e1a2a1499f92f3e288f225b163353ba7446e82e72
+  metadata.gz: cfad7d4cde421b3834ba41fb5af57eeddd1d77732c085089a6472d125bff718e24622380d7ed5336b7abadd4b0c8e6a64c1e6c6e273241f3a0a787a8e4c365b8
+  data.tar.gz: 062f8f935d05fb2ed4eb1a2ee7004422d32874bf5b2844de33150b7e7f62c761c18d6403184a4e733ad9d8046b898367cf6cc34fb95e774144a0076042e21b41

data/README.md

@@ -54,6 +54,10 @@ Usage: simnos [options]
                                      use secret value expansion
     -i, --include-names NAMES        include SNS names
     -x, --exclude-names NAMES        exclude SNS names by regex
+        --include-endpoints NAMES
+                                     include SNS subscriptions by endpoint
+        --exclude-endpoints NAMES
+                                     exclude SNS subscriptions by endpoint
 ```
 
 ## SNSfile

data/lib/simnos/cli.rb

@@ -16,6 +16,8 @@ module Simnos
         color: true,
         includes: [],
         excludes: [],
+        include_endpoints: [],
+        exclude_endpoints: [],
       }
       parser.order!(@argv)
     end
@@ -53,6 +55,12 @@ module Simnos
             name =~ /\A\/(.*)\/\z/ ? Regexp.new($1) : Regexp.new("\A#{Regexp.escape(name)}\z")
           end
         end
+        opts.on('', '--include-endpoints NAMES', 'include SNS subscriptions by endpoint', Array) { |v| @options[:include_endpoints] = v }
+        opts.on('', '--exclude-endpoints NAMES', 'exclude SNS subscriptions by endpoint', Array) do |v|
+          @options[:exclude_endpoints] = v.map! do |name|
+            name =~ /\A\/(.*)\/\z/ ? Regexp.new($1) : Regexp.new("\A#{Regexp.escape(name)}\z")
+          end
+        end
       end
     end
 

data/lib/simnos/client.rb

@@ -73,6 +73,23 @@ module Simnos
 
     private
 
+    def target_subscription?(endpoint)
+      unless @options[:include_endpoints].empty?
+        unless @options[:include_endpoints].include?(endpoint)
+          Simnos.logger.debug("skip subscription(with include-endpoints option) #{endpoint}")
+          return false
+        end
+      end
+
+      unless @options[:exclude_endpoints].empty?
+        if @options[:exclude_endpoints].any? { |regex| endpoint =~ regex }
+          Simnos.logger.debug("skip subscription(with exclude-endpoints option) #{endpoint}")
+          return false
+        end
+      end
+      true
+    end
+
     def delete_subscriptions(aws_topic, aws_sub_by_key)
       aws_sub_by_key.each do |key, aws_sub|
         Simnos.logger.info("Delete Topic(#{aws_topic[:topic].topic_arn.split(':').last}) Subscription. protocol: #{key[0].inspect}, endpoint: #{key[1].inspect}.#{@options[:dry_run] ? ' [dry-run]' : ''}".colorize(:red))
@@ -87,8 +104,14 @@ module Simnos
     end
 
     def traverse_subscriptions(aws_topic, dsl_subscriptions, aws_subscriptions)
-      dsl_sub_by_key = dsl_subscriptions.each_with_object({}) { |dsl_sub, h| h[[dsl_sub.protocol, dsl_sub.masked_endpoint]] = dsl_sub }
-      aws_sub_by_key = aws_subscriptions.each_with_object({}) { |aws_sub, h| h[[aws_sub.protocol, aws_sub.endpoint]] = aws_sub }
+      dsl_sub_by_key = dsl_subscriptions.each_with_object({}) do |dsl_sub, h|
+        next unless target_subscription?(dsl_sub.endpoint)
+        h[[dsl_sub.protocol, dsl_sub.masked_endpoint]] = dsl_sub
+      end
+      aws_sub_by_key = aws_subscriptions.each_with_object({}) do |aws_sub, h|
+        next unless target_subscription?(aws_sub.endpoint)
+        h[[aws_sub.protocol, aws_sub.endpoint]] = aws_sub
+      end
 
       if @options[:recreate_subscriptions]
         Simnos.logger.info("Subscription recreation flag is on.#{@options[:dry_run] ? ' [dry-run]' : ''}")

data/lib/simnos/version.rb

@@ -1,3 +1,3 @@
 module Simnos
-  VERSION = "0.1.2"
+  VERSION = "0.1.3.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simnos
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.beta1
 platform: ruby
 authors:
 - wata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -186,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Codenize AWS SNS