reyes 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f48d3207db77de72b83707df856cefc4315a933b
-  data.tar.gz: 7b98e123a7877ac65a63123aaa34f64247636c3e
+  metadata.gz: 19e9a46d1c609f245659a05b92a685d72fb755ee
+  data.tar.gz: 3198b6197a9d754592f4654fa9b7faf3dcad9c9b
 SHA512:
-  metadata.gz: a1c1f59bc3ecfb8fe1233324a7a6148709bbbf19b613cc4dd6e1537d3eee41b804125e9be65b2df0fb4a268de640b79d612f2e650598b19ca7e4837d193c5354
-  data.tar.gz: 7d165dde3adad49467ecbe0c14406be3ae8988a7214a5f4557fccf0987642412bd297579e65147edf4d2bdc76b755ce2811d1b2978f09643eb567fce8cc80098
+  metadata.gz: 55cd3b91fea0525f86491c611dabcf94d5820edfe9176bc6e77f3c56c991ef5a65668eb21fec2196d57bec9248518bc11b124ab13b8feb6cc7ef107e01e93b84
+  data.tar.gz: 931e9fb3bfc9c1c84fa0c4749737c1db6989aa47b37bf8e71958f8c3917ab18a5fc086bb5686b9f949e6ee4e1c7d2118febbece83d23231e875cab3eacd9a9c0

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 1.5.0
+
+- Preliminary work for supporting arbitrarily long sg names
+- Add the follower.ignore_timeouts config option
+
 # 1.4.0
 
 - Add the leader.ignore_ratelimits config option

data/bin/reyes

@@ -32,7 +32,16 @@ def command_fetch(region, instance_id, options)
   s3 = Reyes::S3Loader.new(aws, config)
   wrapper = Reyes::PgpWrapper.new(config)
 
-  armoured_rules = s3.fetch_rules
+  begin
+    armoured_rules = s3.fetch_rules
+  rescue Net::OpenTimeout => e
+    if config.aws_config.fetch('follower').fetch('ignore_timeouts')
+      s3.log.warn("Ignoring timeout error", error: e)
+      return
+    else
+      raise
+    end
+  end
   cleartext_rules = wrapper.verify!(armoured_rules)
 
   fake = Reyes::FakeAws.new(JSON.load(cleartext_rules),

data/config.yaml.example

@@ -30,6 +30,9 @@ aws:
   leader:
     ignore_ratelimits: false
 
+  follower:
+    ignore_timeouts: false
+
 reyes:
   signing_key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
   keyring_directory: /etc/reyes/keyring/

data/lib/reyes/run_manager.rb

@@ -2,7 +2,7 @@ module Reyes
   class RunManager
     include Chalk::Log
 
-    IPSET_NAME_PATTERN = /(\d+)(?<nogen>:(\w+):(sg-[a-f0-9]{8}):(\w+))/
+    IPSET_NAME_PATTERN = /(\d+)(?<nogen>:(\w+):(sg-[a-f0-9]{8,}):(\w+))/
 
     # @param group_manager [Reyes::GroupManager]
     # @param config [Reyes::Config] Reyes configuration

data/lib/reyes/version.rb

@@ -1,6 +1,6 @@
 module Reyes
   # The Reyes version number
-  VERSION = '1.4.0' unless defined?(self::VERSION)
+  VERSION = '1.5.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.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Andy Brody
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk