wafoo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf968d2be7a9d1632c60d8cb49a0e8751a3d49f8d30685b9c3bc8414a84a5618
-  data.tar.gz: 6249335ba736504e93dd82f8effd9f4d9cd03b6aab9fbc58a4c97589ddc5034c
+  metadata.gz: 49f7095ed94805ed7e261fc2305c9552e9b5ca7167ea90924dc04ba7f0250d13
+  data.tar.gz: d39ed1552150147bb1eba7ab93825e3beaab2c03d69f04b30864b41942d996eb
 SHA512:
-  metadata.gz: a720d8b8b0e4bb647ff85a8c2dff26e92a6699239a8077b312186f8621608b586b7b1496570045216ad1ff93b3c16e68e49ed8b57bbe36cd27d18728f536bd1e
-  data.tar.gz: 596aba582b45439a3820aa0b01ad595102d6dbb568f42f349efe1acd0c4a476bea89881c4ee4a47e6144512e4d6f3e5ac00a837639a94931c44ef290ba449001
+  metadata.gz: c84ffd7747d4209bcb40ee2e2bea816af33fa1adb348644ef12bd13c8ed668bd082ec66cffe1ffa62e3e2fc06c3abd721cf6ea60deb495eb0c3265fd9038cf52
+  data.tar.gz: a3908921d50154899acb5b0b846ea2b2c9412e81944408343b3c5416cbc24f9a86974c1cd77bd413fe9eb050de3c63379500f23b49b5a4f20f5f22f69fe61df8

data/.rspec

@@ -0,0 +1 @@
+--format=documentation --color

data/lib/wafoo.rb

@@ -9,6 +9,7 @@ require 'wafoo/version'
 require 'wafoo/cli'
 require 'wafoo/ext'
 require 'wafoo/helper'
+require 'wafoo/stub'
 require 'wafoo/run'
 
 module Wafoo

data/lib/wafoo/run.rb

@@ -6,8 +6,13 @@ module Wafoo
     include Wafoo::Helper
   
     def initialize(options = nil)
-      @waf_regional = Aws::WAFRegional::Client.new
+      # Stub は個別にロードしてあげないといけないので苦肉の策
+      Wafoo::Stub.load('waf') if ENV['LOAD_STUB'] == 'true'
       @waf = Aws::WAF::Client.new
+      # Stub は個別にロードしてあげないといけないので苦肉の策
+      Wafoo::Stub.load('wafregional') if ENV['LOAD_STUB'] == 'true'
+      @waf_regional = Aws::WAFRegional::Client.new
+
       @regional = options[:regional] unless options.nil?
       FileUtils.mkdir_p(IP_SETS_DIR) unless FileTest.exist?(IP_SETS_DIR)
     end
@@ -37,23 +42,45 @@ module Wafoo
       ipsets.sort
     end
 
-    def list_ipsets
+    def get_waf_ipsets
+      ip_sets = []
+      params = {}
+      loop do
+        res = @waf.list_ip_sets(params)
+        res.ip_sets.each do |set|
+          ipset = []
+          ipset << @waf.class.to_s.split('::')[1]
+          ipset << set.ip_set_id
+          ipset << set.name
+          ip_sets << ipset
+        end
+        break if res.next_marker.nil?
+        params[:next_marker] = res.next_marker
+      end
+      ip_sets
+    end
+
+    def get_wafregional_ipsets
       ip_sets = []
       params = {}
-      [ @waf_regional, @waf ].each do |w|
-        loop do
-          res = w.list_ip_sets(params)
-          res.ip_sets.each do |set|
-            ipset = []
-            ipset << w.class.to_s.split('::')[1]
-            ipset << set.ip_set_id
-            ipset << set.name
-            ip_sets << ipset
-          end
-          break if res.next_marker.nil?
-          params[:next_marker] = res.next_marker
+      loop do
+        res = @waf_regional.list_ip_sets(params)
+        res.ip_sets.each do |set|
+          ipset = []
+          ipset << @waf_regional.class.to_s.split('::')[1]
+          ipset << set.ip_set_id
+          ipset << set.name
+          ip_sets << ipset
         end
+        break if res.next_marker.nil?
+        params[:next_marker] = res.next_marker
       end
+      ip_sets
+    end
+
+    def list_ipsets
+      ip_sets = []
+      ip_sets = get_waf_ipsets + get_wafregional_ipsets
       output_table(ip_sets)
     end
 

data/lib/wafoo/stub.rb

@@ -0,0 +1,7 @@
+module Wafoo
+  class Stub
+    def self.load(type)
+      require File.dirname(__FILE__) + '/stub/' + type
+    end
+  end
+end

data/lib/wafoo/stub/waf.rb

@@ -0,0 +1,21 @@
+Aws.config[:waf] = {
+  stub_responses: {
+    list_ip_sets: {
+      next_marker: nil,
+      ip_sets: [
+        {
+          ip_set_id: '1234567-abcd-1234-efgh-5678-1234567890',
+          name: 'waf-my-ip-set1'
+        },
+        {
+          ip_set_id: '2234567-abcd-1234-efgh-5678-1234567890',
+          name: 'waf-my-ip-set2'
+        },
+        {
+          ip_set_id: '3234567-abcd-1234-efgh-5678-1234567890',
+          name: 'waf-my-ip-set3'
+        }
+      ]
+    }
+  }
+}

data/lib/wafoo/stub/wafregional.rb

@@ -0,0 +1,21 @@
+Aws.config[:wafregional] = {
+  stub_responses: {
+    list_ip_sets: {
+      next_marker: nil,
+      ip_sets: [
+        {
+          ip_set_id: '1234567-abcd-1234-efgh-5678-1234567890',
+          name: 'regional-my-ip-set1'
+        },
+        {
+          ip_set_id: '2234567-abcd-1234-efgh-5678-1234567890',
+          name: 'regional-my-ip-set2'
+        },
+        {
+          ip_set_id: '3234567-abcd-1234-efgh-5678-1234567890',
+          name: 'regional-my-ip-set3'
+        }
+      ]
+    }
+  }
+}

data/lib/wafoo/version.rb

@@ -1,3 +1,3 @@
 module Wafoo
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wafoo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - inokappa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -173,6 +174,9 @@ files:
 - lib/wafoo/ext/string.rb
 - lib/wafoo/helper.rb
 - lib/wafoo/run.rb
+- lib/wafoo/stub.rb
+- lib/wafoo/stub/waf.rb
+- lib/wafoo/stub/wafregional.rb
 - lib/wafoo/version.rb
 - wafoo.gemspec
 homepage: https://github.com/inokappa/wafoo