banacle 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3fc2e3711e8ef218a8015c9946bb866dae0e6719ddd3ea0364ed2151bb492d2
-  data.tar.gz: 030b0b31f9fc0ccc1b2ef5027b495115210284dcb41417e6823e86c4fd3cffd6
+  metadata.gz: 45572c635e126a7ca610c10387909814e748ef1eebd99c825790bd873039dfb2
+  data.tar.gz: 6092ccd18529bb92d30a931237429f39ea30cec076d93d0eb3b19f41ba8b9af0
 SHA512:
-  metadata.gz: c7d7a9067e6ab5782a46ff10c2dbe216ef58c96a1f004c58fa90f32e80455c837578750e47eda7e552a5a51ad7d1fb6b6b15c67dc9d630ce859dfcb40af9c3f4
-  data.tar.gz: de1b1f7199d4ec2b138128848eb17bba4bffdfeddefcc9979ae1df2401f2a62259fc99a1e05f54b6ed104fa9f82816b0a01cb1207f5a24924776b011776ccb95
+  metadata.gz: '09f7b8c15074e7885f94e00b4f8ba3cbee41aaa21b9ca170b10d15a164b1d1367a1b95fcacc17ea1031d3b0fd3f9278416dffa821cb9722566905ea7e016ff6d'
+  data.tar.gz: 593b016ba1a5d3c560aa12e3f4543dc75639a5e4063f03da51052100d156d86f69f7db2d79253fd9ea18f89747ecd518a55d8e5cf10d693cd4a17bc2505bb455

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    banacle (0.2.2)
+    banacle (0.2.3)
       aws-sdk-ec2
       sinatra
       unicorn
@@ -10,13 +10,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.1)
-    aws-partitions (1.127.0)
-    aws-sdk-core (3.44.1)
+    aws-partitions (1.131.0)
+    aws-sdk-core (3.45.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.65.0)
+    aws-sdk-ec2 (1.66.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)

data/README.md

@@ -27,13 +27,15 @@ Banacle is supposed to be run as a Sinatra server. You can run it simply by `rac
 - `/slack/command`: handle Slash Command
 - `/slack/message`: handle Interactive Message
 
+By default, the format of Slack Slash Command is: `/[cmd] [create or delete] [region] [vpc_id or vpc_name] [cidr_blocks]`
+
 ### Customize authentication
 You can customize Banacle by using request handler modules.
 See example directory which implements a customized authentication feature for details.
 
 ## Example: ban 1.2.3.4 from my VPC
 
-Execute an command that create a DENY NACL entry for 1.2.3.4 on a VPC named "test" in ap-northeast-1.
+Execute a command that create a DENY NACL entry for 1.2.3.4 on a VPC named "test" in ap-northeast-1.
 
 ![](./docs/demo1.png)
 

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    banacle (0.2.2)
+    banacle (0.2.3)
       aws-sdk-ec2
       sinatra
       unicorn
@@ -10,13 +10,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.1)
-    aws-partitions (1.127.0)
-    aws-sdk-core (3.44.1)
+    aws-partitions (1.131.0)
+    aws-sdk-core (3.45.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.65.0)
+    aws-sdk-ec2 (1.66.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)

data/lib/banacle/aws_wrapper/nacl.rb

@@ -1,6 +1,5 @@
 require 'aws-sdk-ec2'
 require 'banacle/aws_wrapper/error'
-require 'banacle/aws_wrapper/result'
 
 module Banacle
   module AwsWrapper
@@ -8,6 +7,8 @@ module Banacle
       class EntryDuplicatedError < AwsWrapper::Error; end
       class EntryNotFoundError < AwsWrapper::Error; end
 
+      Result = Struct.new(:cidr_block, :status, :error, :rule_number, keyword_init: true) do; end
+
       DEFAULT_RULE_NUMBER = 100
 
       def self.create_network_acl_ingress_entries(region:, vpc_id:, cidr_blocks:)
@@ -30,26 +31,24 @@ module Banacle
 
       def create_network_acl_ingress_entries
         cidr_blocks.map do |cidr_block|
-          result = begin
-                     create_network_acl_ingress_entry(cidr_block)
-                     AwsWrapper::Result.new(status: true)
-                   rescue AwsWrapper::Error => e
-                     AwsWrapper::Result.new(status: false, error: e)
-                   end
-          [cidr_block, result]
-        end.to_h
+          begin
+            rule_number = create_network_acl_ingress_entry(cidr_block)
+            Result.new(cidr_block: cidr_block, status: true, rule_number: rule_number)
+          rescue AwsWrapper::Error => e
+            Result.new(cidr_block: cidr_block, status: false, error: e)
+          end
+        end
       end
 
       def delete_network_acl_entries
         cidr_blocks.map do |cidr_block|
-          result = begin
-                     delete_network_acl_entry(cidr_block)
-                     AwsWrapper::Result.new(status: true)
-                   rescue AwsWrapper::Error => e
-                     AwsWrapper::Result.new(status: false, error: e)
-                   end
-          [cidr_block, result]
-        end.to_h
+          begin
+            rule_number = delete_network_acl_entry(cidr_block)
+            Result.new(cidr_block: cidr_block, status: true, rule_number: rule_number)
+          rescue AwsWrapper::Error => e
+            Result.new(cidr_block: cidr_block, status: false, error: e)
+          end
+        end
       end
 
       private
@@ -95,6 +94,8 @@ module Banacle
         else
           raise EntryNotFoundError.new("not found")
         end
+
+        target.rule_number
       end
 
       def add_rule_number(num)

data/lib/banacle/aws_wrapper/vpc.rb

@@ -1,6 +1,5 @@
 require 'aws-sdk-ec2'
 require 'banacle/aws_wrapper/error'
-require 'banacle/aws_wrapper/result'
 
 module Banacle
   module AwsWrapper

data/lib/banacle/interactive_message/handler.rb

@@ -22,13 +22,16 @@ module Banacle
 
         self.request = Request.new(raw_request)
 
-        if request.action.approved?
-          handle_approval
-        elsif request.action.rejected?
-          handle_reject
-        elsif request.action.cancelled?
-          handle_cancellation
-        end
+        json = if request.action.approved?
+                 handle_approval
+               elsif request.action.rejected?
+                 handle_reject
+               elsif request.action.cancelled?
+                 handle_cancellation
+               end
+        puts json
+
+        json
       end
 
       private

data/lib/banacle/slash_command/command.rb

@@ -61,10 +61,10 @@ module Banacle
       end
 
       def format_results(results)
-        results.map do |cidr_block, result|
-          t = "#{action} DENY #{cidr_block} => "
+        results.map do |result|
+          t = "#{action} DENY #{result.cidr_block} => "
           if result.status
-            t += "succeeded"
+            t += "succeeded (rule number: #{result.rule_number})"
           else
             t += "error: #{result.error}"
           end

data/lib/banacle/slash_command/handler.rb

@@ -28,7 +28,10 @@ module Banacle
           return Renderer.render_error(e)
         end
 
-        Renderer.new(request, command, config).render_approval_request
+        json = Renderer.new(request, command, config).render_approval_request
+        puts json
+
+        json
       end
 
       private

data/lib/banacle/slash_command/parser.rb

@@ -15,6 +15,11 @@ module Banacle
       #
       def parse(text)
         elems = text.split(" ")
+
+        if elems.size > 4
+          raise ParseError.new("too many arguments")
+        end
+
         action, region, vpc_id_or_name, cidr_blocks_str = elems
 
         unless action

data/lib/banacle/version.rb

@@ -1,3 +1,3 @@
 module Banacle
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banacle
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Takuya Kosugiyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,6 @@ files:
 - lib/banacle/app.rb
 - lib/banacle/aws_wrapper/error.rb
 - lib/banacle/aws_wrapper/nacl.rb
-- lib/banacle/aws_wrapper/result.rb
 - lib/banacle/aws_wrapper/vpc.rb
 - lib/banacle/config.rb
 - lib/banacle/interactive_message/authenticator.rb

data/lib/banacle/aws_wrapper/result.rb

@@ -1,6 +0,0 @@
-module Banacle
-  module AwsWrapper
-    Result = Struct.new(:status, :error, keyword_init: true) do
-    end
-  end
-end