reyes 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9225619362879c180db3a50563afd569ff3c71
-  data.tar.gz: 241984d8db909dc5e34b2444b1906abd88d48f06
+  metadata.gz: f48d3207db77de72b83707df856cefc4315a933b
+  data.tar.gz: 7b98e123a7877ac65a63123aaa34f64247636c3e
 SHA512:
-  metadata.gz: 7119c776a76ba54cd231c048b4ea06f18ba572538522d292bd1fd3d90f86019cc8bf38cd28c5fa7c196843faa257843ea251e0f204b4df223d98440f3778572d
-  data.tar.gz: aa90b05a80ce985576c6ea0ee81df8891bd17dd34a281129a4d543218ea4f839752701e6e7d143586163e13f1ae1fb06fa9488ec4d90bead254d944879f277ac
+  metadata.gz: a1c1f59bc3ecfb8fe1233324a7a6148709bbbf19b613cc4dd6e1537d3eee41b804125e9be65b2df0fb4a268de640b79d612f2e650598b19ca7e4837d193c5354
+  data.tar.gz: 7d165dde3adad49467ecbe0c14406be3ae8988a7214a5f4557fccf0987642412bd297579e65147edf4d2bdc76b755ce2811d1b2978f09643eb567fce8cc80098

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 1.4.0
+
+- Add the leader.ignore_ratelimits config option
+
 # 1.3.0
 
 - Initial public release of Reyes

data/bin/reyes

@@ -19,14 +19,18 @@ def exit_if_stopped!(options)
 end
 
 def command_dump(output_file, options)
-  aws = Reyes::AwsManager.new(options[:config])
+  config = Reyes::Config.new(options[:config])
+
+  aws = Reyes::AwsManager.new(config)
   aws.dump_fake_data(output_file)
 end
 
 def command_fetch(region, instance_id, options)
-  aws = Reyes::AwsManager.new(options[:config])
-  s3 = Reyes::S3Loader.new(aws, options[:config])
-  wrapper = Reyes::PgpWrapper.new(options[:config])
+  config = Reyes::Config.new(options[:config])
+
+  aws = Reyes::AwsManager.new(config)
+  s3 = Reyes::S3Loader.new(aws, config)
+  wrapper = Reyes::PgpWrapper.new(config)
 
   armoured_rules = s3.fetch_rules
   cleartext_rules = wrapper.verify!(armoured_rules)
@@ -34,7 +38,7 @@ def command_fetch(region, instance_id, options)
   fake = Reyes::FakeAws.new(JSON.load(cleartext_rules),
                             options.fetch(:fake_aws_options))
   g = Reyes::GroupManager.new(fake, region, instance_id)
-  r = Reyes::RunManager.new(g, options[:config])
+  r = Reyes::RunManager.new(g, config)
 
   data = r.generate_data!(options.fetch(:gen_options))
   r.apply_data!(data, options.fetch(:apply_options))
@@ -45,6 +49,7 @@ def command_fetch(region, instance_id, options)
 end
 
 def command_install(json_file, region, instance_id, options)
+  config = Reyes::Config.new(options[:config])
   if options[:splay]
     Reyes::Utils.sleep_random(options[:splay])
   end
@@ -59,7 +64,7 @@ def command_install(json_file, region, instance_id, options)
     # Should bail out, exiting nonzero if there were changes to commit
   end
 
-  r = Reyes::RunManager.new(g, options[:config])
+  r = Reyes::RunManager.new(g, config)
 
   data = r.generate_data!(options.fetch(:gen_options))
   r.apply_data!(data, options.fetch(:apply_options))
@@ -70,15 +75,17 @@ def command_install(json_file, region, instance_id, options)
 end
 
 def command_upload(options)
-  aws = Reyes::AwsManager.new(options[:config])
-  wrapper = Reyes::PgpWrapper.new(options[:config])
+  config = Reyes::Config.new(options[:config])
+
+  aws = Reyes::AwsManager.new(config)
+  wrapper = Reyes::PgpWrapper.new(config)
 
   data_obj = aws.generate_fake_data
   data = JSON.pretty_generate(data_obj)
 
   armoured_data = wrapper.clearsign(data)
 
-  s3 = Reyes::S3Loader.new(aws, options[:config])
+  s3 = Reyes::S3Loader.new(aws, config)
 
   if options[:archive]
     timestamp = data_obj.fetch('metadata').fetch('generated_stamp')
@@ -87,6 +94,12 @@ def command_upload(options)
   end
 
   s3.upload_rules(armoured_data)
+rescue AWS::EC2::Errors::RequestLimitExceeded => e
+  if config.aws_config.fetch('leader').fetch('ignore_ratelimits')
+    aws.log.warn("Ignoring ratelimit error", error: e)
+  else
+    raise
+  end
 end
 
 def parse_args

data/config.yaml.example

@@ -27,6 +27,9 @@ aws:
     AWS::EC2:
       :max_retries: 4
 
+  leader:
+    ignore_ratelimits: false
+
 reyes:
   signing_key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
   keyring_directory: /etc/reyes/keyring/

data/lib/reyes/aws_manager.rb

@@ -42,8 +42,8 @@ module Reyes
       end
     end
 
-    def initialize(config_path=nil)
-      @config ||= Reyes::Config.new(config_path)
+    def initialize(config)
+      @config = config
     end
 
     def ec2(region)

data/lib/reyes/pgp_wrapper.rb

@@ -10,8 +10,8 @@ module Reyes
     # Create a PgpVerifier
     #
     # @param key_id [String] 40 digit key fingerprint
-    def initialize(config_path=nil)
-      @config ||= Reyes::Config.new(config_path)
+    def initialize(config)
+      @config = config
       @key_id = @config.reyes_config.fetch("signing_key").upcase
       @keyring_directory = @config.reyes_config.fetch("keyring_directory")
     end

data/lib/reyes/run_manager.rb

@@ -5,10 +5,10 @@ module Reyes
     IPSET_NAME_PATTERN = /(\d+)(?<nogen>:(\w+):(sg-[a-f0-9]{8}):(\w+))/
 
     # @param group_manager [Reyes::GroupManager]
-    # @param config_path [String] Path to reyes config file
-    def initialize(group_manager, config_path=nil)
+    # @param config [Reyes::Config] Reyes configuration
+    def initialize(group_manager, config)
       @group_manager = group_manager
-      @config = Reyes::Config.new(config_path)
+      @config = config
     end
 
     # @param [Hash] options

data/lib/reyes/s3_loader.rb

@@ -7,7 +7,7 @@ module Reyes
 
     def initialize(aws, config, print_signatures=true)
       @aws = aws
-      @config = Reyes::Config.new(config)
+      @config = config
       @print_sig = print_signatures
 
       log.info("Initialized S3Loader: #{bucket.inspect}/#{path.inspect}")

data/lib/reyes/version.rb

@@ -1,6 +1,6 @@
 module Reyes
   # The Reyes version number
-  VERSION = '1.3.0' unless defined?(self::VERSION)
+  VERSION = '1.4.0' unless defined?(self::VERSION)
 
   # Number defining the JSON serialization format
   JSON_FORMAT_VERSION = 2 unless defined?(self::JSON_FORMAT_VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reyes
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Andy Brody
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -157,8 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Reyes manages IPTables rules based on EC2 security groups.
 test_files: []
+has_rdoc: