Fixes for route53_records

lib/terraforming/resource/route53_record.rb

@@ -22,6 +22,7 @@ def tf
       def tfstate
         records.inject({}) do |resources, r|
           record, zone_id = r[:record], r[:zone_id]
+          counter = r[:counter]
           record_id = record_id_of(record, zone_id)
 
           attributes = {
@@ -35,9 +36,15 @@ def tfstate
           attributes["records.#"] = record.resource_records.length.to_s unless record.resource_records.empty?
           attributes["ttl"] = record.ttl.to_s if record.ttl
           attributes["weight"] = record.weight ? record.weight.to_s : "-1"
+          attributes["region"] = record.region if record.region
+          if record.geo_location
+            attributes["continent"] = record.geo_location.continent_code if record.geo_location.continent_code
+            attributes["country"] = record.geo_location.country_code if record.geo_location.country_code
+            attributes["subdivision"] = record.geo_location.subdivision_code if record.geo_location.subdivision_code
+          end
           attributes["set_identifier"] = record.set_identifier if record.set_identifier
 
-          resources["aws_route53_record.#{module_name_of(record)}"] = {
+          resources["aws_route53_record.#{module_name_of(record, counter)}"] = {
             "type" => "aws_route53_record",
             "primary" => {
               "id" => record_id,
@@ -66,18 +73,32 @@ def record_sets_of(hosted_zone)
       end
 
       def records
-        hosted_zones.map do |hosted_zone|
+        to_return = hosted_zones.map do |hosted_zone|
           record_sets_of(hosted_zone).map { |record| { record: record, zone_id: zone_id_of(hosted_zone) } }
         end.flatten
+        count = {}
+        dups = to_return.group_by{ |record| module_name_of(record[:record], nil) }.select { |k, v| v.size > 1 }.map(&:first)
+        to_return.each do |r|
+          module_name = module_name_of(r[:record], nil)
+          if dups.include?(module_name)
+            if count[module_name]
+              count[module_name] = count[module_name] + 1
+            else
+              count[module_name] = 0
+            end
+            r[:counter] = count[module_name]
+          end
+        end
+        to_return
       end
 
       # TODO(dtan4): change method name...
       def name_of(dns_name)
         dns_name.gsub(/\.\z/, "")
       end
 
-      def module_name_of(record)
-        normalize_module_name(name_of(record.name) + "-" + record.type)
+      def module_name_of(record, counter)
+        normalize_module_name(name_of(record.name) + "-" + record.type + (!counter.nil? ? "-" + counter.to_s : ""))
       end
 
       def zone_id_of(hosted_zone)

lib/terraforming/template/tf/route53_record.erb

@@ -1,6 +1,7 @@
 <% records.each do |r| -%>
   <%- record, zone_id = r[:record], r[:zone_id] -%>
-resource "aws_route53_record" "<%= module_name_of(record) %>" {
+  <%- counter = r[:counter] -%>
+resource "aws_route53_record" "<%= module_name_of(record, counter) %>" {
     zone_id = "<%= zone_id %>"
     name    = "<%= name_of(record.name.sub(/\\052/, '*')) %>"
     type    = "<%= record.type %>"
@@ -11,7 +12,27 @@ resource "aws_route53_record" "<%= module_name_of(record) %>" {
     ttl     = "<%= record.ttl %>"
 <%- end -%>
 <%- if record.weight -%>
-    weight  = <%= record.weight %>
+    weighted_routing_policy {
+      weight = <%= record.weight %>
+    }
+<%- end -%>
+<%- if record.region -%>
+    latency_routing_policy {
+      region = "<%= record.region %>"
+    }
+<%- end -%>
+<%- if record.geo_location -%>
+    geolocation_routing_policy {
+  <%- if record.geo_location.continent_code -%>
+      continent = "<%= record.geo_location.continent_code %>"
+  <%- end -%>
+  <%- if record.geo_location.country_code -%>
+      country = "<%= record.geo_location.country_code %>"
+  <%- end -%>
+  <%- if record.geo_location.subdivision_code -%>
+      subdivision = "<%= record.geo_location.subdivision_code %>"
+  <%- end -%>
+    }
 <%- end -%>
 <%- if record.set_identifier -%>
     set_identifier = "<%= record.set_identifier %>"

spec/lib/terraforming/resource/route53_record_spec.rb

@@ -108,7 +108,9 @@ module Resource
     zone_id = "OPQRSTUVWXYZAB"
     name    = "www.fuga.net"
     type    = "A"
-    weight  = 10
+    weighted_routing_policy {
+      weight = 10
+    }
 
     alias {
         name    = "fuga.net"