kumogata-template 0.0.15 → 0.0.16

data/template/logs-subscription_filter.rb

@@ -0,0 +1,24 @@
+#
+# Logs subscription filter resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/logs'
+
+name = _resource_name(args[:name], "logs subscription filter")
+dest = _ref_attr_string("dest", "Arn", args, "role")
+# Filter and Pattern Syntax
+# http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html
+pattern = args[:pattern]
+group = _ref_name("group", args)
+role = _ref_attr_string("role", "Arn", args, "role")
+
+_(name) do
+  Type "AWS::Logs::SubscriptionFilter"
+  Properties do
+    DestinationArn dest
+    FilterPattern pattern
+    LogGroupName group
+    RoleArn role
+  end
+end

data/template/rds-db-instance.rb

@@ -26,6 +26,8 @@ parameter = "default.mysql5.7" if parameter.empty?
 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")
+domain = args[:domain] || ""
+domain_iam = args[:domain_iam] || ""
 engine_version = _ref_string("engine_version", args, "db engine version")
 engine_version = RDS_DEFAULT_ENGINE_VERSION[engine.to_sym] if engine_version.empty?
 iops = args[:iops] || ""
@@ -42,6 +44,7 @@ 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 = args[:timezone] || ""
 security_groups = _ref_array("security_groups", args, "security group")
 
 _(name) do
@@ -61,6 +64,8 @@ _(name) do
     DBSecurityGroups security if security_groups.empty?
     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 iops.empty?
@@ -78,6 +83,7 @@ _(name) do
     StorageEncrypted storage_encrypted if storage_encrypted == true
     StorageType storage_type
     Tags tags
+    Timezone timezone unless timezone.empty?
     VPCSecurityGroups security_groups unless security_groups.empty?
   end
 end

data/template/s3-bucket-policy.rb

@@ -1,5 +1,5 @@
 #
-# S3 bucket policy resource
+# S3 Bucket Policy resource
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
 #
 require 'kumogata/template/helper'
@@ -7,6 +7,7 @@ require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "bucket policy")
 bucket = _ref_string("bucket", args, "bucket")
+policy = _iam_policy_document("policy_document", args)
 
 _(name) do
   Type "AWS::S3::BucketPolicy"
@@ -14,7 +15,7 @@ _(name) do
     Bucket bucket
     PolicyDocument do
       Version "2012-10-17"
-      Statement _iam_policy_document("policy_document", args)
+      Statement policy
     end
   end
 end

data/template/s3-bucket.rb

@@ -1,5 +1,5 @@
 #
-# S3 bucket resource
+# S3 Bucket resource
 # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
 #
 require 'kumogata/template/helper'

data/template/sns-subscription.rb

@@ -0,0 +1,20 @@
+#
+# SNS Subscription resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/sns'
+
+name = _resource_name(args[:name], "sns subscription")
+protocol = _sns_to_protocol(args[:protocol])
+endpoint = _sns_to_endpoint(protocol, args[:endpoint])
+topic = _ref_attr_string("topic", "Arn", args, "topic")
+
+_(name) do
+  Type "AWS::SNS::Subscription"
+  Properties do
+    Endpoint endpoint
+    Protocol protocol
+    TopicArn topic
+  end
+end

data/template/sns-topic.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/sns'
 
 name = _resource_name(args[:name], "topic")
 display = args[:display] || ""
-subscription = _sns_subscription(args)
+subscription = _sns_subscription_list(args)
 topic = _ref_name("topic", args)
 
 _(name) do

data/test/abstract_unit.rb

@@ -1,24 +1,13 @@
 require 'minitest/autorun'
-require 'kumogata2'
-require 'kumogata2/cli/option_parser'
-require 'kumogata2/plugin/ruby'
+require 'kumogata'
+require 'kumogata/argument_parser'
 require 'json'
 require 'tempfile'
 
 # 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 = {}
-    ## Do not initialize AWS client
-  end
-end
-
-class Kumogata2::Plugin::Ruby::Context
+class Kumogata::Client
   def define_template_func(scope, path_or_url)
     functions = ""
     Dir.glob("template/*.rb").all? do |file|
@@ -84,11 +73,6 @@ 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
@@ -100,16 +84,14 @@ end
 def run_client(template)
   $stdout = open('/dev/null', 'w') unless ENV['DEBUG']
 
-  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'
+  kumogata_options = Kumogata::ArgumentParser::DEFAULT_OPTIONS
+  kumogata_options[:output_format] = 'json'
+  kumogata_options[:result_log] = '/dev/null'
+  kumogata_options[:command_result_log] = '/dev/null'
   template_ext = '.rb'
 
   template = tempfile(template, template_ext) do |f|
-    Kumogata2::Client.new(options).send(:open_template, f.path)
+    Kumogata::Client.new(kumogata_options).send(:evaluate_template, f, f.path)
   end
 end
 

data/test/codebuild_test.rb

@@ -0,0 +1,76 @@
+require 'abstract_unit'
+require 'kumogata/template/codebuild'
+
+class CodebuildTest < Minitest::Test
+  def test_codebuild_artifacts
+    template = <<-EOS
+Test _codebuild_artifacts({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Type": "no_artifacts"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_codebuild_environment
+    template = <<-EOS
+Test _codebuild_environement({ compute: "large", env: { test: "test" }, image: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "ComputeType": "BUILD_GENERAL1_LARGE",
+    "EnvironmentVariables": [
+      {
+        "Name": "test",
+        "Value": "test"
+      }
+    ],
+    "Image": "test",
+    "Type": "LINUX_CONTAINER"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_codebuild_environment_hash
+    template = <<-EOS
+Test _codebuild_environement_hash({ test: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "Name": "test",
+      "Value": "test"
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_codebuild_source
+    template = <<-EOS
+Test _codebuild_source({ type: "github", location: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Location": "test",
+    "Type": "GITHUB"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/elb_test.rb

@@ -122,6 +122,50 @@ Test _elb_listeners({})
       "Protocol": "HTTP"
     }
   ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _elb_listeners({ listeners: [ { protocol: "https", ssl: "test" } ] })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "InstancePort": "443",
+      "InstanceProtocol": "HTTPS",
+      "LoadBalancerPort": "443",
+      "PolicyNames": [
+        "ELBSecurityPolicy-2016-08"
+      ],
+      "Protocol": "HTTPS",
+      "SSLCertificateId": "test"
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _elb_listeners({ listeners: [ { protocol: "https", ssl: "test", policy: "TLS-1-2-2017-01" } ] })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "InstancePort": "443",
+      "InstanceProtocol": "HTTPS",
+      "LoadBalancerPort": "443",
+      "PolicyNames": [
+        "ELBSecurityPolicy-TLS-1-2-2017-01"
+      ],
+      "Protocol": "HTTPS",
+      "SSLCertificateId": "test"
+    }
+  ]
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/logs_test.rb

@@ -0,0 +1,23 @@
+require 'abstract_unit'
+require 'kumogata/template/logs'
+
+class LogsTest < Minitest::Test
+  def test_logs_metric_filter_transformations
+    template = <<-EOS
+Test _logs_metric_filter_transformations(transformations: [ { name: "test", ns: "test", value: "test" } ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "MetricName": "test",
+      "MetricNamespace": "test",
+      "MetricValue": "test"
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/s3_test.rb

@@ -2,7 +2,6 @@ require 'abstract_unit'
 require 'kumogata/template/s3'
 
 class S3Test < Minitest::Test
-
   def test_s3_cors
     template = <<-EOS
 Test _s3_cors(cors: [ { headers: "test", methods: "test", origins: "test", exposed_headers: "test", id: "test", max_age: "test" } ])

data/test/sns_test.rb

@@ -4,7 +4,7 @@ require 'kumogata/template/sns'
 class SnsTest < Minitest::Test
   def test_sns_subscription
     template = <<-EOS
-Test _sns_subscription(subscription: [ { protocol: "lambda", endpoint: "test" } ])
+Test _sns_subscription_list(subscription: [ { protocol: "lambda", endpoint: "test" } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS

data/test/template/codebuild-project_test.rb

@@ -0,0 +1,72 @@
+require 'abstract_unit'
+
+class CodebuildProjectTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_codebuild_project "test", { artifacts: { type: "test" },
+                             environment: { compute: "large", image: "test", env: { "test": "test" } },
+                             project: "test",
+                             service: "test",
+                             source: { type: "github" } }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestCodebuildProject": {
+    "Type": "AWS::CodeBuild::Project",
+    "Properties": {
+      "Artifacts": {
+        "Type": "no_artifacts"
+      },
+      "Environment": {
+        "ComputeType": "BUILD_GENERAL1_LARGE",
+        "EnvironmentVariables": [
+          {
+            "Name": "test",
+            "Value": "test"
+          }
+        ],
+        "Image": "test",
+        "Type": "LINUX_CONTAINER"
+      },
+      "Name": "test",
+      "ServiceRole": "test",
+      "Source": {
+        "Location": "",
+        "Type": "GITHUB"
+      },
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/codecommit-repository_test.rb

@@ -0,0 +1,21 @@
+require 'abstract_unit'
+
+class CodecommitRepositoryTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_codecommit_repository "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestCodecommitRepository": {
+    "Type": "AWS::CodeCommit::Repository",
+    "Properties": {
+      "RepositoryName": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end