kumogata-template 0.0.35 → 0.0.36

data/template/rds-db-instance.rb

@@ -5,171 +5,95 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "db instance")
+engine = _valid_values(args[:engine],
+                       %w( mysql mariadb
+                           oracle-se1 oracle-se oracle-ee
+                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web
+                           postgres aurora aurora-mysql aurora-postgresql ),
+                       RDS_DEFAULT_ENGINE)
 allocated = _ref_string_default("allocated", args, "", 5)
 allow = _bool("allow", args, true)
 auto = _bool("auto", args, true)
 az = _availability_zone(args, false)
-backup_retention = _ref_string_default("backup_retention", args, "", 7)
-character = _ref_string_default("character", args)
+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_default("cluster", args, "db cluster")
-instance_class = _ref_string_default("instance_class", args, "db instance classes", RDS_DEFAULT_INSTANCE_CLASS)
-instance_class = _valid_values(instance_class, RDS_INSTANCE_CLASSES, RDS_DEFAULT_INSTANCE_CLASS) if instance_class.is_a? String
-instance_id = _ref_name("instance_id", args, "db instance id")
+cluster = _ref_string("cluster", args, "db cluster")
+is_cluster = cluster.empty? ? false : true
+instance_class = _ref_string("instance_class", args, "db instance class")
+instance_class = _valid_values(instance_class, RDS_INSTANCE_CLASSES, RDS_DEFAULT_INSTANCE_CLASS) unless instance_class.is_a? Hash
+instance_id = _name("instance_id", args)
 db_name = _ref_string("db_name", args, "db name")
-db_name = _ref_string("database", args, "database") if _empty? db_name
-parameter = _ref_string("parameter", args, "db parameter group")
-# TODO support AWS::RDS::DBSecurityGroup
-# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html
-db_security_groups = _ref_array("db_security_groups", args, "db security group")
+parameter = _ref_string_default("parameter", args, "db parameter group", "default.mysql5.7")
+security = _ref_array("security_groups", args, "security group")
+subnet_group = _ref_string("subnet_group", args, "db subnet group")
 snapshot = _ref_string("snapshot", args, "db snapshot")
-subnet = _ref_string("subnet", args, "db subnet group")
-domain = _ref_string("domain", args, "db domain")
-domain_iam = _ref_string("domain_iam", args, "db domain iam")
-# http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html
-engine = _valid_values(args[:engine],
-                       %w( aurora mariadb mysql
-                           oracle-ee oracle-se2 oracle-se1 oracle-se postgres
-                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web ), RDS_DEFAULT_ENGINE)
+domain = args[:domain] || ""
+domain_iam = args[:domain_iam] || ""
 engine_version = _ref_string_default("engine_version", args, "db engine version", RDS_DEFAULT_ENGINE_VERSION[engine.to_sym])
-iops =
-  if _ref_key?("iops", args, "db iops")
-    _ref_string_default("iops", args, "db iops", 1000)
-  else
-    ""
-  end
-kms = _ref_attr_string("kms", "Arn", args)
-license = _valid_values(args[:license], %w( license-included bring-your-own-license general-public-license ))
+iops = args[:iops] || ""
 user_name = _ref_string("user_name", args, "db master user name")
 user_password = _ref_string("user_password", args, "db master user password")
-monitoring_interval = _ref_number("monitoring_interval", args, "db monitoring interval")
-monitoring_role_arn = _ref_string("monitoring_role_arn", args, "db monitoring role arn")
+monitoring_interval = _valid_values(args[:monitoring_interval], %w( 0 1 5 10 15 30 60 ), 0)
+monitoring_role = _ref_attr_string('monitoring_role', 'Arn', args, 'role')
 multi_az = _bool("multi_az", args, false)
 option = _ref_string("option", args, "db option group")
 port = _ref_string_default("port", args, "db port", PORT[engine.to_sym])
 backup_window = _window_time("rds", args[:backup_start] || DEFAULT_SNAPSHOT_TIME[:rds])
 maintenance = _maintenance_window("rds", args[:maintenance] || DEFAULT_MAINTENANCE_TIME[:rds])
 publicly = _bool("publicly", args, false)
-source_db = _ref_string("source_db", args, "db instance id")
-encrypted = _bool("encrypted", args, false)
+source_db = _ref_string("source_db", args, "db source db")
+storage_encrypted = _bool("encrypted", args, false)
 storage_type = _valid_values(args[:storage_type], %w( standard gp2 io1 ), "gp2")
 tags = _tags(args)
-timezone = _ref_string_default("timezone", args, "db timezone")
+timezone = args[:timezone] || ""
 security_groups = _ref_array("security_groups", args, "security group")
-## TODO use helper
-depends = _resource_name(args[:master_instance], "db instance") unless _empty? source_db
-
-allocated = "" unless _empty? cluster
-character = "" if engine =~ /aurora/
-parameter =
-  if _empty? parameter
-    if engine == "mysql" and engine_version =~ /5.7/
-      "default.mysql5.7"
-    elsif engine == "aurora" and engine_version =~ /5.6/
-      "default.aurora5.6"
-    elsif engine == "postgres" and engine_version =~ /9.4/
-      "default.postgres9.4"
-    elsif engine == "mariadb" and engine_version =~ /10.0/
-      "default.mariadb10.0"
-    else
-      nil
-    end
-  else
-    nil
-  end
-instance_id = instance_id.downcase if instance_id.is_a? String
-if engine !~ /sqlserver/
-  domain = ""
-  domain_iam = ""
-end
-db_name = "" unless _empty? snapshot
-iops = "" if storage_type != "io1"
-multi_az = false unless _empty? az
-source_db = "" if engine !~ /(mysql|mariadb|postgres)/
-unless _empty? source_db
-  multi_az = false
-  snapshot = ""
-  backup_retention = ""
-  db_name = ""
-  subnet = ""
-  user_name = ""
-  user_password = ""
-  backup_window = ""
-end
-encrypted = true unless _empty? kms
-if encrypted
-  cluster = ""
-  snapshot = ""
-  source_db = ""
-end
-security_groups = "" unless _empty? db_security_groups
-unless _empty? cluster
-  allocated = ""
-  backup_retention = ""
-  character = ""
-  db_security_groups = []
-  db_name = ""
-  subnet = ""
-  user_name = ""
-  user_password = ""
-  multi_az = ""
-  option = ""
-  backup_window = ""
-  maintenance = ""
-  port = ""
-  source_db = ""
-  security_groups = []
-  backup_window = ""
-  maintenance = ""
-  storage_type = ""
-end
 
 _(name) do
   Type "AWS::RDS::DBInstance"
   Properties do
-    AllocatedStorage allocated unless _empty? allocated
+    AllocatedStorage allocated unless is_cluster
     AllowMajorVersionUpgrade allow
     AutoMinorVersionUpgrade auto
-    AvailabilityZone az unless _empty? az
-    BackupRetentionPeriod backup_retention unless _empty? backup_retention
-    CharacterSetName character unless _empty? character
-    CopyTagsToSnapshot copy_tags unless _empty? copy_tags
-    DBClusterIdentifier cluster unless _empty? cluster
+    AvailabilityZone az if !multi_az and !is_cluster
+    BackupRetentionPeriod backup_retention if 0 < backup_retention and !is_cluster
+    CharacterSetName character if !character.empty? and engine =~ /^oracle.*$/
+    CopyTagsToSnapshot copy_tags unless copy_tags.empty?
+    DBClusterIdentifier cluster if is_cluster
     DBInstanceClass instance_class
-    DBInstanceIdentifier instance_id unless _empty? instance_id
-    DBName db_name unless _empty? db_name
-    DBParameterGroupName parameter unless _empty? parameter
-    DBSecurityGroups db_security_groups unless _empty? db_security_groups
-    DBSnapshotIdentifier snapshot unless _empty? snapshot
-    DBSubnetGroupName subnet unless _empty? subnet
-    Domain domain unless _empty? domain
-    DomainIAMRoleName domain_iam unless _empty? domain_iam
+    DBInstanceIdentifier instance_id
+    DBName db_name if snapshot.empty? and !is_cluster
+    DBParameterGroupName parameter unless parameter.empty?
+    DBSecurityGroups security unless !security_groups.empty? and !is_cluster
+    DBSnapshotIdentifier snapshot unless snapshot.empty?
+    DBSubnetGroupName subnet_group
+    Domain domain unless domain.empty? and engine !~ /sqlserver/
+    DomainIAMRoleName domain_iam unless domain_iam.empty? and engine !~ /sqlserver/
     Engine engine
     EngineVersion engine_version
-    Iops iops unless _empty? iops
-    KmsKeyId kms unless _empty? kms
-    LicenseModel license unless _empty? license
-    MasterUsername user_name unless _empty? user_name
-    MasterUserPassword user_password unless _empty? user_password
-    MonitoringInterval monitoring_interval unless _empty? monitoring_interval
-    MonitoringRoleArn monitoring_role_arn unless _empty? monitoring_role_arn
-    MultiAZ multi_az unless _empty? multi_az
-    OptionGroupName option unless _empty? option
-    Port port unless _empty? port
-    PreferredBackupWindow backup_window unless _empty? backup_window
-    PreferredMaintenanceWindow maintenance unless _empty? maintenance
+    Iops iops unless iops.empty?
+    #KmsKeyId
+    #LicenseModel
+    MasterUsername user_name unless is_cluster
+    MasterUserPassword user_password unless is_cluster
+    MonitoringInterval monitoring_interval
+    MonitoringRoleArn monitoring_role unless monitoring_role.empty?
+    MultiAZ multi_az
+    OptionGroupName option unless option.empty?
+    Port port unless is_cluster
+    PreferredBackupWindow backup_window unless is_cluster
+    PreferredMaintenanceWindow maintenance unless is_cluster
     PubliclyAccessible publicly
-    SourceDBInstanceIdentifier source_db unless _empty? source_db
-    StorageEncrypted encrypted unless _empty? kms
-    StorageType storage_type unless _empty? storage_type
+    SourceDBInstanceIdentifier source_db unless source_db.empty?
+    StorageEncrypted storage_encrypted if storage_encrypted == true and !is_cluster
+    StorageType storage_type unless is_cluster
     Tags tags
-    Timezone timezone unless _empty? timezone
-    VPCSecurityGroups security_groups unless _empty? security_groups
+    Timezone timezone unless timezone.empty?
+    VPCSecurityGroups security_groups if !security_groups.empty? and !is_cluster
   end
-  DependsOn depends unless _empty? depends
 end

data/template/rds-db-parameter-group.rb

@@ -3,13 +3,39 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/rds'
+
+engine = _valid_values(args[:engine],
+                       %w( mysql mariadb
+                           oracle-se1 oracle-se oracle-ee
+                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web
+                           postgresql aurora aurora-mysql aurora-postgresql ),
+                       'mysql')
+default_family =
+  case engine
+  when 'mysql'
+    'mysql5.7'
+  when 'mariadb'
+    'mariadb10.2'
+  when 'postgresql'
+    'postgres9.6'
+  when 'aurora'
+    'aurora5.6'
+  when 'aurora-mysql'
+    'aurora-mysql5.7'
+  when 'aurora-postgresql'
+    'aurora-postgresql9.6'
+  end
 
 name = _resource_name(args[:name], "db parameter group")
-description = args[:description] || "#{args[:name]} db parameter group description"
-family = args[:family] || "mysql5.7"
-parameters = args[:parameters]
+description = _ref_string_default("description", args, '',
+                                  "#{args[:name]} db parameter group description")
+family = _ref_string_default("family", args, "db parameter group", default_family)
+parameters = args[:parameters] || {}
 tags = _tags(args)
 
+parameters = parameters.merge(_rds_to_parameter_charset(args[:charset])) if args.key? :charset
+
 _(name) do
   Type "AWS::RDS::DBParameterGroup"
   Properties do

data/template/rds-db-subnet-group.rb

@@ -5,7 +5,7 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "db subnet group")
-description = args[:description] || "#{args[:name]} db subnet group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} db subnet group description")
 subnets = _ref_array("subnets", args, "subnet")
 tags = _tags(args)
 

data/template/rds-event-subscription.rb

@@ -3,6 +3,7 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/rds'
 
 name = _resource_name(args[:name], "event subscription")
 enabled = _bool("enabled", args, true)
@@ -13,10 +14,7 @@ event_categories = args[:categories] ||
 sns = _ref_attr_string("sns", "Arn", args, "role")
 sns = _ref_string("sns_arn", args) if sns.empty?
 sources = _ref_array("sources", args, "db instance")
-source_type = _valid_values(args[:source_type],
-                            %w( db-instance db-parameter-group
-                                db-security-group db-snapshot ),
-                            "db-instance")
+source_type = _rds_to_event_subscription_source(args[:source_type])
 source_prefix =
   case source_type
   when "db-instance"

data/template/rds-option-group.rb

@@ -3,12 +3,35 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/rds'
 
 name = _resource_name(args[:name], "option group")
-engine = args[:engine] || "mysql"
-major = args[:major] || "5.7"
-description = args[:description] || "#{args[:name]} option group description"
-configurations = args[:configurations]
+engine = _valid_values(args[:engine],
+                       %w( mysql mariadb
+                           oracle-se1 oracle-se oracle-ee
+                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web
+                           postgres aurora aurora-mysql aurora-postgresql ),
+                       RDS_DEFAULT_ENGINE)
+major =
+  case engine
+  when 'mysql'
+    '5.7'
+  when 'mariadb'
+    '10.0'
+  when 'postgres'
+    '9.6'
+  when 'aurora'
+    '5.6'
+  when 'aurora-mysql'
+    '5.7'
+  when 'aurora-postgresql'
+    '9.6'
+  else
+    args[:major] || ""
+  end
+description = _ref_string_default("description", args, '',
+                                  "#{args[:name]} option group description")
+configurations = _rds_option_group_configurations(args)
 tags = _tags(args)
 
 _(name) do
@@ -17,7 +40,7 @@ _(name) do
     EngineName engine
     MajorEngineVersion major
     OptionGroupDescription description
-    OptionGroupConfigurations configurations
+    OptionConfigurations configurations
     Tags tags
   end
 end

data/template/redshift-cluster-parameter-group.rb

@@ -6,9 +6,10 @@ require 'kumogata/template/helper'
 require 'kumogata/template/redshift'
 
 name = _resource_name(args[:name], "redshift cluster parameter group")
-description = args[:description] || "#{args[:name]} redshift cluster parameter group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} redshift cluster parameter group description")
 family = args[:family] || "redshift-1.0"
 parameters = _redshift_parameters(args)
+tags = _tags(args)
 
 _(name) do
   Type "AWS::Redshift::ClusterParameterGroup"
@@ -16,5 +17,6 @@ _(name) do
     Description description
     ParameterGroupFamily family
     Parameters parameters
+    Tags tags
   end
 end

data/template/redshift-cluster-security-group.rb

@@ -0,0 +1,17 @@
+#
+# Redshift ClusterSecurityGroup resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "redshift cluster security group")
+description = _ref_string_default("description", args, '', "#{args[:name]} redshift cluster security group description")
+tags = _tags(args)
+
+_(name) do
+  Type "AWS::Redshift::ClusterSecurityGroup"
+  Properties do
+    Description description
+    Tags tags
+  end
+end

data/template/redshift-cluster-subnet-group.rb

@@ -5,13 +5,15 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "redshift cluster subnet group")
-description = args[:description] || "#{args[:name]} redshift cluster subnet group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} redshift cluster subnet group description")
 subnets = _ref_array("subnets", args, "subnet")
+tags = _tags(args)
 
 _(name) do
   Type "AWS::Redshift::ClusterSubnetGroup"
   Properties do
     Description description
     SubnetIds subnets
+    Tags tags
   end
 end

data/template/redshift-cluster.rb

@@ -3,31 +3,32 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/redshift'
 
 name = _resource_name(args[:name], "redshift cluster")
 allow = _bool("allow", args, true)
 snapshot_retention = args[:snapshot_retention] || DEFAULT_SNAPSHOT_NUM
-az = _availability_zone(args, false)
+az = _availability_zone(args, false, "redshift cluster zone name")
 parameter = _ref_string("parameter", args, "redshift cluster parameter group")
 subnet = _ref_string("subnet", args, "redshift cluster subnet group")
-type = _valid_values(args[:type], [ "single-node", "multi-node" ], "single-node")
+num = args[:num] || 1
+type = (num == 1) ? "single-node" : "multi-node"
 version = args[:version] || ""
-db_name = _ref_string("db_name", args, "db name")
+db_name = _ref_string("db_name", args, "redshift cluster 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")
-node = _valid_values(args[:node], REDSHIFT_NODE_TYPES, REDSHIFT_DEFAULT_NODE_TYPE) unless node.is_a? Hash
-num = args[:num] || 1
+roles = _ref_array("roles", args, "role", "Arn")
+logging = _redshift_logging(args)
+user_name = _ref_string("user_name", args, "redshift cluster master user name")
+user_password = _ref_string("user_password", args, "redshift cluster master user password")
+node = _ref_string_default("node", args, "redshift cluster node types", REDSHIFT_DEFAULT_NODE_TYPE)
 owner = args[:owner] || ""
-port = _ref_string("port", args, "cluster port")
-port = PORT[:redshift] if port.empty?
+port = _ref_string_default("port", args, "redshift cluster port", PORT[:redshift])
 maintenance = _maintenance_window("redshift", args[:maintenance] || DEFAULT_MAINTENANCE_TIME[:redshift])
 publicly = _bool("publicly", args, false)
 snapshot_cluster = args[:snapshot_cluster] || ""
 snapshot_id = args[:snapshot_id] || ""
+tags = _tags(args)
 security_groups = _ref_array("security_groups", args, "security group")
 
 _(name) do
@@ -46,8 +47,9 @@ _(name) do
     Encrypted encrypted if encrypted == true
     #HsmClientCertificateIdentifie
     #HsmConfigurationIdentifier
-    IamRoles iam_role unless iam_role.empty?
+    IamRoles roles unless roles .empty?
     #KmsKeyId
+    LoggingProperties logging unless logging.empty?
     MasterUsername user_name
     MasterUserPassword user_password
     NodeType node
@@ -58,6 +60,7 @@ _(name) do
     PubliclyAccessible publicly
     SnapshotClusterIdentifier  snapshot_cluster unless snapshot_cluster.empty?
     SnapshotIdentifier snapshot_id unless snapshot_id.empty?
+    Tags tags
     VpcSecurityGroupIds security_groups unless security_groups.empty?
   end
 end

data/template/s3-bucket.rb

@@ -7,21 +7,25 @@ require 'kumogata/template/s3'
 
 name = _resource_name(args[:name], "bucket")
 access =
-  if args.key? :website
-    "PublicRead"
-  else
+  if args.key? :access
     _s3_to_access(args[:access])
+  else
+    ''
   end
-bucket = _ref_name("bucket", args)
+bucket = _name("bucket", args)
 cors = _s3_cors(args)
 lifecycle = _s3_lifecycle(args)
 logging = _s3_logging(args)
 notification = _s3_notification(args)
 replication = _s3_replication(args)
-tags = _tags(args)
+tags = _tags(args, "bucket")
 versioning = _s3_versioning(args)
 website = _s3_website(args)
 deletion_policy = _s3_to_deletion_policy(args[:deletion_policy])
+depends = _depends([ { ref_lambda_permission: 'lambda permission' } ], args)
+
+access = "PublicRead" if !website.empty? and access == ''
+access = "Private" if access.empty?
 
 _(name) do
   Type "AWS::S3::Bucket"
@@ -38,4 +42,5 @@ _(name) do
     WebsiteConfiguration website unless website.empty?
   end
   DeletionPolicy deletion_policy
+  DependsOn depends unless depends.empty?
 end

data/template/sns-topic.rb

@@ -6,9 +6,9 @@ require 'kumogata/template/helper'
 require 'kumogata/template/sns'
 
 name = _resource_name(args[:name], "topic")
-display = _real_name("display", args)
+display = _name("display", args)
 subscription = _sns_subscription_list(args)
-topic = _real_name("topic", args)
+topic = _name("topic", args)
 
 _(name) do
   Type "AWS::SNS::Topic"

data/template/sqs-queue.rb

@@ -20,7 +20,7 @@ fifo =
   end
 max = args[:max] || 262144   # default 256KiB
 retention = args[:retention] || 345600   # default 4 days
-queue = _ref_name("queue", args)
+queue = _name("queue", args)
 receive = args[:receive] || 0
 redrive = args[:redrive] || ""
 visibility = args[:visibility] || 30   # default 30 seconds

data/test/abstract_unit.rb

@@ -5,20 +5,13 @@ require 'kumogata2/plugin/ruby'
 require 'json'
 require 'tempfile'
 require 'yaml'
+require 'kumogata/template/const'
 
 # for only test
 ENV['TZ'] = 'Asia/Tokyo'
 
-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
+  remove_method :define_template_func
   def define_template_func(scope, path_or_url)
     functions = ""
     Dir.glob("template/*.rb").all? do |file|