kumogata-template 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ac98de5cc9063b728caa5ec2a840c9e082120b
-  data.tar.gz: 52d8e1f236a7e45574b6a7d266caa30b01c88700
+  metadata.gz: 5847d3069a5760206ce6ed27a3e9a9a27346be30
+  data.tar.gz: 926e9616a61038c9e9e06e34381bf5e30a4f2acc
 SHA512:
-  metadata.gz: 5e79732c98ecafe6e4121c7b1c9e3f399d56b3af74861179b45cc878764e1c4fc9a0de2f28c74f0517968a489970581f78465b5c1d679597db29994633a101c5
-  data.tar.gz: 0f45e9b8533b221123112d257b0f157549910b70511d12649f2f8c6b2219c461b5b5565c89cb66abdc9996b85dd53b05ede7085128e2aca4d343d84ac9a12de9
+  metadata.gz: ab2d6adcc316341eab02451f3df6d6d1548f61cf6ca243bd7f8d31a2d1b6a1530ee4357a6acd76308fe678d7bb17223a8f3f8313ac10009770aaa2693fc8b5e5
+  data.tar.gz: e9d0fd9037cfdce7bcbf0f6fc7b902623bae96e0fb2351a9e4bcbc3f91810746321e61bffa92315acbd9ea69b951cdf0279fe66c1e3635bc0d63054fad41d4e8

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.1)
-      aws-sdk (~> 2)
+    kumogata-template (0.0.3)
+      aws-sdk (~> 2.3)
       kumogata (= 0.5.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.2.27)
-      aws-sdk-resources (= 2.2.27)
-    aws-sdk-core (2.2.27)
+    aws-sdk (2.3.8)
+      aws-sdk-resources (= 2.3.8)
+    aws-sdk-core (2.3.8)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.27)
-      aws-sdk-core (= 2.2.27)
+    aws-sdk-resources (2.3.8)
+      aws-sdk-core (= 2.3.8)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -23,13 +23,15 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     diffy (3.1.0)
-    dslh (0.2.7)
-    execjs (2.6.0)
-    hashie (3.4.3)
+    dslh (0.3.7)
+    execjs (2.7.0)
+    hashie (3.4.4)
     highline (1.7.8)
-    jmespath (1.1.3)
+    jmespath (1.2.4)
+      json_pure (>= 1.8.1)
     json (1.8.3)
     json5 (0.0.1)
+    json_pure (1.8.3)
     kumogata (0.5.8)
       aws-sdk-v1
       coderay
@@ -47,11 +49,11 @@ GEM
       uuidtools
     libv8 (3.16.14.15)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    net-ssh (3.0.2)
+    minitest (5.9.0)
+    net-ssh (3.1.1)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    rake (11.1.1)
+    rake (11.1.2)
     ref (2.0.0)
     retryable (2.0.3)
     term-ansicolor (1.3.2)
@@ -59,7 +61,7 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    tins (1.9.0)
+    tins (1.10.2)
     uuidtools (2.1.5)
 
 PLATFORMS

data/kumogata-template.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'aws-sdk', '~> 2.3'
   spec.add_dependency 'kumogata', '0.5.8'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 11.1'

data/lib/kumogata/template/elb.rb

@@ -83,22 +83,31 @@ def _elb_listeners(args)
 
   array = []
   listeners.each do |listener|
-    proto = listener[:protocol].upcase
+    proto = listener[:protocol] || "http"
     protocol = _valid_values(proto, %w( http https tcp ssl ), "http")
-    port = listener[:port] || case protocol
-                              when "http"
-                                80
-                              when "https"
-                                443
-                              end
-    lb_port = listener[:lb_port] || port
+    lb_port =
+      case protocol
+      when "http"
+        80
+      when "https"
+        443
+      end
+    instance_proto = listener[:instance_protocol] || protocol
+    instance_protocol = _valid_values(instance_proto, %w( http https tcp ssl ), "http")
+    instance_port =
+      case instance_protocol
+      when "http"
+        80
+      when "https"
+        443
+      end
     policies = []
     policies << "ELBSecurityPolicy-2015-05" if protocol == "https" or protocol == "ssl"
     ssl = _ref_string("ssl", listener)
 
     array << _{
-      InstancePort port
-      InstanceProtocol protocol.upcase
+      InstancePort instance_port
+      InstanceProtocol instance_protocol.upcase
       LoadBalancerPort lb_port
       PolicyNames policies unless policies.empty?
       Protocol protocol.upcase

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.2'
+KUMOGATA_TEMPLATE_VERSION = '0.0.3'

data/template/ec2-network-acl-entry.rb

@@ -9,7 +9,8 @@ name = _resource_name(args[:name], "network acl entry")
 cidr = args[:cidr] || "0.0.0.0/0"
 egress = _bool("egress", args, false)
 icmp = args[:icmp] || ""
-network_acl = _ref_string("network_acl", args, "network acl")
+network_acl = _ref_attr_string("vpc_network_acl", "DefaultNetworkAcl", args, "vpc")
+network_acl = _ref_string("network_acl", args, "network acl") if network_acl.empty?
 port_range = _ec2_port_range(args)
 protocol = _ec2_protocol_number(args[:protocol])
 rule_action = _valid_values(args[:action], %w( allow deny ), "allow")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-26 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'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: kumogata
   requirement: !ruby/object:Gem::Requirement