terraforming 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27178069da9153155aff37de42e68a2783e1899
-  data.tar.gz: ad3de0470f2e0f0e4d994b9778270dd0a7b0495b
+  metadata.gz: ce28792dd6bf8346c71c97b88490a492f26f5b1c
+  data.tar.gz: 5fbb2eb91615d03bc50566b28877334a8b64d36f
 SHA512:
-  metadata.gz: 8e4bf304665b0657c1e4c328dfcdc74596b1f6def38612c3fd8866ac833d841f62cc5d3e480075262e617d45f8a517bacf1c394b31c77ec74826b4a525aea7f8
-  data.tar.gz: '0239a7d087365a73e04d5d9b7a04b3dd04bdc0620a89fe5e6653d4b16474b7b0981275ecd5c1c120510c415338fb427b50fdbd00dc588d9c12ae1301adf63234'
+  metadata.gz: f22672a8e344a840ca1a89d34757328fae4eec18b18050dd277625aa3659ac05001dacaffa406ab63d145a7be854ee82819836f1088baccc05574334ae367610
+  data.tar.gz: bd9b3a407399e1d3e9d4a52611c042f445973b7feb304ccbea032d9871fc618a4f039424d976a9949f45bbf087777fa6986260af3c4b13ff9085b7a989aba66a

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-- 2.4.0
-- 2.3.3
-- 2.2.6
+- 2.4.1
+- 2.3.4
+- 2.2.7
 - 2.1.10
 env:
   global:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [v0.13.2](https://github.com/dtan4/terraforming/releases/tag/v0.13.2) (2017-04-20)
+
+## Fixed / Updated
+
+- Add prefix lists to security groups configuration [#326](https://github.com/dtan4/terraforming/pull/326) (thanks @julia-stripe)
+- Support Ruby 2.4 without warnings [#323](https://github.com/dtan4/terraforming/pull/323)
+- Fix support for EIP in EC2-Classic [#316](https://github.com/dtan4/terraforming/pull/316) (thanks @yn)
+
 # [v0.13.1](https://github.com/dtan4/terraforming/releases/tag/v0.13.1) (2017-01-23)
 
 ## Fixed / Updated

data/lib/terraforming/resource/eip.rb

@@ -24,7 +24,7 @@ module Terraforming
           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 @@ module Terraforming
           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 @@ module Terraforming
       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

data/lib/terraforming/resource/security_group.rb

@@ -92,6 +92,7 @@ module Terraforming
           "#{type}.#{hashcode}.to_port" => (permission.to_port || 0).to_s,
           "#{type}.#{hashcode}.protocol" => permission.ip_protocol,
           "#{type}.#{hashcode}.cidr_blocks.#" => permission.ip_ranges.length.to_s,
+          "#{type}.#{hashcode}.prefix_list_ids.#" => permission.prefix_list_ids.length.to_s,
           "#{type}.#{hashcode}.security_groups.#" => security_groups.length.to_s,
           "#{type}.#{hashcode}.self" => self_referenced_permission?(security_group, permission).to_s,
         }
@@ -100,6 +101,10 @@ module Terraforming
           attributes["#{type}.#{hashcode}.cidr_blocks.#{index}"] = range.cidr_ip
         end
 
+        permission.prefix_list_ids.each_with_index do |prefix_list, index|
+          attributes["#{type}.#{hashcode}.prefix_list_ids.#{index}"] = prefix_list.prefix_list_id
+        end
+
         security_groups.each do |group|
           attributes["#{type}.#{hashcode}.security_groups.#{group_hashcode_of(group)}"] = group
         end

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

@@ -22,6 +22,7 @@ resource "aws_route53_record" "<%= module_name_of(record, counter) %>" {
     }
 <%- end -%>
 <%- if record.geo_location -%>
+
     geolocation_routing_policy {
   <%- if record.geo_location.continent_code -%>
         continent = "<%= record.geo_location.continent_code %>"

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

@@ -10,6 +10,9 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
         from_port       = <%= permission.from_port || 0 %>
         to_port         = <%= permission.to_port || 0 %>
         protocol        = "<%= permission.ip_protocol %>"
+<%- if permission.prefix_list_ids.length > 0 -%>
+        prefix_list_ids = <%= permission.prefix_list_ids.map { |range| range.prefix_list_id }.inspect %>
+<%- end -%>
 <%- if permission.ip_ranges.length > 0 -%>
         cidr_blocks     = <%= permission.ip_ranges.map { |range| range.cidr_ip }.inspect %>
 <%- end -%>
@@ -27,6 +30,9 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
         from_port       = <%= permission.from_port || 0 %>
         to_port         = <%= permission.to_port || 0 %>
         protocol        = "<%= permission.ip_protocol %>"
+<%- if permission.prefix_list_ids.length > 0 -%>
+        prefix_list_ids = <%= permission.prefix_list_ids.map { |range| range.prefix_list_id }.inspect %>
+<%- end -%>
 <%- if permission.ip_ranges.length > 0 -%>
         cidr_blocks     = <%= permission.ip_ranges.map { |range| range.cidr_ip }.inspect %>
 <%- end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 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.7.0"
+  spec.add_dependency "aws-sdk", "~> 2.9.6"
   spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls", "~> 0.8.13"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "simplecov", "~> 0.12.0"
+  spec.add_development_dependency "simplecov", "~> 0.14.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-04-20 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.7.0
+        version: 2.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.9.6
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
 description: Export existing AWS resources to Terraform style (tf, tfstate)
 email:
 - dtanshi45@gmail.com
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)