terraforming 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6da3b6025e72dbde110224ba597ae281004e64
-  data.tar.gz: a8ab14e29325070270895d2bd7d9dfc1f456bb64
+  metadata.gz: 0f2efd2fcc749aae8e786423ae3e8d46be4cf852
+  data.tar.gz: b99a7cfe20ed485d646fe455b1e38c225bdbbf9d
 SHA512:
-  metadata.gz: 7611a6cc8554f7661ff3c579306becffc4da9ed077e8087b7c1e68e57b14eed25cbdb7d1e8d342fd4c547daf1c1788ed9ec30b22c4eba19c46d66458d8bfbc67
-  data.tar.gz: 8435e655557d88686a783ae7045a0ecd8a5deb10514be0645372caf92eb7855f49024b10294be8faeb78caaf6d49be1f18b39009c6d2997611fcfd205de4c1ec
+  metadata.gz: 1caa9dd2b3d02d284643323c9cc0c3977e7765dec2efe61b517e9da24d084313b5b20e6731d5a691cf967576a870ce41d23c57d38c0f70eb9da18a42e40a145a
+  data.tar.gz: a369651650377159062123d710077bc9529177a110c94488d33ca41fc9dd59e55396e686de6f59b0d237479508614bfff8747a69e46bd09d12aa3135bb693d5b

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+# [v0.1.3](https://github.com/dtan4/terraforming/releases/tag/v0.1.3) (2015-08-01)
+
+### Fixed
+
+- Generate correct tf and tfstate if EC2 instance has no attached EBS #104
+- Generate correct tfstate of Security Group #101 (thanks @grosendorf)
+
 # [v0.1.2](https://github.com/dtan4/terraforming/releases/tag/v0.1.2) (2015-07-30)
 
-## Fixed
+### Fixed
 
 - Generate correct tf and tfstate of EC2 #94, #102
 - Handle multiple Route53 record types #99 (thanks @nicgrayson)

data/lib/terraforming/resource/ec2.rb

@@ -70,6 +70,7 @@ module Terraforming
       end
 
       def block_devices_of(instance)
+        return [] unless instance.block_device_mappings.length > 0
         @client.describe_volumes(volume_ids: block_device_ids_of(instance)).volumes
       end
 

data/lib/terraforming/resource/security_group.rb

@@ -52,7 +52,7 @@ module Terraforming
       def ingress_attributes_of(security_group)
         attributes = { "ingress.#" => security_group.ip_permissions.length.to_s }
 
-        security_group.ip_permissions.each do |permission|
+        dedup_permissions(security_group).ip_permissions.each do |permission|
           attributes.merge!(permission_attributes_of(security_group, permission, "ingress"))
         end
 
@@ -62,7 +62,7 @@ module Terraforming
       def egress_attributes_of(security_group)
         attributes = { "egress.#" => security_group.ip_permissions_egress.length.to_s }
 
-        security_group.ip_permissions_egress.each do |permission|
+        dedup_permissions(security_group).ip_permissions_egress.each do |permission|
           attributes.merge!(permission_attributes_of(security_group, permission, "egress"))
         end
 
@@ -101,6 +101,50 @@ module Terraforming
         attributes
       end
 
+      def dedup_permissions(security_group)
+        grouped_ingress = security_group.ip_permissions.group_by {|perm| [perm.ip_protocol, perm.to_port, perm.from_port]}
+        grouped_egress = security_group.ip_permissions_egress.group_by {|perm| [perm.ip_protocol, perm.to_port, perm.from_port]}
+
+        security_group.ip_permissions = []
+        security_group.ip_permissions_egress = []
+
+        grouped_ingress.each do |range, perms|
+          if perms.length == 1
+            security_group.ip_permissions << perms.first
+          else
+            g_ids = perms.map {|perm| perm.user_id_group_pairs}.flatten.map {|gp| gp.group_id}
+            if g_ids.length == 1 && g_ids.first == security_group.group_id
+              security_group.ip_permissions << merge_perms(perms)
+            else
+              security_group.ip_permissions.concat(perms)
+            end
+          end
+        end
+
+        grouped_egress.each do |range, perms|
+          if perms.length == 1
+            security_group.ip_permissions_egress << perms.first
+          else
+            g_ids = perms.map {|perm| perm.user_id_group_pairs}.flatten.map {|gp| gp.group_id}
+            if g_ids.length == 1 && g_ids.first == security_group.group_id
+              security_group.ip_permissions_egress << merge_perms(perms)
+            else
+              security_group.ip_permissions_egress.concat(perms)
+            end
+          end
+        end
+        security_group
+      end
+
+      def merge_perms(permissions)
+        master_perm = permissions.pop
+        permissions.each do |perm|
+          master_perm.user_id_group_pairs.concat(perm.user_id_group_pairs)
+          master_perm.ip_ranges.concat(perm.ip_ranges)
+        end
+        master_perm
+      end
+
       def permission_hashcode_of(security_group, permission)
         string =
           "#{permission.from_port || 0}-" <<

data/lib/terraforming/template/tf/security_group.erb

@@ -4,7 +4,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
     description = "<%= security_group.description %>"
     vpc_id      = "<%= security_group.vpc_id || '' %>"
 
-<% security_group.ip_permissions.each do |permission| -%>
+<% dedup_permissions(security_group).ip_permissions.each do |permission| -%>
   <%- security_groups = security_groups_in(permission).reject { |group_id| group_id == security_group.group_id } -%>
     ingress {
         from_port       = <%= permission.from_port || 0 %>
@@ -24,7 +24,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
 
 <% end -%>
 
-<% security_group.ip_permissions_egress.each do |permission| -%>
+<% dedup_permissions(security_group).ip_permissions_egress.each do |permission| -%>
     egress {
         from_port       = <%= permission.from_port || 0 %>
         to_port         = <%= permission.to_port || 0 %>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk