kumogata-template 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b3009b60eaa96c62f0e6cfcb8b5e93453e19a5
-  data.tar.gz: f4cfbdffa75b3855c1aa1f49d7c5f3d032d56331
+  metadata.gz: 5d77897dbe21b5c2c2fb62d6483eb5cfdf798467
+  data.tar.gz: 34567d941237cd2d1a9bc488c8cb40f546f33339
 SHA512:
-  metadata.gz: 8461e8ea61c6a49d1ec819213056ee32a89457da7dff59a1127fe5a8d97351d833084a3242cea845f6b4f507e50085db2650bce8ccb619e176c56b6adb85f97d
-  data.tar.gz: 5ede82ac1c09eecb65d379251dd575ccc3ad8da3dd010f8de1c256424a05d53c158d7e9eb4fe53560ab88aba0db5a62c666b8eff63d73e5e2cac23204b4df57a
+  metadata.gz: 29aa4fd100a68042037ccfc18109616d4f1069b246cf8e178edd9a9ed11df0813106016f24a9a1b8e59970156415dd2cb8d6d596620ab93217e3545d5c16db03
+  data.tar.gz: 0f20034b16d11c2045608d0b238c584832eb048d59d2e84e013189fc4dedc03e6ffcfa0fdf494412aea176d304b24ebe9e580e3f1587d27120ef6f06ce8852b7

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.5)
+    kumogata-template (0.0.6)
       aws-sdk (~> 2.3)
       kumogata (= 0.5.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.5.5)
-      aws-sdk-resources (= 2.5.5)
-    aws-sdk-core (2.5.5)
+    aws-sdk (2.5.6)
+      aws-sdk-resources (= 2.5.6)
+    aws-sdk-core (2.5.6)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.5)
-      aws-sdk-core (= 2.5.5)
+    aws-sdk-resources (2.5.6)
+      aws-sdk-core (= 2.5.6)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)

data/lib/kumogata/template/const.rb

@@ -4,6 +4,7 @@
 
 AWS_REGION = {
   virginia:   "us-east-1",
+  ohio:       "us-east-2",
   oregon:     "us-west-2",
   california: "us-west-1",
   ireland:    "eu-west-1",
@@ -46,7 +47,7 @@ EC2_DEFAULT_IMAGE = "amazon linux official"
 # https://aws.amazon.com/ec2/pricing/
 EC2_INSTANCE_TYPES =
   [
-   # Model     vCPU  CPU Credits/hour  Mem(GiB)   Storage
+   # Model     vCPU  CPU(Credits/hour)  Mem(GiB)   Storage
    # t2.nano     1     3                0.5       EBS-Only
    # t2.micro    1     6                  1       EBS-Only
    # t2.small    1    12                  2       EBS-Only
@@ -54,15 +55,16 @@ EC2_INSTANCE_TYPES =
    # t2.large    2    36                  8       EBS-Only
    "t2.nano", "t2.micro", "t2.small", "t2.medium", "t2.large",
 
-   # Model      vCPU   Mem(GiB)  Storage   Dedicated EBS Throughput(Mbps)
-   # m4.large     2      8       EBS-only    450
-   # m4.xlarge    4     16       EBS-only    750
-   # m4.2xlarge   8     32       EBS-only  1,000
-   # m4.4xlarge  16     64       EBS-only  2,000
-   # m4.10xlarge 40    160       EBS-only  4,000
-   "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge",
+   # Model      vCPU   Mem(GiB)  Storage   Network   EBS(Mbps)
+   # m4.large     2      8       EBS-only  Moderate     450
+   # m4.xlarge    4     16       EBS-only  High         750
+   # m4.2xlarge   8     32       EBS-only  High       1,000
+   # m4.4xlarge  16     64       EBS-only  High       2,000
+   # m4.10xlarge 40    160       EBS-only  10Gps      4,000
+   # m4.16xlarge 64    256       EBS Only  20Gps     10,000
+   "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge",
 
-   # Model      vCPU   Mem(GiB)  Storage   Dedicated EBS Throughput(Mbps)
+   # Model      vCPU   Mem(GiB)  Storage   EBS(Mbps)
    # c4.large     2   3.75       EBS-Only    500
    # c4.xlarge    4    7.5       EBS-Only    750
    # c4.2xlarge   8     15       EBS-Only  1,000
@@ -70,7 +72,7 @@ EC2_INSTANCE_TYPES =
    # c4.8xlarge  36     60       EBS-Only  4,000
    "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge",
 
-   # Model      vCPU   Mem(GiB)  SSD Storage (GB)
+   # Model      vCPU   Mem(GiB)  SSD Storage(GB)
    # r3.large     2     15.25      1 x 32
    # r3.xlarge    4     30.5       1 x 80
    # r3.2xlarge   8     61         1 x 160
@@ -78,16 +80,17 @@ EC2_INSTANCE_TYPES =
    # r3.8xlarge  32    244         2 x 320
    "r3.large", "r3.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge",
 
-   # Model      vCPU   Mem (GiB) SSD Storage (GB)
-   # i2.xlarge    4     30.5       1 x 800
-   # i2.2xlarge   8     61         2 x 800
-   # i2.4xlarge  16    122         4 x 800
-   # i2.8xlarge  32    244         8 x 800
+   # Model      vCPU   Mem(GiB) SSD Storage(GB)
+   # i2.xlarge    4     30.5    1 x 800
+   # i2.2xlarge   8     61      2 x 800
+   # i2.4xlarge  16    122      4 x 800
+   # i2.8xlarge  32    244      8 x 800
    "i2.xlarge", "i2.2xlarge", "i2.4xlarge", "i2.8xlarge",
 
-   # Model        vCPU   Mem (GiB)   SSD Storage (GB)  network Bandwidth
-   # x1.32xlargee  128   1,952        2 x 1,902 SSD      10 Gbps 10 Gbps
-   "x1.32xlarge",
+   # Model       vCPU   Mem(GiB)   Storage(GB)     Network(Gbps)
+   # x1.16xlarge   64     174.5    1 x 1,920 SSD    10
+   # x1.32xlarge  128   1,952      2 x 1,902 SSD    10
+   "x1.16xlarge", "x1.32xlarge",
   ]
 EC2_DEFAULT_INSTANCE_TYPE = "t2.medium"
 

data/lib/kumogata/template/lambda.rb

@@ -7,15 +7,23 @@ def _lambda_function_code(args)
   return "" unless args.key? :code
 
   code = args[:code]
-  s3_bucket = code[:s3_bucket]
-  s3_key = code[:s3_key]
+  is_s3 = (code.key? :zip_file) ? false : true
+  s3_bucket = code[:s3_bucket] || ""
+  s3_key = code[:s3_key] || ""
   s3_object_version = code[:s3_object_version] || ""
+  zip_file = code[:zip_file] || ""
+  unless zip_file.empty?
+    zip_file_code = []
+    File.foreach(zip_file) do |file|
+      file.each_line.collect{|line| zip_file_code << line.chomp }
+    end
+  end
 
   _{
-    S3Bucket s3_bucket
-    S3Key s3_key
-    S3ObjectVersion s3_object_version unless s3_object_version.empty?
-    #ZipFile
+    S3Bucket s3_bucket if is_s3
+    S3Key s3_key if is_s3
+    S3ObjectVersion s3_object_version if is_s3 and !s3_object_version.empty?
+    ZipFile _{ Fn__Join '\n', zip_file_code } unless is_s3
   }
 end
 

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.6'
+KUMOGATA_TEMPLATE_VERSION = '0.0.7'

data/template/lambda-function.rb

@@ -9,12 +9,24 @@ name = _resource_name(args[:name], "lambda function")
 code = _lambda_function_code(args)
 description = args[:description] || ""
 function_name = args[:function_name] || ""
-handler = args[:handler]
+runtime = _valid_values(args[:runtime],
+                        %w( nodejs nodejs4.3 java8 python2.7 ), "python2.7")
+handler =
+  if args.key? :handler
+    args[:handler]
+  else
+    case runtime
+    when /^nodejs.+/
+      "#{args[:function_name]}.handler"
+    when /^python.+/
+      "#{args[:function_name]}.lambda_handler"
+    else
+      args[:handler]
+    end
+  end
 memory_size = args[:memory_size] || 128
 role = _ref_attr_string("role", "Arn", args, "role")
 role = _ref_string("role_arn", args, "role") if role.empty?
-runtime = _valid_values(args[:runtime],
-                        %w( nodejs nodejs4.3 java8 python2.7 ), "python2.7")
 timeout = args[:timeout] || 3
 vpc_config = _lambda_vpc_config(args)
 

data/template/mappings-ec2.rb

@@ -36,6 +36,7 @@ AWSRegionArch2AMIAmazonLinuxOfficial do
 end
 
 # CentOS 7 (x86_64) with Updates HVM
+# https://wiki.centos.org/Cloud/AWS
 # https://aws.amazon.com/marketplace/ordering/ref=dtl_psb_continue?ie=UTF8&productId=b7ee8a69-ee97-4a49-9e68-afaee216db2e
 AWSRegionArch2AMICentos7Official do
   # 1602, released 02/26/2016
@@ -62,18 +63,18 @@ end
 # Ubuntu Server 16.04 LTS
 # https://cloud-images.ubuntu.com/locator/ec2/
 AWSRegionArch2AMIUbuntu16Official do
-  # 16.04 LTS 20160420.3
+  # 16.04 LTS 20160907.1 hvm:ebs-ssd
   image_id = {
-    virginia: "840910ee",
-    oregon:	"fa82739a",
-    california: "fa82739a",
-    frankfurt: "f0eb089f",
-    ireland: "3079f543",
-    singapore: "a5416cc6",
-    sydney: "a5416cc6",
-    tokyo: "3c5f4152",
-    seoul: "a5416cc6",
-    saopaulo: "567cf23a",
+    virginia: "2ef48339",
+    oregon:	"746aba14",
+    california: "a9a8e4c9",
+    frankfurt: "a9a557c6",
+    ireland: "643d4217",
+    singapore: "42934921",
+    sydney: "623c0d01",
+    tokyo: "919cd68",
+    seoul: "", ## N/A
+    saopaulo: "60bd2d0c",
   }
 
   AWS_REGION.each do |key, region|
@@ -82,4 +83,3 @@ AWSRegionArch2AMIUbuntu16Official do
     end
   end
 end
-

data/template/output-name.rb

@@ -0,0 +1,5 @@
+#
+# Output name
+#
+
+_output "#{args[:name]} name", ref_value: args[:name]

data/test/data/lambda_function.py

@@ -0,0 +1,4 @@
+import boto3
+
+def lambda_handler(event, context):
+    print('hello lambda')

data/test/lambda_test.rb

@@ -13,6 +13,29 @@ Test _lambda_function_code(code: { s3_bucket: "test", s3_key: "test" })
     "S3Bucket": "test",
     "S3Key": "test"
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+      template = <<-EOS
+Test _lambda_function_code(code: { zip_file: "test/data/lambda_function.py" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "ZipFile": {
+      "Fn::Join": [
+        "\\\\n",
+        [
+          "import boto3",
+          "",
+          "def lambda_handler(event, context):",
+          "    print('hello lambda')"
+        ]
+      ]
+    }
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -38,4 +61,3 @@ Test _lambda_vpc_config(vpc: { security_groups: [ "test" ], subnets: [ "test" ]
     assert_equal exp_template.chomp, act_template
   end
 end
-

data/test/template/lambda-function_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class LambdaFunctionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, handler: "test", ref_role: "test", runtime: "nodejs4.3"
+_lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, function_name: "test", ref_role: "test", runtime: "nodejs4.3"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -15,7 +15,8 @@ _lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, handler: "
         "S3Bucket": "test",
         "S3Key": "test"
       },
-      "Handler": "test",
+      "FunctionName": "test",
+      "Handler": "test.handler",
       "MemorySize": "128",
       "Role": {
         "Fn::GetAtt": [
@@ -27,6 +28,45 @@ _lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, handler: "
       "Timeout": "3"
     }
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+_lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, function_name: "test", ref_role: "test", runtime: "python2.7"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestLambdaFunction": {
+    "Type": "AWS::Lambda::Function",
+    "Properties": {
+      "Code": {
+        "ZipFile": {
+          "Fn::Join": [
+            "\\\\n",
+            [
+              "import boto3",
+              "",
+              "def lambda_handler(event, context):",
+              "    print('hello lambda')"
+            ]
+          ]
+        }
+      },
+      "FunctionName": "test",
+      "Handler": "test.lambda_handler",
+      "MemorySize": "128",
+      "Role": {
+        "Fn::GetAtt": [
+          "TestRole",
+          "Arn"
+        ]
+      },
+      "Runtime": "python2.7",
+      "Timeout": "3"
+    }
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/mappings-ec2_test.rb

@@ -31,16 +31,16 @@ class MappingsEc2Test < Minitest::Test
     }
     centos7_images = get_image_values(centos7_image_id)
     ubuntu16_image_id = {
-      virginia: "840910ee",
-      oregon: "fa82739a",
-      california: "fa82739a",
-      frankfurt: "f0eb089f",
-      ireland: "3079f543",
-      singapore: "a5416cc6",
-      sydney: "a5416cc6",
-      tokyo: "3c5f4152",
-      seoul: "a5416cc6",
-      saopaulo: "567cf23a",
+      virginia: "2ef48339",
+      oregon:	"746aba14",
+      california: "a9a8e4c9",
+      frankfurt: "a9a557c6",
+      ireland: "643d4217",
+      singapore: "42934921",
+      sydney: "623c0d01",
+      tokyo: "919cd68",
+      seoul: "", ## N/A
+      saopaulo: "60bd2d0c",
     }
     ubuntu16_images = get_image_values(ubuntu16_image_id)
 

data/test/template/output-arn_test.rb

@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class OutputUserTest < Minitest::Test
+class OutputArnTest < Minitest::Test
   def test_normal
     template = <<-EOS
 _output_arn "test"

data/test/template/output-name_test.rb

@@ -0,0 +1,21 @@
+require 'abstract_unit'
+
+class OutputNameTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_name "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestName": {
+    "Description": "description of TestName",
+    "Value": {
+      "Ref": "Test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output-rds_test.rb

@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class OutputUserTest < Minitest::Test
+class OutputRdsrTest < Minitest::Test
   def test_normal
     template = <<-EOS
 _output_rds "test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -199,6 +199,7 @@ files:
 - template/output-elasticache.rb
 - template/output-elb.rb
 - template/output-emr.rb
+- template/output-name.rb
 - template/output-rds.rb
 - template/output-redshift.rb
 - template/output-s3.rb
@@ -231,6 +232,7 @@ files:
 - test/alb_test.rb
 - test/autoscaling_test.rb
 - test/codedeploy_test.rb
+- test/data/lambda_function.py
 - test/datapipeline_test.rb
 - test/dynamodb_test.rb
 - test/ec2_test.rb
@@ -322,6 +324,7 @@ files:
 - test/template/output-elasticache_test.rb
 - test/template/output-elb_test.rb
 - test/template/output-emr_test.rb
+- test/template/output-name_test.rb
 - test/template/output-rds_test.rb
 - test/template/output-redshift_test.rb
 - test/template/output-s3_test.rb
@@ -379,6 +382,7 @@ test_files:
 - test/alb_test.rb
 - test/autoscaling_test.rb
 - test/codedeploy_test.rb
+- test/data/lambda_function.py
 - test/datapipeline_test.rb
 - test/dynamodb_test.rb
 - test/ec2_test.rb
@@ -470,6 +474,7 @@ test_files:
 - test/template/output-elasticache_test.rb
 - test/template/output-elb_test.rb
 - test/template/output-emr_test.rb
+- test/template/output-name_test.rb
 - test/template/output-rds_test.rb
 - test/template/output-redshift_test.rb
 - test/template/output-s3_test.rb