kumogata-template 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ecc2732009db8729e014413122fb339f057592
-  data.tar.gz: b299501c629511e2751ce2922f143502bd003a55
+  metadata.gz: 524f711e9c27851570ed61a4e28d97e379cc6df0
+  data.tar.gz: 4f92da4c881b9edda3d10b5f92aad0d7f6b6d2a2
 SHA512:
-  metadata.gz: fd0509d6f03d04eeb0e493e07d5b5d90559b5f31ac19a6786062fb749c62f3952abadf05b483d165b11ea2e78481efc0fbc99777e3f9f5d0b3012d5616583803
-  data.tar.gz: f74154775aef42b6f77b031a32c072287e01e2510fc6d5d8f6ba5a8488e7d16eb76f0ff61c3455a6b4a1fea4fd642e433372873e505d7d8883763f14332395ed
+  metadata.gz: 4e164fd9a9f3e17c4cdf54ecda9eb212a9aace8b65a01f399349affd30c0c750dbbadc90d61e2b34ccd61fdb857b73c00fed27ad2595e671d441cc85117ded23
+  data.tar.gz: 2e2ebec43d2e1de5c75158671be53cec1db95dd1eea44d341d0bf06dd16ac6dd8448ec8b968a5c6471c8b1059a7eaf9fc6744a22aa07250e02da754dc2e14b97

data/lib/kumogata/template/cloudwatch.rb

@@ -2,6 +2,26 @@
 # Helper - CloudWatch
 #
 
+def _cloudwatch_to_period(value)
+  return value if value.nil?
+  case value
+  when "1m"
+    60
+  when "5m"
+    300
+  when "15m"
+    900
+  when "1h"
+    3600
+  when "6h"
+    21600
+  when "1d"
+    86400
+  else
+    value.to_i
+  end
+end
+
 def _cloudwatch_to_statistic(value)
   return value if value.nil?
   case value.downcase

data/lib/kumogata/template/helper.rb

@@ -88,6 +88,10 @@ def _ref_name(name, args, ref_name = "")
   end
 end
 
+def _ref_resource_name(args, ref_name = "")
+  _{ Ref _resource_name(args[:name], ref_name) }
+end
+
 def _attr_string(name, attr, ref_name = "")
   _{ Fn__GetAtt [ _resource_name(name, ref_name), attr ] }
 end
@@ -172,12 +176,19 @@ def _availability_zones(args, use_subnet = true)
   end
 end
 
-def _timestamp_utc(time = Time.now)
-  time.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+def _timestamp_utc(time = Time.now, type = nil)
+  format =
+    case type
+    when "cron"
+      "%M %H %d %m %w"
+    else
+      "%Y-%m-%dT%H:%M:%SZ"
+    end
+  time.utc.strftime(format)
 end
 
-def _timestamp_utc_from_string(time)
-  _timestamp_utc(Time.strptime(time, "%Y-%m-%d %H:%M"))
+def _timestamp_utc_from_string(time, type= nil)
+  _timestamp_utc(Time.strptime(time, "%Y-%m-%d %H:%M"), type)
 end
 
 def _maintenance_window(service, start_time)

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.11'
+KUMOGATA_TEMPLATE_VERSION = '0.0.12'

data/template/autoscaling-scheduled-action.rb

@@ -5,22 +5,48 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "autoscaling scheduled action")
-autoscaling = _ref_string("autoscaling", args, "autoscaling group")
-desired = args[:desired] || ""
+autoscaling =
+  if args.key? :autoscaling
+    _ref_string("autoscaling", args, "autoscaling group")
+  else
+    _ref_resource_name(args, "autoscaling group")
+  end
+desired = args[:desired].to_s || ""
 end_time =
   if args.key? :end_time
-    _timestamp_utc_from_string("2016-03-18 00:00")
+    _timestamp_utc(args[:end_time])
+  else
+    ""
+  end
+max = args[:max].to_s || ""
+min = args[:min].to_s || ""
+min = desired.to_s if args.key? :desired and desired.to_i < min.to_i
+recurrence =
+  if args.key? :recurrence
+    case args[:recurrence]
+    when "every 5 min"
+      "*/5 * * * *"
+    when "every 30 min"
+      "0,30 * * * *"
+    when "every 1 hour"
+      "0 * * * *"
+    when "every day"
+      "0 0 * * *"
+    when "every week"
+      "0 0 * * Tue"
+    when /\*/
+      args[:recurrence]
+    else
+      _timestamp_utc(args[:recurrence], "cron")
+    end
   else
     ""
   end
-min = args[:min] || ""
-max = args[:max] || ""
-recurrence = args[:recurrence] || ""
 start_time =
   if args.key? :start_time
-    _timestamp_utc_from_string("2016-03-18 00:00")
+    _timestamp_utc(args[:start_time])
   else
-    ""
+    _timestamp_utc(Time.now + 3600)
   end
 
 _(name) do

data/template/cloudwatch-alarm.rb

@@ -17,7 +17,7 @@ insufficients = args[:insufficients] || []
 metric = args[:metric]
 namespace = args[:namespace]
 ok_actions = args[:ok_actions] || []
-period = args[:period] || 60
+period = _cloudwatch_to_period(args[:period] || "5m")
 statistic = _valid_values(_cloudwatch_to_statistic(args[:statistic]),
                           %w(SampleCount Average Sum Minimum Maximum), "Average")
 threshold = args[:threshold] || 60

data/test/helper_test.rb

@@ -542,6 +542,7 @@ Test _availability_zones({})
 
   def test_timestamp_utc
     assert_equal _timestamp_utc(Time.local(2016, 4, 1)), "2016-03-31T15:00:00Z"
+    assert_equal _timestamp_utc(Time.local(2016, 4, 1), "cron"), "00 15 31 03 4"
   end
 
   def test_timestamp_utc_from_string

data/test/template/autoscaling-scheduled-action_test.rb

@@ -3,9 +3,10 @@ require 'abstract_unit'
 class AutoscalingScheduledActionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_autoscaling_scheduled_action "test", ref_autoscaling: "test", max: "1", min: "1", recurrence: "0 19 * * *"
+_autoscaling_scheduled_action "test", ref_autoscaling: "test", max: "1", min: "1", recurrence: Time.local(2016, 3, 31, 15)
     EOS
     act_template = run_client_as_json(template)
+    start_time = _timestamp_utc(Time.now + 3600)
     exp_template = <<-EOS
 {
   "TestAutoscalingScheduledAction": {
@@ -16,7 +17,8 @@ _autoscaling_scheduled_action "test", ref_autoscaling: "test", max: "1", min: "1
       },
       "MaxSize": "1",
       "MinSize": "1",
-      "Recurrence": "0 19 * * *"
+      "Recurrence": "00 06 31 03 4",
+      "StartTime": "#{start_time}"
     }
   }
 }

data/test/template/cloudwatch-alarm_test.rb

@@ -26,7 +26,7 @@ _cloudwatch_alarm "test", actions: "test", alarm_name: "test", namespace: "test"
       "EvaluationPeriods": "3",
       "MetricName": "test",
       "Namespace": "test",
-      "Period": "60",
+      "Period": "300",
       "Statistic": "Average",
       "Threshold": "60"
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Template for Kumogata.