builderator 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61791d654bbf812e8a6fc0ff5c45516e97d46c1
-  data.tar.gz: 37f685e6f924ce60a5a921409412c7eafadb44dd
+  metadata.gz: 546f19517e89098c1cbaebe6bf9c9142120d65f8
+  data.tar.gz: 2a212ca4c5cbddb3fb5d666ea282f81975374fd7
 SHA512:
-  metadata.gz: e4515821bcc561de3c1bf73d771b187f52415a9010285c4540a565c52aa50307440f4b8062e62ea009b32042f10c03f4670210b500f8e3d372f8882e6cd71760
-  data.tar.gz: 966b56ae5f3744be67d19e6fb501a0f77d8a0ace9852afd38a20e7597dbe876492f327e0d03eb3321b67863538ac83ac88c2bdf130e0504f11731035574ac469
+  metadata.gz: a459532c525027ba02cee9ff41512840d6cc7414d2a0371477dc31e817676573bbefb78ad2b2acada3cbbdc6e93fd39002b12098f8f7890235fe09583fd7fa93
+  data.tar.gz: 15843e363495491ec329584a9fba648a395ebc36610f7a3f6d88f2961862c246887d585bae23939da34922dcdcbb880371a983b7216b213ec20c597ceefdce75

data/lib/builderator/util.rb

@@ -89,7 +89,9 @@ module Builderator
           return
         end
         ec2 = ec2(region)
-        resp = ec2.delete_security_group(group_id: group_id)
+        Retryable.retryable(:sleep => lambda { |n| 4**n }, :tries => 4, :on => [Aws::EC2::Errors::ServiceError, Aws::EC2::Errors::InternalError]) do |retries, _|
+          resp = ec2.delete_security_group(group_id: group_id)
+        end
         puts "Deleted SecurityGroup #{group_id}"
       end
 
@@ -108,20 +110,22 @@ module Builderator
 
         # Create a security group with microsecond timestamp (to avoid collisions when using seconds)
         ts_usec = (Time.now.to_f*1000000).to_i
-        resp = ec2.create_security_group(group_name: "BuilderatorSecurityGroupSSHOnly-#{ts_usec}",
-                                         description: "Created by Builderator at #{Time.now}")
-        group_id = resp[:group_id]
-
-        resp = ec2.describe_security_groups(group_ids: [group_id])
-        groups = resp[:security_groups]
-        group = groups.first
-
-        # Ensure the group_id has the right permissions
-        resp = ec2.authorize_security_group_ingress(group_id: group_id,
-                                                    ip_protocol: 'tcp',
-                                                    from_port: 22,
-                                                    to_port: 22,
-                                                    cidr_ip: cidr_ip)
+        Retryable.retryable(:sleep => lambda { |n| 4**n }, :tries => 4, :on => [Aws::EC2::Errors::ServiceError, Aws::EC2::Errors::InternalError]) do |retries, _|
+          resp = ec2.create_security_group(group_name: "BuilderatorSecurityGroupSSHOnly-#{ts_usec}",
+                                           description: "Created by Builderator at #{Time.now}")
+          group_id = resp[:group_id]
+
+          resp = ec2.describe_security_groups(group_ids: [group_id])
+          groups = resp[:security_groups]
+          group = groups.first
+
+          # Ensure the group_id has the right permissions
+          resp = ec2.authorize_security_group_ingress(group_id: group_id,
+                                                      ip_protocol: 'tcp',
+                                                      from_port: 22,
+                                                      to_port: 22,
+                                                      cidr_ip: cidr_ip)
+        end
         puts "Created SecurityGroup #{group_id}"
         group_id
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake