reyes 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI5ZGU3MDc0MDc1NWQ0ODUzYjNmZjc3MWI2Y2ZlZjdmZjE4YjY5Ng==
+    YjM4MDllMmJmMGJiZjZjZGZiMDIwYTAzMDc4YjViYzJmODA2YWVmZQ==
   data.tar.gz: !binary |-
-    NzUxNTdlN2MwNTlmYWE4MGI5M2I1YjcyMzQxOWY1ZjhjYjY2ZTNiMg==
+    MDZjZTU2MjIxZTZhY2FmMTc1ODU4YjkyNzEyYWNmOTIwYzU5Yjk0NA==
 SHA512:
   metadata.gz: !binary |-
-    N2ViZDI2MjA0YjhjNWNiOWFkNGQzNmQwYzE2ZDQxYWUxNzI4NTI5NTUyNTQ2
-    MTQxYjBkZTk5NWJiOTQ2MjZmZGEzODViODk0N2UwZGY2YmZmZmE1NzdhMGVm
-    Njg0MTg4MmE2MjBhMWJhZTcwYTcwNzhiYjNlNTQ1ZGM0MTQwM2Y=
+    NTNlNDgyMjg3Mzg0NzdiYjRmY2QxYTRlNGZkMDhmNzA3NDQyZTg2MWMzN2Ez
+    YmJkNmQ4NmZlNGY5NWJjOGQ5MjYxNzkzMGJhZTk1MjQzOTUzYjQyN2YwYjM2
+    ZWVkMmRlNmY0MWY3NTc4OWRjZjBiNzI0NTQ1OGJiY2RjNDdmMWY=
   data.tar.gz: !binary |-
-    YmJjYzVkNDEwOGJiYThhNTg3N2VhMmUzNTdlZDBjY2U1ZjRiZjNhMTA2ZWVi
-    YzkyY2Y1ZjgyYzM4NDYyOGYwZjUwMjAwOWEwNzIxYWJmNTg3NDI0ZWUxMzli
-    ZjRmODI5NGYwZjcxMWE5NjgzM2ZjYmQ0N2Y0NjRmNGE3MzYyZTU=
+    NTZlNTU4MGRmZDExNWUwNWEwZDQ2NmE3MDNjMWJjOGU2N2U5MzdkZDhiNjBj
+    YjBlNzlhNDJiZjUzMDAwZWJiNzIxMmY2NjFjZTkxYjcyNWQ3NmYxNjE5MjQ4
+    YTMwODEyMjY5YjYyMWRiMmE2NTk3MWZjMGY2Y2E4N2RmYjljMGE=

data/bin/reyes

@@ -64,6 +64,11 @@ Options:
       options[:instance_id] = id
     end
 
+    # TODO: known bug: --dry-run does not prevent run generation increment
+    opts.on('-n', '--dry-run', 'Print diff without making changes') do
+      options[:run_options][:dry_run] = true
+    end
+
     opts.on('-i', '--interactive', 'Interactively confirm changes') do
       options[:run_options][:interactive] = true
     end

data/lib/reyes/aws_manager.rb

@@ -93,11 +93,15 @@ module Reyes
       sg.vpc.instances.find_all {|i| i.security_groups.include?(sg)}
     end
 
-    # TODO: remove (probably not needed)
     def warm_sg_cache
-      connections.fetch(:ec2).each_pair do |region, ec2|
-        log.debug("Warming security group cache for #{region}")
-        ec2.security_groups.to_a
+      unless AWS.memoizing?
+        log.warn("Calling warm_sg_cache doesn't make sense unless memoizing")
+      end
+      log.info("Warming security group caches")
+      vpcs.each do |vpc|
+        log.debug("Warming security group cache for #{vpc.id}")
+        sg = vpc.security_groups.to_a.first
+        instances_in_security_group(sg)
       end
     end
 

data/lib/reyes/group_manager.rb

@@ -25,6 +25,7 @@ module Reyes
 
     def initialize(aws, region, instance_id, config_file=nil, generation=nil)
       log.info("Initializing #{self.class.name} for #{region} #{instance_id}")
+      log.info("This is reyes #{Reyes::VERSION}")
 
       @aws = aws
       @generation = generation || RunGeneration.new
@@ -59,6 +60,8 @@ module Reyes
       run_generation_increment!
       log.info("Generating rules for generation #{run_generation}")
 
+      @aws.warm_sg_cache
+
       data = generate_rules_empty
 
       needed_groups = {}

data/lib/reyes/run_manager.rb

@@ -8,6 +8,7 @@ module Reyes
 
     # @param [Hash] options
     #
+    # @option options :dry_run [Boolean] (false) Don't actually apply changes
     # @option options :empty [Boolean] (false) Generate an empty (default DROP)
     #   rule sets without actually looking up security groups
     # @option options :interactive [Boolean] (false) Whether to prompt for
@@ -17,6 +18,7 @@ module Reyes
     #
     def run!(options={})
       options = {
+        dry_run: false,
         empty: false,
         interactive: false,
         log_accept: false,
@@ -39,6 +41,11 @@ module Reyes
       show_iptables_diff(new_rules)
       show_ipsets_diff(new_ipsets)
 
+      if options.fetch(:dry_run)
+        log.info('Dry run! Not applying changes')
+        return
+      end
+
       if options.fetch(:interactive)
         puts 'Press enter to continue...'
         STDIN.gets

data/lib/reyes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reyes
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andy Brody