kyklos 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f870d6a2b3a6d353b324b572bcd4c22e708eb711
-  data.tar.gz: 453611e97f7d6dc3c03b33ee1813c3677088d782
+  metadata.gz: 6478471f4b5f7051d22bc6d9df6eb3ae7c060906
+  data.tar.gz: b4a301e84bae1b06d792be5e3f35e04ebcc2d1a9
 SHA512:
-  metadata.gz: 319d5f62e36281a8697b43b3bd7e3d77c069a68f5c56d910bd370ee261fb0f1c7bcc6d23eceec5dd554761b6a28ed1909695c7f37694326d00294c4646773ee7
-  data.tar.gz: ba617a19340a3ced8079ddfe63f11647d4f432026d5732fabc3d793100e284647429f8fad9a236821c7084b8b1056b8c17c5bceedb2ece359402b44cde89b424
+  metadata.gz: cf037f71290ec2e74a16245ce498284ee93b4e55f6142511bc96d7ba3fdae11d49315fa4c526c378105a6a21786ab131c32b32d2aac9b8972d96a1f66104a099
+  data.tar.gz: a56a652c1960dd4f910fccbd961d97c9e14f3b33267949fcb625bd8330bf080c5d5b54b1a0a1dca44aa9fb0ec53f0221a9499c4edee713c7311745724c652ad5

data/lib/kyklos/adapters/base_adapter.rb

@@ -8,12 +8,12 @@ module Kyklos
 
       end
 
-      def assign_cloudwatchevents(job_id:, rule:)
+      def assign_cloudwatchevents(job_id:, rule_name_prefix:,rule:)
         raise NotImplementedError
       end
 
-      def unassign_cloudwatchevents(rule:)
-        raise NotImplementedError
+      def unassign_cloudwatchevents(rule:, rule_name_prefix:)
+        # no op
       end
 
     end

data/lib/kyklos/adapters/shoryuken_adapter.rb

@@ -31,8 +31,8 @@ module Kyklos
         @queue_url = args[0]
       end
 
-      def assign_cloudwatchevents(job_id:, rule:)
-        assign_queue_policy(job_id, rule.arn)
+      def assign_cloudwatchevents(job_id:, rule_name_prefix:, rule:)
+        assign_queue_policy(job_id, rule_name_prefix, rule.arn)
         [
             {
                 id: target_id(job_id),
@@ -44,10 +44,6 @@ module Kyklos
         ]
       end
 
-      def unassign_cloudwatchevents(rule:)
-        unassign_queue_policy(rule.arn)
-      end
-
       private
 
         def target_id(job_id)
@@ -62,10 +58,10 @@ module Kyklos
           resp.attributes['QueueArn']
         end
 
-        def assign_queue_policy(job_id, rule_arn)
+        def assign_queue_policy(job_id, rule_name_prefix, rule_arn)
           policy = get_queue_policy
           new_statement = {
-              'Sid' => job_id.to_s,
+              'Sid' => rule_name_prefix.to_s,
               'Effect' => 'Allow',
               'Principal' => {
                   "AWS" => '*'
@@ -73,8 +69,8 @@ module Kyklos
               'Action' =>  'sqs:SendMessage',
               'Resource' => target_arn,
               'Condition' => {
-                  'ArnEquals' => {
-                      'aws:SourceArn' => rule_arn
+                  'ArnLike' => {
+                      'aws:SourceArn' => rule_arn_like(rule_name_prefix, rule_arn)
                   }
               }
           }
@@ -115,32 +111,8 @@ module Kyklos
           statements
         end
 
-        def unassign_queue_policy(rule_arn)
-          policy = get_queue_policy
-          policy['Statement'] = policy['Statement'].reject do |statement|
-            statement['Effect'] == 'Allow' &&
-                statement['Action'] == 'sqs:SendMessage' &&
-                statement['Resource'] == target_arn &&
-                statement['Condition'] &&
-                statement['Condition']['ArnEquals'] &&
-                statement['Condition']['ArnEquals']['aws:SourceArn'] == rule_arn
-          end
-
-          if policy['Statement'].empty?
-            sqs.set_queue_attributes(
-                queue_url: queue_url,
-                attributes: {
-                    'Policy' =>  '',
-                },
-            )
-          else
-            sqs.set_queue_attributes(
-                queue_url: queue_url,
-                attributes: {
-                    'Policy' =>  policy.to_json,
-                },
-            )
-          end
+        def rule_arn_like(rule_name_prefix, rule_arn)
+          [rule_arn.split(rule_name_prefix).first, rule_name_prefix, '*'].join
         end
 
         def sqs

data/lib/kyklos/cli.rb

@@ -55,6 +55,7 @@ module Kyklos
         rule = cloudwatchevents.describe_rule(name: rule_params[:name])
         targets = adapter.assign_cloudwatchevents(
             job_id: job_id,
+            rule_name_prefix: rule_name_prefix,
             rule: rule)
         cloudwatchevents.put_targets(
             rule: rule.name,
@@ -64,7 +65,7 @@ module Kyklos
       end
 
       def remove_job(rule)
-        adapter.unassign_cloudwatchevents(rule: rule)
+        adapter.unassign_cloudwatchevents(rule_name_prefix: rule_name_prefix, rule: rule)
 
         target_ids = find_targets(rule.name).map(&:id)
         unless target_ids.empty?
@@ -73,12 +74,12 @@ module Kyklos
         cloudwatchevents.delete_rule(name: rule.name)
       end
 
-      def prefix
+      def rule_name_prefix
         "kyslos-#{"#{@identifier}/#{Digest::MD5.hexdigest(@identifier)}".sum}-"
       end
 
       def eventname(job_id)
-        "#{prefix}#{Digest::MD5.hexdigest(job_id.to_s)}"
+        "#{rule_name_prefix}#{Digest::MD5.hexdigest(job_id.to_s)}"
       end
 
       def eventnames
@@ -93,7 +94,7 @@ module Kyklos
       def find_rules
         list_rules = ->(next_token) do
           resp = cloudwatchevents.
-              list_rules(name_prefix: prefix,
+              list_rules(name_prefix: rule_name_prefix,
                          next_token: next_token)
           if resp.next_token
             resp.rules + list_rules.call(next_token)

data/lib/kyklos/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kyklos
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kyklos
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yuichi Takeuchi