reyes 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzI1ODY1ZTdjODAxYTlmNGEzZTZmZmQ4ZjJkYzhmZmM5MjYxMDgwYQ==
+    MTNjMTNjOGU3ZmM0YTBhMWNhNjE1YTYxNjY5ODczYmJiNDRlZTc5YQ==
   data.tar.gz: !binary |-
-    MWE1MDBkZWM2MjcwZTJiNWNmNDY3MTQwNjg0YTAzYmY1MDQwZThjMQ==
+    MjdlNzBkMDBlY2I1MTkyZTJiNGY0ODBkOTI0MzVmZDNlNDkwM2I2Ng==
 SHA512:
   metadata.gz: !binary |-
-    OTVmZDk5MjQzYzM1MmNkYmYyNTM2MjhmNDJlZTBlZmY3MWE0ZDViZTU1Yzk0
-    OWI5ZjYzMGQyMzNmY2E0OTY1MWY0ZDM0NWY1MDE5ZGY3MDExMGUzYTQyYTNl
-    MzNiZDg5NTY2ZTIxYjcxYTY0YWJkZWExNWViMGUzNjU5OGZmMzc=
+    MzI2MjVhMDFiMjBmZDZjYzFkMTVkMjMzZmZhMTU3NjE0NWMxNDU3OTY5N2U1
+    Y2E0YmFhY2E1ZDRlZmMzNTM3Yjk3NGIwNDFkZTk0MGZhZWYwNDgzOTlmZjc2
+    MWNmMjc2ZjBjNjJhNDA3YWQwYjdkYjM3NTBjNDhmNzNmZDM3N2E=
   data.tar.gz: !binary |-
-    MDY0MmEwNmZmYTk5MWU2Y2M5ODUwYWZkMmJkYTcwZTdjY2JkZDQwMDg2NmZm
-    OWRjZDA3YWIzYTdjODRiZmFmNmI3MjBiZDI0Y2Y0N2NlZjBkNGNmZjQzZjcx
-    OWI3MTZkMzg2ZWJlNWY3NGI0OTExZjE5MmEzNWEyMmYzN2MxZDc=
+    ZTU5MTM0ODAwNDM5ZjkzNThhOWU1YzMxNTg0NDNmYzc5MzkzMjdmM2Y5YzFi
+    ZjJlZjFkYTMwNzFiMWJmZDhiYmU2ODAwMzRmMGJlMTE3Y2UxY2ExNmUyYWQ3
+    ZmNlZTUyZDVlMTM2ZTM0YzNiMDJkMDc2ODBmZTNkYmVkMTc4NzU=

data/bin/reyes

@@ -15,6 +15,11 @@ end
 def command_install(options)
   instance_id = options.fetch(:instance_id)
   region = options.fetch(:region)
+
+  if options[:splay]
+    Reyes::Utils.sleep_random(options[:splay])
+  end
+
   AWS.memoize do
     g = Reyes::GroupManager.new(region, instance_id, options[:config])
 
@@ -75,6 +80,10 @@ Options:
       options[:run_options][:empty] = true
     end
 
+    opts.on('--splay SECS', 'Delay up to SECS before execution') do |arg|
+      options[:splay] = Integer(arg)
+    end
+
     opts.on('-h', '--help', 'Display this help message') do
       STDERR.puts opts
       exit 0

data/lib/reyes/aws_manager.rb

@@ -110,6 +110,11 @@ module Reyes
         logger: Chalk::Log::Logger.new("#{klass.name}<#{region}>"),
       }
 
+      begin
+        opts[:session_token] = @config.aws_credentials.fetch(:session_token)
+      rescue KeyError
+      end
+
       klass.new(opts)
     end
   end

data/lib/reyes/diff.rb

@@ -0,0 +1,42 @@
+module Reyes
+  class Diff
+    def initialize
+      @old = Tempfile.new('old')
+      @new = Tempfile.new('new')
+    end
+
+    # Consumes the +Diff+, returning the full unified diff of @old and @new
+    # @return [String]
+    def diff
+      raise "Diff has already been created" unless @old && @new
+
+      [@old, @new].each do |f|
+        f.flush
+      end
+
+      Subprocess.call(["diff", '-u', @old.path, @new.path], :stdout => Subprocess::PIPE) do |c|
+        return c.communicate
+      end
+    ensure
+      @old.unlink
+      @old = nil
+      @new.unlink
+      @new = nil
+    end
+
+    # Returns a handle to the underlying File for old, allowing the caller to
+    # populate it's contents
+    # @return [File]
+    def old
+      @old
+    end
+
+    # Returns a handle to the underlying File for new, allowing the caller to
+    # populate it's contents
+    # @return [File]
+    def new
+      @new
+    end
+
+  end
+end

data/lib/reyes/group_manager.rb

@@ -82,13 +82,13 @@ module Reyes
       log.info('Finished firewall configuration run')
     end
 
-    # TODO: actually do some kind of diff or logging here?
     def show_iptables_diff(new_rules)
-      log.info("Old rules:")
-      Subprocess.check_call(%w{iptables-save})
+      diff = Diff.new
+      diff.old.puts(Subprocess.check_output(%w{iptables-save}))
+      diff.new.puts(new_rules)
 
-      log.info("New rules:")
-      puts new_rules
+      log.info "Proposed IPTables diff:"
+      puts diff.diff
     end
 
     def iptables_restore(new_rules)
@@ -189,7 +189,22 @@ module Reyes
     end
 
     def show_ipsets_diff(new_ipsets)
-      # TODO(richo)
+      diff = Diff.new
+
+      dump = lambda do |f, ipset|
+        ipset.sort_by(&:name).each do |ip|
+          f.puts(ip.name)
+          ip.members.sort.each do |m|
+            f.puts("\t#{m}")
+          end
+        end
+      end
+
+      dump.call(diff.old, Reyes::IPSet.load_all)
+      dump.call(diff.new, new_ipsets)
+
+      log.info "Proposed IPSets diff:"
+      puts diff.diff
     end
 
     def materialize_ipsets(new_ipsets)

data/lib/reyes/ipset.rb

@@ -1,7 +1,7 @@
 module Reyes
   class IPSetBuilder
     TYPE = "hash:ip"
-    attr_reader :name
+    attr_reader :name, :members
 
     # Constructor for ipsets, maintaining the invariant that once constructed,
     # ipsets will not be altered.

data/lib/reyes/utils.rb

@@ -0,0 +1,13 @@
+module Reyes; module Utils
+  include Chalk::Log
+
+  # Sleep a random number of seconds, at least zero and less than `max`.
+  #
+  # @param max [Numeric]
+  #
+  def self.sleep_random(max)
+    delay = Random.rand(max)
+    log.info("Sleeping #{delay} seconds -- chosen from [0, #{max})")
+    sleep(delay)
+  end
+end; end

data/lib/reyes/version.rb

@@ -1,3 +1,3 @@
 module Reyes
-  VERSION = '0.0.3' unless defined?(self::VERSION)
+  VERSION = '0.0.4' unless defined?(self::VERSION)
 end

data/lib/reyes.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'tempfile'
 require 'yaml'
 
 require 'chalk-log'
@@ -12,8 +13,10 @@ require_relative './reyes/errors'
 
 require_relative './reyes/aws_manager'
 require_relative './reyes/config'
+require_relative './reyes/diff'
 require_relative './reyes/group_manager'
 require_relative './reyes/group_tools'
 require_relative './reyes/ipset'
 require_relative './reyes/iptables'
 require_relative './reyes/run_generation'
+require_relative './reyes/utils'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reyes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Brody
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -115,12 +115,14 @@ files:
 - lib/reyes.rb
 - lib/reyes/aws_manager.rb
 - lib/reyes/config.rb
+- lib/reyes/diff.rb
 - lib/reyes/errors.rb
 - lib/reyes/group_manager.rb
 - lib/reyes/group_tools.rb
 - lib/reyes/ipset.rb
 - lib/reyes/iptables.rb
 - lib/reyes/run_generation.rb
+- lib/reyes/utils.rb
 - lib/reyes/version.rb
 - reyes.gemspec
 homepage: ''