vominator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53df973484342c23fa5dd76112d93161b8963375
-  data.tar.gz: a6886455dcb30e4f305c0f9e233cfdffa0936c6f
+  metadata.gz: fba414ccd39128ec41e5e7337f624e8a5dca2758
+  data.tar.gz: 75012aeef586da2e77a0cb817cbe0860838c7c13
 SHA512:
-  metadata.gz: aa37b7bfbe5819cbd0c73c64b5f1a4e505b2ab25cf7774e60b0498604a9d40a17574b690fbfda547f0d90e84a64ffb3b303a407b38cbd05531fa865bdbe2cddd
-  data.tar.gz: 95bcbd216f5b72fcdeb797a8c2afbf8c2a9f6b942667d242255d2020e61ddaa1f2e7a871b1c51de1b54cd64414ffe19855b46897042569f93552c01cb3f49b21
+  metadata.gz: 9ef593c067e45b82582317a80d51f9ab0306893b56dcf8a3c1338b9700b73ca90a479dda4c3b8d8d65d1e8146b8d89156a7740687617c1651eca6d16e1b82995
+  data.tar.gz: f884636b45307f3215ce1868067d6d92886ee72999094285d4e371206bd965d9ede8ecc62caa621a7457f869ecccdaf9cf505018c7c5f73404dd9fb28c533020

data/README.md

@@ -22,7 +22,9 @@ access_key_id: AWS_SECRET_KEY
 secret_access_key: AWS_SECRET_ACCESS_KEY
 configuration_path: Location to puke
 key_pair_name: infrastructure@example.com
+instances_file: Location for cache file IE /Users/foo/.vominator/instances-metadata
 ```
+
 ## Usage
 
 Everything with Vominator revolves around the concept of defining products. These products are a logical grouping of resources that describe how your product is deployed and accessed. These products are then associated with an environment so that you can quickly replicate resources between VPCs.

data/lib/ec2/security_groups.rb

@@ -172,7 +172,7 @@ puke_security_groups.each do |puke_security_group|
 
 		# Normalize the rules that we defined in puke for the security group.
 		puke_ingress_rules = Array.new
-		cidr_block_regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/
+		cidr_block_regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[0-2][0-9]|3[0-2]))$/
 
 		puke_security_group['ingress'].each do |rule|
       #TODO: Normalize all to -1 for ip_protocol
@@ -187,8 +187,8 @@ puke_security_groups.each do |puke_security_group|
 			if rule['source'] =~ cidr_block_regex
         puke_ingress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => rule['source'], :source_security_group_id => nil})
 			else rule['source']
-			  if vpc_security_groups_id_lookup[puke_security_group_name]
-          group_id = vpc_security_groups_id_lookup[puke_security_group_name]
+			  if vpc_security_groups_id_lookup[rule['source']]
+          group_id = vpc_security_groups_id_lookup[rule['source']]
           puke_ingress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => nil, :source_security_group_id => group_id, :source_security_group_name => vpc_security_groups_name_lookup[group_id] })
 			  else
 				  LOGGER.fatal("Do not recognize #{rule['source']} as a valid cidr block and was unable to resolve this to a valid security group for #{rule} in #{puke_security_group_name}")
@@ -207,17 +207,17 @@ puke_security_groups.each do |puke_security_group|
 			#TODO: Normalize -1 to all for ip_protocol
       #TODO: if -1 for ip_protocol set :from_port and to_ports
       rule.ip_ranges.each do |ip_range|
-        vpc_egress_rules.push({ :ip_protocol => rule.ip_protocol, :from_port => rule.from_port, :to_port => rule.to_port, :cidr_ip => ip_range.cidr_ip, :source_security_group_id => nil })
+        vpc_egress_rules.push({ :ip_protocol => rule.ip_protocol, :from_port => rule.from_port, :to_port => rule.to_port, :cidr_ip => ip_range.cidr_ip, :destination_security_group_id => nil })
       end
       
       rule.user_id_group_pairs.each do |group|
-        vpc_egress_rules.push({ :ip_protocol => rule.ip_protocol, :from_port => rule.from_port, :to_port => rule.to_port, :cidr_ip => nil, :source_security_group_id => group.group_id, :source_security_group_name => vpc_security_groups_name_lookup[group.group_id] })
+        vpc_egress_rules.push({ :ip_protocol => rule.ip_protocol, :from_port => rule.from_port, :to_port => rule.to_port, :cidr_ip => nil, :destination_security_group_id => group.group_id, :destination_security_group_name => vpc_security_groups_name_lookup[group.group_id] })
       end
 		end
     
     # Normalize the rules that we defined in puke for the security group.
     puke_egress_rules = Array.new
-    cidr_block_regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/
+    cidr_block_regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[0-2][0-9]|3[0-2]))$/
     
     puke_security_group['egress'].each do |rule|
       #TODO: Normalize all to -1 for ip_protocol
@@ -228,15 +228,15 @@ puke_security_groups.each do |puke_security_group|
         from_port = rule['ports']
         to_port = rule['ports']
       end
-      
-      if rule['source'] =~ cidr_block_regex
-        puke_egress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => rule['source'], :source_security_group_id => nil})
-      else rule['source']
-      if vpc_security_groups_id_lookup[puke_security_group_name]
-        group_id = vpc_security_groups_id_lookup[puke_security_group_name]
-        puke_egress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => nil, :source_security_group_id => group_id, :source_security_group_name => vpc_security_groups_name_lookup[group_id] })
+
+      if rule['destination'] =~ cidr_block_regex
+        puke_egress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => rule['destination'], :destination_security_group_id => nil})
+      else rule['destination']
+      if vpc_security_groups_id_lookup[rule['destination']]
+        group_id = vpc_security_groups_id_lookup[rule['destination']]
+        puke_egress_rules.push({ :ip_protocol => rule['protocol'], :from_port => from_port.to_i, :to_port => to_port.to_i, :cidr_ip => nil, :destination_security_group_id => group_id, :destination_security_group_name => vpc_security_groups_name_lookup[group_id] })
       else
-        LOGGER.fatal("Do not recognize #{rule['source']} as a valid cidr block and was unable to resolve this to a valid security group for #{rule} in #{puke_security_group_name}")
+        LOGGER.fatal("Do not recognize #{rule['destination']} as a valid cidr block and was unable to resolve this to a valid security group for #{rule} in #{puke_security_group_name}")
       end
       end
     end
@@ -265,19 +265,19 @@ puke_security_groups.each do |puke_security_group|
       end
 
       egress_to_create.each do |rule|
-        source = rule[:cidr_ip] || rule[:source_security_group_name]
-        t.add_row ['Outbound'.green, source.green, rule[:from_port].to_s.green, rule[:to_port].to_s.green, rule[:ip_protocol].green, 'Create'.green]
+        destination = rule[:cidr_ip] || rule[:destination_security_group_name]
+        t.add_row ['Outbound'.green, destination.green, rule[:from_port].to_s.green, rule[:to_port].to_s.green, rule[:ip_protocol].green, 'Create'.green]
       end
 
       egress_to_delete.each do |rule|
-        source = rule[:cidr_ip] || rule[:source_security_group_name]
-        t.add_row ['Outbound'.red, source.red, rule[:from_port].to_s.red, rule[:to_port].to_s.red, rule[:ip_protocol].red, 'Delete'.red]
+        destination = rule[:cidr_ip] || rule[:destination_security_group_name]
+        t.add_row ['Outbound'.red, destination.red, rule[:from_port].to_s.red, rule[:to_port].to_s.red, rule[:ip_protocol].red, 'Delete'.red]
       end
 
       if options[:verbose]
         ((vpc_egress_rules - egress_to_create) - egress_to_delete).each do |rule|
-          source = rule[:cidr_ip] || rule[:source_security_group_name]
-          t.add_row ['Outbound', source, rule[:from_port].to_s, rule[:to_port].to_s, rule[:ip_protocol], nil]
+          destination = rule[:cidr_ip] || rule[:destination_security_group_name]
+          t.add_row ['Outbound', destination, rule[:from_port].to_s, rule[:to_port].to_s, rule[:ip_protocol], nil]
         end
       end
     end
@@ -311,4 +311,4 @@ puke_security_groups.each do |puke_security_group|
 			end
 		end
   end
-end
+end

data/lib/vominator/ec2.rb

@@ -266,16 +266,16 @@ module Vominator
           end
 
           if rule[:cidr_ip]
-            client.authorize_security_group_ingress({group_id: group_id, cidr_ip: rule[:cidr_ip], ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port]})
+            client.authorize_security_group_ingress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], ip_ranges: [{cidr_ip: rule[:cidr_ip]}]}]})
           end
 
         when 'egress'
-          if rule[:source_security_group_id]
-            client.authorize_security_group_egress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], user_id_group_pairs: [{group_id: rule[:source_security_group_id]}]}]})
+          if rule[:destination_security_group_id]
+            client.authorize_security_group_egress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], user_id_group_pairs: [{group_id: rule[:destination_security_group_id]}]}]})
           end
 
           if rule[:cidr_ip]
-            client.authorize_security_group_egress({group_id: group_id, cidr_ip: rule[:cidr_ip], ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port]})
+            client.authorize_security_group_egress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], ip_ranges: [{cidr_ip: rule[:cidr_ip]}]}]})
           end
         else
           return false
@@ -294,8 +294,8 @@ module Vominator
           end
     
         when 'egress'
-          if rule[:source_security_group_id]
-            client.revoke_security_group_egress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], user_id_group_pairs: [{group_id: rule[:source_security_group_id]}]}]})
+          if rule[:destination_security_group_id]
+            client.revoke_security_group_egress({group_id: group_id, ip_permissions: [{ip_protocol: rule[:ip_protocol], from_port: rule[:from_port], to_port: rule[:to_port], user_id_group_pairs: [{group_id: rule[:destination_security_group_id]}]}]})
           end
       
           if rule[:cidr_ip]

data/lib/vominator/version.rb

@@ -1,3 +1,3 @@
 module Vominator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vominator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Kelly
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk