Merge pull request #316 from yn/master

Fix support for EIP in EC2-Classic
dtan4 · Mar 16, 2017 · f5e482a · f5e482a
2 parents caf9c91 + ef877fc
commit f5e482a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/lib/terraforming/resource/eip.rb b/lib/terraforming/resource/eip.rb
@@ -24,7 +24,7 @@ def tfstate
           attributes = {
             "association_id" => addr.association_id,
             "domain" => addr.domain,
-            "id" => addr.allocation_id,
+            "id" => vpc?(addr) ? addr.allocation_id : addr.public_ip,
             "instance" => addr.instance_id,
             "network_interface" => addr.network_interface_id,
             "private_ip" => addr.private_ip_address,
@@ -35,7 +35,7 @@ def tfstate
           resources["aws_eip.#{module_name_of(addr)}"] = {
             "type" => "aws_eip",
             "primary" => {
-              "id" => addr.allocation_id,
+              "id" => vpc?(addr) ? addr.allocation_id : addr.public_ip,
               "attributes" => attributes
             }
           }
@@ -55,7 +55,11 @@ def vpc?(addr)
       end
 
       def module_name_of(addr)
-        normalize_module_name(addr.allocation_id)
+        if vpc?(addr)
+          normalize_module_name(addr.allocation_id)
+        else
+          normalize_module_name(addr.public_ip)
+        end
       end
     end
   end

diff --git a/spec/lib/terraforming/resource/eip_spec.rb b/spec/lib/terraforming/resource/eip_spec.rb
@@ -33,6 +33,16 @@ module Resource
             domain: "vpc",
             allocation_id: "eipalloc-33333333",
           },
+          {
+            instance_id: "i-91112221",
+            public_ip: "2.2.2.4",
+            allocation_id: nil,
+            association_id: nil,
+            domain: "standard",
+            network_interface_id: nil,
+            network_interface_owner_id: nil,
+            private_ip_address: nil
+          }
         ]
       end
 
@@ -57,6 +67,11 @@ module Resource
     vpc               = true
 }
 
+resource "aws_eip" "2-2-2-4" {
+    instance          = "i-91112221"
+    vpc               = false
+}
+
           EOS
         end
       end
@@ -107,6 +122,19 @@ module Resource
                 }
               }
             },
+            "aws_eip.2-2-2-4" => {
+              "type" => "aws_eip",
+              "primary" => {
+                "id" => "2.2.2.4",
+                "attributes" => {
+                    "domain" => "standard",
+                    "id" => "2.2.2.4",
+                    "instance" => "i-91112221",
+                    "public_ip" => "2.2.2.4",
+                    "vpc" => "false"
+                },
+              },
+            },
           })
         end
       end