terraforming 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b10bc1416e5223ef01c3c49a00f6108ae1a5f3
-  data.tar.gz: 395f5e9a6496791ef2b33301931351d1f5d6cf10
+  metadata.gz: a27178069da9153155aff37de42e68a2783e1899
+  data.tar.gz: ad3de0470f2e0f0e4d994b9778270dd0a7b0495b
 SHA512:
-  metadata.gz: d217dc1d609b1afed2681887af7f7a9590c33d9f7812d7d50fd84cc09e09b338675806048fed7138a1e8428b478c5ad2242c7f17014c9271e8f3f0f9c6066cb5
-  data.tar.gz: 64f11e97d09bf707ec52a525b19daa8277be537dd9ecc8859783978f03a44b4869c325f61b9d1e2b3c55fcdae5919a90a20312dad79f656650041d1da6f7c8c1
+  metadata.gz: 8e4bf304665b0657c1e4c328dfcdc74596b1f6def38612c3fd8866ac833d841f62cc5d3e480075262e617d45f8a517bacf1c394b31c77ec74826b4a525aea7f8
+  data.tar.gz: '0239a7d087365a73e04d5d9b7a04b3dd04bdc0620a89fe5e6653d4b16474b7b0981275ecd5c1c120510c415338fb427b50fdbd00dc588d9c12ae1301adf63234'

data/.travis.yml

@@ -10,6 +10,9 @@ env:
   matrix:
     - OJ=0
     - OJ=1
+before_install:
+  - gem update --system
+  - gem update bundler
 before_script:
   - if [[ $OJ -eq 1 ]]; then gem install oj; fi
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [v0.13.1](https://github.com/dtan4/terraforming/releases/tag/v0.13.1) (2017-01-23)
+
+## Fixed / Updated
+
+- Fixes for route53_records [#303](https://github.com/dtan4/terraforming/pull/303) (thanks @mioi)
+  - use `weighted_routing_policy`
+  - add various routing policy (latency, geolocation)
+  - uniquify resource name
+
 # [v0.13.0](https://github.com/dtan4/terraforming/releases/tag/v0.13.0) (2017-01-12)
 
 ## Resource

data/lib/terraforming/resource/route53_record.rb

@@ -22,6 +22,7 @@ module Terraforming
       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,17 @@ module Terraforming
           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,9 +75,18 @@ module Terraforming
       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 { |_, v| v.size > 1 }.map(&:first)
+        to_return.each do |r|
+          module_name = module_name_of(r[:record], nil)
+          next unless dups.include?(module_name)
+          count[module_name] = count[module_name] ? count[module_name] + 1 : 0
+          r[:counter] = count[module_name]
+        end
+        to_return
       end
 
       # TODO(dtan4): change method name...
@@ -76,8 +94,8 @@ module Terraforming
         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)

data/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 %>"

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/terraforming.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk", "~> 2.6.1"
+  spec.add_dependency "aws-sdk", "~> 2.7.0"
   spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)