kumogata-template 0.0.15 → 0.0.16

data/test/template/codedeploy-application_test.rb

@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class CodedeploApplicationTest < Minitest::Test
+class CodedeployApplicationTest < Minitest::Test
   def test_normal
     template = <<-EOS
 _codedeploy_application "test", application: "test"

data/test/template/ec2-network-acl-entry_test.rb

@@ -16,7 +16,7 @@ _ec2_network_acl_entry "test", ref_network_acl: "test"
       "NetworkAclId": {
         "Ref": "TestNetworkAcl"
       },
-      "PortRange\": {
+      "PortRange": {
         "From": "0",
         "To": "65535"
       },
@@ -45,7 +45,7 @@ _ec2_network_acl_entry "test", ref_network_acl: "my", action: "allow", number: 1
       "NetworkAclId": {
         "Ref": "MyNetworkAcl"
       },
-      "PortRange\": {
+      "PortRange": {
         "From": "53",
         "To": "53"
       },

data/test/template/ecs-cluster_test.rb

@@ -3,13 +3,16 @@ require 'abstract_unit'
 class EcsClusterTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_ecs_cluster "test"
+_ecs_cluster "test", { cluster: "test" }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "TestEcsCluster": {
-    "Type": "AWS::ECS::Cluster"
+    "Type": "AWS::ECS::Cluster",
+    "Properties": {
+      "ClusterName": "test"
+    }
   }
 }
     EOS

data/test/template/elasticache-replication-group_test.rb

@@ -35,7 +35,35 @@ _elasticache_replication_group "test", ref_security_groups: "test", ref_subnet:
         }
       ],
       "SnapshotRetentionLimit": "10",
-      "SnapshotWindow": "21:15-22:15"
+      "SnapshotWindow": "21:15-22:15",
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ]
     }
   }
 }

data/test/template/emr-cluster_test.rb

@@ -105,7 +105,7 @@ _emr_cluster "test", job: { core: core, master: master, termination: true }, clu
         },
         "TerminationProtected": "true"
       },
-      "JobFlowRole": "EMR_EC2_DefaultRole\",
+      "JobFlowRole": "EMR_EC2_DefaultRole",
       "Name": "TestCluster",
       "ReleaseLabel": "emr-4.6.0",
       "ServiceRole": "EMR_DefaultRole",

data/test/template/iam-managed-policy_test.rb

@@ -12,7 +12,7 @@ _iam_managed_policy "test", policy_document: [ { service: "s3" } ]
     "Type": "AWS::IAM::ManagedPolicy",
     "Properties": {
       "Path": "/",
-      "PolicyDocument\": {
+      "PolicyDocument": {
         "Version": "2012-10-17",
         "Statement": [
           {

data/test/template/iam-policy_test.rb

@@ -11,7 +11,7 @@ _iam_policy "test", user: "test", ref_roles: "test", policy_document: [ { servic
   "TestPolicy": {
     "Type": "AWS::IAM::Policy",
     "Properties": {
-      "PolicyDocument\": {
+      "PolicyDocument": {
         "Version": "2012-10-17",
         "Statement": [
           {

data/test/template/kms-alias_test.rb

@@ -0,0 +1,22 @@
+require 'abstract_unit'
+
+class KmsAliasTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_kms_alias "test", { "alias": "test", target: "test" }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestKmsAlias": {
+    "Type": "AWS::KMS::Alias",
+    "Properties": {
+      "AliasName": "test",
+      "TargetKeyId": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/kms-key_test.rb

@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class KmsKeyTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_kms_key "test", { policy: [ { service: "s3" } ] }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestKmsKey": {
+    "Type": "AWS::KMS::Key",
+    "Properties": {
+      "Enabled": "true",
+      "EnableKeyRotation": "false",
+      "KeyPolicy": {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Effect": "Allow",
+            "Action": [
+              "s3:*"
+            ],
+            "Resource": [
+              "*"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/logs-destination_test.rb

@@ -0,0 +1,37 @@
+require 'abstract_unit'
+
+class LogsDestinationTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_logs_destination "test", { dest: "test", policy: [ { service: "s3" } ], role: "test", target: { account_id: "test", region: "test", name: "test" } }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLogsDestination": {
+    "Type": "AWS::Logs::Destination",
+    "Properties": {
+      "DestinationName": "test",
+      "DestinationPolicy": {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Effect": "Allow",
+            "Action": [
+              "s3:*"
+            ],
+            "Resource": [
+              "*"
+            ]
+          }
+        ]
+      },
+      "RoleArn": "test",
+      "TargetArn": "arn:aws:kinesis:test:test:stream/test"
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/logs-log-group_test.rb

@@ -0,0 +1,34 @@
+require 'abstract_unit'
+
+class LogsLogGroupTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_logs_log_group "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLogsLogGroup": {
+    "Type": "AWS::Logs::LogGroup",
+    "Properties": {
+      "LogGroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            {
+              "Ref": "Name"
+            }
+          ]
+        ]
+      },
+      "RetentionInDays": "365"
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/logs-log-stream_test.rb

@@ -0,0 +1,46 @@
+require 'abstract_unit'
+
+class LogsLogStreamTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_logs_log_stream "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLogsLogStream": {
+    "Type": "AWS::Logs::LogStream",
+    "Properties": {
+      "LogGroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            {
+              "Ref": "Name"
+            }
+          ]
+        ]
+      },
+      "LogStreamName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            {
+              "Ref": "Name"
+            }
+          ]
+        ]
+      }
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/logs-metric-filter_test.rb

@@ -0,0 +1,41 @@
+require 'abstract_unit'
+
+class LogsMetricFilterTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_logs_metric_filter "test", { pattern: "test", transformations: [ { name: "test", ns: "test", value: "test" }] }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLogsMetricFilter": {
+    "Type": "AWS::Logs::MetricFilter",
+    "Properties": {
+      "FilterPattern": "test",
+      "LogGroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            {
+              "Ref": "Name"
+            }
+          ]
+        ]
+      },
+      "MetricTransformations": [
+        {
+          "MetricName": "test",
+          "MetricNamespace": "test",
+          "MetricValue": "test"
+        }
+      ]
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/logs-subscription-filter_test.rb

@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class LogsSubscriptionTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_logs_subscription_filter "test", dest: "test", pattern: "test", role: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLogsSubscriptionFilter": {
+    "Type": "AWS::Logs::SubscriptionFilter",
+    "Properties": {
+      "DestinationArn": "test",
+      "FilterPattern": "test",
+      "LogGroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            {
+              "Ref": "Name"
+            }
+          ]
+        ]
+      },
+      "RoleArn": "test"
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/rds-event-subscription_test.rb

@@ -28,7 +28,7 @@ _rds_event_subscription "test", ref_sources: "test", ref_sns: "test"
         "restoration"
       ],
       "SnsTopicArn": {
-        "Fn::GetAtt\": [
+        "Fn::GetAtt": [
           "TestRole",
           "Arn"
         ]

data/test/template/sns-subscription_test.rb

@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+class SnsSubscriptionTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_sns_subscription "test", { protocol: "lambda", endpoint: "test", topic: "test" }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestSnsSubscription": {
+    "Type": "AWS::SNS::Subscription",
+    "Properties": {
+      "Endpoint": {
+        "Fn::GetAtt": [
+          "Test",
+          "Arn"
+        ]
+      },
+      "Protocol": "lambda",
+      "TopicArn": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,84 +16,70 @@ 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: kumogata2-plugin-ruby
+  name: kumogata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: kumogata2-plugin-yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.8'
 description: Template for Kumogata. Kumogata is a tool for AWS CloudFormation. It
   can define a template in Ruby DSL.
 email:
@@ -117,6 +103,8 @@ files:
 - lib/kumogata/template/certificate.rb
 - lib/kumogata/template/cloudfront.rb
 - lib/kumogata/template/cloudwatch.rb
+- lib/kumogata/template/codebuild.rb
+- lib/kumogata/template/codecommit.rb
 - lib/kumogata/template/codedeploy.rb
 - lib/kumogata/template/const.rb
 - lib/kumogata/template/datapipeline.rb
@@ -127,11 +115,13 @@ files:
 - lib/kumogata/template/elb.rb
 - lib/kumogata/template/emr.rb
 - lib/kumogata/template/events.rb
+- lib/kumogata/template/ext/argument_parser.rb
 - lib/kumogata/template/ext/kumogata.rb
 - lib/kumogata/template/ext/option_parser.rb
 - lib/kumogata/template/helper.rb
 - lib/kumogata/template/iam.rb
 - lib/kumogata/template/lambda.rb
+- lib/kumogata/template/logs.rb
 - lib/kumogata/template/s3.rb
 - lib/kumogata/template/sns.rb
 - lib/kumogata/template/version.rb
@@ -149,6 +139,8 @@ files:
 - template/cloudfront-distribution.rb
 - template/cloudtrail.rb
 - template/cloudwatch-alarm.rb
+- template/codebuild-project.rb
+- template/codecommit-repository.rb
 - template/codedeploy-application.rb
 - template/codedeploy-deployment-config.rb
 - template/codedeploy-deployment-group.rb
@@ -199,11 +191,18 @@ files:
 - template/iam-role.rb
 - template/iam-user-to-group-addition.rb
 - template/iam-user.rb
+- template/kms-alias.rb
+- template/kms-key.rb
 - template/lambda-alias.rb
 - template/lambda-event-source-mapping.rb
 - template/lambda-function.rb
 - template/lambda-permission.rb
 - template/lambda-version.rb
+- template/logs-destination.rb
+- template/logs-log-group.rb
+- template/logs-log-stream.rb
+- template/logs-metric-filter.rb
+- template/logs-subscription_filter.rb
 - template/mappings-ec2.rb
 - template/output-access-key.rb
 - template/output-alb.rb
@@ -241,6 +240,7 @@ files:
 - template/redshift-cluster.rb
 - template/s3-bucket-policy.rb
 - template/s3-bucket.rb
+- template/sns-subscription.rb
 - template/sns-topic.rb
 - template/sqs-queue.rb
 - test/_template.rb
@@ -248,6 +248,7 @@ files:
 - test/alb_test.rb
 - test/autoscaling_test.rb
 - test/cloudfront_test.rb
+- test/codebuild_test.rb
 - test/codedeploy_test.rb
 - test/data/lambda_function.py
 - test/datapipeline_test.rb
@@ -261,6 +262,7 @@ files:
 - test/helper_test.rb
 - test/iam_test.rb
 - test/lambda_test.rb
+- test/logs_test.rb
 - test/s3_test.rb
 - test/sns_test.rb
 - test/template/alb-listener-rule_test.rb
@@ -276,6 +278,8 @@ files:
 - test/template/cloudfront-distribution_test.rb
 - test/template/cloudtrail_test.rb
 - test/template/cloudwatch-alarm_test.rb
+- test/template/codebuild-project_test.rb
+- test/template/codecommit-repository_test.rb
 - test/template/codedeploy-application_test.rb
 - test/template/codedeploy-deployment-config_test.rb
 - test/template/codedeploy-deployment-group_test.rb
@@ -326,11 +330,18 @@ files:
 - test/template/iam-role_test.rb
 - test/template/iam-user-to-group-addition_test.rb
 - test/template/iam-user_test.rb
+- test/template/kms-alias_test.rb
+- test/template/kms-key_test.rb
 - test/template/lambda-alias_test.rb
 - test/template/lambda-event-source-mapping_test.rb
 - test/template/lambda-function_test.rb
 - test/template/lambda-permission_test.rb
 - test/template/lambda-version_test.rb
+- test/template/logs-destination_test.rb
+- test/template/logs-log-group_test.rb
+- test/template/logs-log-stream_test.rb
+- test/template/logs-metric-filter_test.rb
+- test/template/logs-subscription-filter_test.rb
 - test/template/mappings-ec2_test.rb
 - test/template/output-access-key_test.rb
 - test/template/output-alb_test.rb
@@ -368,6 +379,7 @@ files:
 - test/template/redshift-cluster_test.rb
 - test/template/s3-bucket-policy_test.rb
 - test/template/s3-bucket_test.rb
+- test/template/sns-subscription_test.rb
 - test/template/sns-topic_test.rb
 - test/template/sqs-queue_test.rb
 homepage: https://github.com/n0ts/kumogata-template
@@ -390,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Template for Kumogata.
@@ -400,6 +412,7 @@ test_files:
 - test/alb_test.rb
 - test/autoscaling_test.rb
 - test/cloudfront_test.rb
+- test/codebuild_test.rb
 - test/codedeploy_test.rb
 - test/data/lambda_function.py
 - test/datapipeline_test.rb
@@ -413,6 +426,7 @@ test_files:
 - test/helper_test.rb
 - test/iam_test.rb
 - test/lambda_test.rb
+- test/logs_test.rb
 - test/s3_test.rb
 - test/sns_test.rb
 - test/template/alb-listener-rule_test.rb
@@ -428,6 +442,8 @@ test_files:
 - test/template/cloudfront-distribution_test.rb
 - test/template/cloudtrail_test.rb
 - test/template/cloudwatch-alarm_test.rb
+- test/template/codebuild-project_test.rb
+- test/template/codecommit-repository_test.rb
 - test/template/codedeploy-application_test.rb
 - test/template/codedeploy-deployment-config_test.rb
 - test/template/codedeploy-deployment-group_test.rb
@@ -478,11 +494,18 @@ test_files:
 - test/template/iam-role_test.rb
 - test/template/iam-user-to-group-addition_test.rb
 - test/template/iam-user_test.rb
+- test/template/kms-alias_test.rb
+- test/template/kms-key_test.rb
 - test/template/lambda-alias_test.rb
 - test/template/lambda-event-source-mapping_test.rb
 - test/template/lambda-function_test.rb
 - test/template/lambda-permission_test.rb
 - test/template/lambda-version_test.rb
+- test/template/logs-destination_test.rb
+- test/template/logs-log-group_test.rb
+- test/template/logs-log-stream_test.rb
+- test/template/logs-metric-filter_test.rb
+- test/template/logs-subscription-filter_test.rb
 - test/template/mappings-ec2_test.rb
 - test/template/output-access-key_test.rb
 - test/template/output-alb_test.rb
@@ -520,5 +543,6 @@ test_files:
 - test/template/redshift-cluster_test.rb
 - test/template/s3-bucket-policy_test.rb
 - test/template/s3-bucket_test.rb
+- test/template/sns-subscription_test.rb
 - test/template/sns-topic_test.rb
 - test/template/sqs-queue_test.rb