kumogata-template 0.0.29 → 0.0.30

data/template/output-name.rb

@@ -1,5 +1,7 @@
 #
 # Output name
 #
+require 'kumogata/template/helper'
 
-_output "#{args[:name]} name", ref_value: args[:name]
+_output "#{args[:name]} name",
+        ref_value: args[:name], export: _export_string(args, "name")

data/template/output-rds.rb

@@ -1,10 +1,14 @@
 #
 # Output rds
 #
+require 'kumogata/template/helper'
 
 _output "#{args[:name]} db instance",
-        ref_value: "#{args[:name]} db instance"
+        ref_value: "#{args[:name]} db instance",
+        export: _export_string(args, "db instance")
 _output "#{args[:name]} db instance address",
-        ref_value: [ "#{args[:name]} db instance", "Endpoint.Address" ]
+        ref_value: [ "#{args[:name]} db instance", "Endpoint.Address" ],
+        export: _export_string(args, "db instance endpoint address")
 _output "#{args[:name]} db instance port",
-        ref_value: [ "#{args[:name]} db instance", "Endpoint.Port" ]
+        ref_value: [ "#{args[:name]} db instance", "Endpoint.Port" ],
+        export: _export_string(args, "db instance endpoint port")

data/template/output-redshift.rb

@@ -1,10 +1,14 @@
 #
 # Output redshift
 #
+require 'kumogata/template/helper'
 
 _output "#{args[:name]} redshift cluster",
-        ref_value: "#{args[:name]} redshift cluster"
+        ref_value: "#{args[:name]} redshift cluster",
+        export: _export_string(args, "redshift cluster")
 _output "#{args[:name]} redshift cluster address",
-        ref_value: [ "#{args[:name]} redshift cluster", "Endpoint.Address" ]
+        ref_value: [ "#{args[:name]} redshift cluster", "Endpoint.Address" ],
+        export: _export_string(args, "redshift cluster endpoint address")
 _output "#{args[:name]} redshift cluster port",
-        ref_value: [ "#{args[:name]} redshift cluster", "Endpoint.Port" ]
+        ref_value: [ "#{args[:name]} redshift cluster", "Endpoint.Port" ],
+        export: _export_string(args, "redshift cluster endpoint port")

data/template/output-s3.rb

@@ -1,8 +1,16 @@
 #
-# output s3
+# Output s3
 #
+require 'kumogata/template/helper'
 
 bucket = "#{args[:name]} bucket"
 
-_output "#{bucket} s3 domain name", ref_value: [ bucket, "DomainName" ]
-_output "#{bucket} s3 web site url", ref_value: [ bucket, "WebsiteURL" ]
+_output "#{bucket} s3 domain name",
+        ref_value: [ bucket, "DomainName" ],
+        export: _export_string(args, "s3 domain name")
+_output "#{bucket} s3 web site url",
+        ref_value: [ bucket, "WebsiteURL" ],
+        export: _export_string(args, "s3 website url")
+_output "#{bucket} s3 dual stack domain name",
+        ref_value: [ bucket, "DualStackDomainName" ],
+        export: _export(args, "s3 dual stack domain name") if args.key? :ipv6

data/template/output-security-group.rb

@@ -1,5 +1,8 @@
 #
 # Output security group
 #
+require 'kumogata/template/helper'
 
-_output "#{args[:name]} security group", ref_value: "#{args[:name]} security group"
+_output "#{args[:name]} security group",
+        ref_value: "#{args[:name]} security group",
+        export: _export_string(args, "security group")

data/template/output-sqs.rb

@@ -1,5 +1,8 @@
 #
 # Output sqs
 #
+require 'kumogata/template/helper'
 
-_output "#{args[:name]} queue", ref_value: "#{args[:name]} queue"
+_output "#{args[:name]} queue",
+        ref_value: "#{args[:name]} queue",
+        export: _export_string(args, "queue")

data/template/output-topic.rb

@@ -1,6 +1,11 @@
 #
-# Output name + topic
+# Output name and topic
 #
+require 'kumogata/template/helper'
 
-_output "#{args[:name]} topic", ref_value: "#{args[:name]} topic"
-_output "#{args[:name]} topic name", ref_value: [ "#{args[:name]} topic", "TopicName" ]
+_output "#{args[:name]} topic",
+        ref_value: "#{args[:name]} topic",
+        export: _export_string(args, "topic")
+_output "#{args[:name]} topic name",
+        ref_value: [ "#{args[:name]} topic", "TopicName" ],
+        export: _export_string(args, "topic name")

data/template/output-vpc.rb

@@ -1,10 +1,22 @@
 #
 # Output VPC
 #
+require 'kumogata/template/helper'
 
 vpc = "#{args[:name]} vpc"
 
-_output "#{args[:name]} vpc", ref_value: vpc
-_output "#{args[:name]} vpc cidr block", ref_value: [ vpc, "CidrBlock" ]
-_output "#{args[:name]} vpc network acl", ref_value: [ vpc, "DefaultNetworkAcl" ]
-_output "#{args[:name]} vpc security group", ref_value: [ vpc, "DefaultSecurityGroup" ]
+_output "#{args[:name]} vpc",
+        ref_value: vpc,
+        export: _export_string(args, "vpc")
+_output "#{args[:name]} vpc cidr block",
+        ref_value: [ vpc, "CidrBlock" ],
+        export: _export_string(args, "vpc cidr block")
+_output "#{args[:name]} vpc network acl",
+        ref_value: [ vpc, "DefaultNetworkAcl" ],
+        export: _export_string(args, "vpc default nework acl")
+_output "#{args[:name]} vpc security group",
+        ref_value: [ vpc, "DefaultSecurityGroup" ],
+        export: _export_string(args, "vpc default security group")
+_output "#{args[:name]} vpc ipv6 cidr blocks",
+        ref_value: [ vpc, "Ipv6CidrBlocks" ],
+        export: _export_string(args, "vpc ipv6 cidr bocks") if args.key? :ipv6

data/template/output.rb

@@ -5,6 +5,7 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name])
+description = args[:description] || "description of #{name}"
 value =
   if args.key? :value
     if args[:value].is_a?(Array) and args[:value].length == 2
@@ -21,9 +22,10 @@ value =
   else
     name
   end
-description = args[:description] || "description of #{name}"
+export = _export(args)
 
 _(name) do
   Description description
   Value value
+  Export export unless export.empty?
 end

data/template/rds-db-instance.rb

@@ -16,6 +16,12 @@ auto = _bool("auto", args, true)
 az = _availability_zone(args, false)
 backup_retention = args[:backup_retention] || 7
 character = args[:character] || ""
+copy_tags =
+  if args.key? :copy_tags
+    _bool("copy_tags", args, true)
+  else
+    ""
+  end
 cluster = _ref_string("cluster", args, "db cluster")
 instance_class = _ref_string("instance_class", args, "db instance classes")
 instance_class = _valid_values(instance_class, RDS_INSTANCE_CLASSES, RDS_DEFAULT_INSTANCE_CLASS) unless instance_class.is_a? Hash
@@ -56,6 +62,7 @@ _(name) do
     AvailabilityZone az unless multi_az
     BackupRetentionPeriod backup_retention if 0 < backup_retention
     CharacterSetName character if !character.empty? and engine =~ /^oracle.*$/
+    CopyTagsToSnapshot copy_tags unless copy_tags.empty?
     DBClusterIdentifier cluster if engine == "aurora" and !cluster.empty?
     DBInstanceClass instance_class
     DBInstanceIdentifier instance_id

data/template/redshift-cluster.rb

@@ -15,6 +15,7 @@ version = args[:version] || ""
 db_name = _ref_string("db_name", args, "db name")
 elastic = args[:elastic] || ""
 encrypted = _bool("encrypted", args, false)
+iam_role = args[:iam_role] || ""
 user_name = _ref_string("user_name", args, "cluster master user name")
 user_password = _ref_string("user_password", args, "cluster master user password")
 node = _ref_string("node", args, "redshift cluster node types")
@@ -45,6 +46,7 @@ _(name) do
     Encrypted encrypted if encrypted == true
     #HsmClientCertificateIdentifie
     #HsmConfigurationIdentifier
+    IamRoles iam_role unless iam_role.empty?
     #KmsKeyId
     MasterUsername user_name
     MasterUserPassword user_password

data/template/sqs-queue.rb

@@ -5,7 +5,19 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "queue")
+content =
+  if args.key? :content
+    _bool("content", args, true)
+  else
+    ""
+  end
 deplay = args[:deplay] || 0
+fifo =
+  if args.key? :fifo
+    _bool("fifo", args, true)
+  else
+    ""
+  end
 max = args[:max] || 262144   # default 256KiB
 retention = args[:retention] || 345600   # default 4 days
 queue = _ref_name("queue", args)
@@ -16,7 +28,9 @@ visibility = args[:visibility] || 30   # default 30 seconds
 _(name) do
   Type "AWS::SQS::Queue"
   Properties do
+    ContentBasedDeduplication content unless content.empty?
     DelaySeconds deplay
+    FifoQueue fio unless fifo.empty?
     MaximumMessageSize max
     MessageRetentionPeriod retention
     QueueName queue

data/test/abstract_unit.rb

@@ -1,13 +1,24 @@
 require 'minitest/autorun'
-require 'kumogata'
-require 'kumogata/argument_parser'
+require 'kumogata2'
+require 'kumogata2/cli/option_parser'
+require 'kumogata2/plugin/ruby'
 require 'json'
 require 'tempfile'
+require 'yaml'
 
 # for only test
 ENV['TZ'] = 'Asia/Tokyo'
 
-class Kumogata::Client
+class Kumogata2::Client
+  include Kumogata2::Logger::Helper
+
+  def initialize(options)
+    @options = options.kind_of?(Hashie::Mash) ? options : Hashie::Mash.new(options)
+    @plugin_by_ext = {}
+  end
+end
+
+class Kumogata2::Plugin::Ruby::Context
   def define_template_func(scope, path_or_url)
     functions = ""
     Dir.glob("template/*.rb").all? do |file|
@@ -73,6 +84,11 @@ def tempfile(content, template_ext = nil)
   basename = "#{File.basename __FILE__}.#{$$}"
   basename = [basename, template_ext] if template_ext
 
+  content = <<EOS
+template do
+  #{content}
+end
+EOS
   Tempfile.open(basename) do |f|
     f << content
     f.flush
@@ -84,14 +100,16 @@ end
 def run_client(template)
   $stdout = open('/dev/null', 'w') unless ENV['DEBUG']
 
-  kumogata_options = Kumogata::ArgumentParser::DEFAULT_OPTIONS
-  kumogata_options[:output_format] = 'json'
-  kumogata_options[:result_log] = '/dev/null'
-  kumogata_options[:command_result_log] = '/dev/null'
+  Kumogata2::Plugin.load_plugins
+
+  options = Kumogata2::CLI::OptionParser::DEFAULT_OPTIONS
+  options[:output_format] = 'json'
+  options[:result_log] = '/dev/null'
+  options[:command_result_log] = '/dev/null'
   template_ext = '.rb'
 
   template = tempfile(template, template_ext) do |f|
-    Kumogata::Client.new(kumogata_options).send(:evaluate_template, f, f.path)
+    Kumogata2::Client.new(options).send(:open_template, f.path)
   end
 end
 
@@ -99,3 +117,8 @@ def run_client_as_json(template)
   eval_template = run_client(template)
   JSON.pretty_generate(eval_template)
 end
+
+def run_client_as_yaml(template)
+  eval_template = run_client(template)
+  YAML.dump(eval_template)
+end

data/test/elasticbeanstalk_test.rb

@@ -2,9 +2,9 @@ require 'abstract_unit'
 require 'kumogata/template/elasticbeanstalk'
 
 class ElasticbeantalkTest < Minitest::Test
-  def test_elasticbeanstalk_option
+  def test_elasticbeanstalk_options
     template = <<-EOS
-Test _elasticbeanstalk_option([ namespace: "test", option: "test", value: "test" ])
+Test _elasticbeanstalk_options([ name: "test", option: "test", value: "test" ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -39,7 +39,7 @@ Test _elasticbeanstalk_configuration(application: "test", template: "test")
 
   def test_elasticbeanstalk_tier
     template = <<-EOS
-Test _elasticbeanstalk_tier(name: "test")
+Test _elasticbeanstalk_tier("test")
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS