sumomo 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9cd153fb1db9630ee2dd52757c95c38f5b5d209
-  data.tar.gz: 3ac93f2589102eb4cfe2c5fda3320163e91d8d08
+  metadata.gz: 16ab3fda49b8241a0a627ac9e65a4fb293c32d59
+  data.tar.gz: 2f4dac5aa63120ffc1f9bea9fac71a0c0d3830e0
 SHA512:
-  metadata.gz: 750c7eaf59cdf2f23064e9074d48cdea12920e7ea5e0a1ed7eb3107f104df214f74f7377b0eb850e8bf0cae95f5c07531e7f30962b09639c929b208589e82334
-  data.tar.gz: 7c2d2b176a0ecabdbeee3743bab25f3c9e0b58745dd11b87a8e9753ea62dbb6c8b40cdee748d673ca9eebbdd7b78b61975558b469d546db0783f60956b1dc690
+  metadata.gz: 230fa5661da19213203825fb697c17836a56a0c71f67b6b6bf45c2a66ff5b45b3b64eb7f125fd78e736c8c722cc73b35b974f40275539c8ef1e58d6297a1f3ab
+  data.tar.gz: 3ff20b4d96d683b2706ee9377f26a07a33dd1ce7601e56ac9c4c77ef5e9d40336634385983d4a0d2f38ba4332037801ea0f45fe16c8285a7c213c5e153f1db61

data/data/sumomo/custom_resource_utils.js

@@ -9,7 +9,7 @@ Cloudformation.send = function(request, context, responseStatus, responseData, r
     var responseBody = JSON.stringify({
         Status: responseStatus,
         Reason: reason + " Log Stream: " + context.logStreamName,
-        PhysicalResourceId: physicalResourceId || context.logStreamName,
+        PhysicalResourceId: physicalResourceId === undefined ? context.logStreamName : physicalResourceId,
         StackId: request.StackId,
         RequestId: request.RequestId,
         LogicalResourceId: request.LogicalResourceId,

data/lib/sumomo.rb

@@ -6,6 +6,7 @@ require 'yaml'
 
 require "sumomo/version"
 require 'sumomo/ec2'
+require 'sumomo/ecs'
 require 'sumomo/stack'
 require 'sumomo/network'
 require 'sumomo/momo_extensions/resource'
@@ -105,9 +106,14 @@ module Sumomo
 		begin
 			cf.update_stack(update_options)
 		rescue => e
-			update_options[:timeout_in_minutes] = 30
-			update_options[:notification_arns] = sns_arn if sns_arn
-			cf.create_stack(update_options)
+			if e.message.end_with? "does not exist"
+				update_options[:timeout_in_minutes] = 30
+				update_options[:notification_arns] = sns_arn if sns_arn
+				cf.create_stack(update_options)
+			else
+				p e
+				puts "Error: #{e.message}"
+			end
 		end
 	end
 

data/lib/sumomo/ec2.rb

@@ -126,6 +126,7 @@ module Sumomo
 			def initialize(bucket_name, &block)
 				@script = ""
 				@bucket_name = bucket_name
+				@tags = []
 				instance_eval(&block) if block
 			end
 
@@ -144,6 +145,103 @@ aws s3 cp s3://#{@bucket_name}/uploads/#{name} #{local_path}
 			def script
 				@script
 			end
+
+			def tags
+				@tags
+			end
+
+			def tag(name, value)
+				@tags << [name, value]
+			end
+		end
+
+		def make_spotter(
+			price:,
+			network:,
+			layer:,
+			ec2_sns_arn:nil,
+			ecs_cluster:nil,
+			eip:nil,
+			&block)
+			update_time = Time.now.to_i
+
+			spot = make "Custom::SelectSpot" do
+				DateTime update_time
+				ExcludeString "1.,2.,small,micro"
+				LookBack 3
+				TargetPrice price
+			end 
+
+			switcher1_src = define_custom_resource(name: "ASGSelector1", code: <<-CODE
+
+				store.get("num1", function(num) {
+					num = parseInt(num);
+					if (request.RequestType != "Delete")
+					{
+						store.put("num1", String(num+1));
+					}
+					else
+					{
+						store.put("num1", String(0));
+					}
+
+					Cloudformation.send(request, context, Cloudformation.SUCCESS, {Num: String(num)}, "Success", String(num % 2));
+				}, function() {
+					store.put("num1", String(1));
+					Cloudformation.send(request, context, Cloudformation.SUCCESS, {Num: 1}, "Success", String(1));
+				});
+			CODE
+			)
+
+			switcher2_src = define_custom_resource(name: "ASGSelector2", code: <<-CODE
+				store.get("num2", function(num) {
+					num = parseInt(num);
+					if (request.RequestType != "Delete")
+					{
+						store.put("num2", String(num+1));
+					}
+					else
+					{
+						store.put("num1", String(0));
+					}
+
+					Cloudformation.send(request, context, Cloudformation.SUCCESS, {Num: String(num)}, "Success", String((num + 1) % 2));
+				}, function() {
+					store.put("num2", String(1));
+					Cloudformation.send(request, context, Cloudformation.SUCCESS, {Num: 1}, "Success", String(0));
+				});
+			CODE
+			)
+
+			size_1 = make_custom switcher1_src, name: "ASGSelector1Value" do
+				DateTime update_time
+			end
+
+			size_2 = make_custom switcher2_src, name: "ASGSelector2Value" do
+				DateTime update_time
+			end
+
+			make_autoscaling_group(
+				type: spot,
+				network: network, 
+				layer: "ecs", 
+				zone: spot.Zone, 
+				spot_price: price, 
+				min_size: size_1,
+				ec2_sns_arn: ec2_sns_arn,
+				ecs_cluster: ecs_cluster,
+				eip: eip, &block)
+
+			make_autoscaling_group(
+				type: spot,
+				network: network,
+				layer: "ecs", 
+				zone: spot.Zone, 
+				spot_price: price, 
+				min_size: size_2,
+				ec2_sns_arn: ec2_sns_arn,
+				ecs_cluster: ecs_cluster,
+				eip: eip)
 		end
 
 		def make_autoscaling_group(
@@ -163,8 +261,8 @@ aws s3 cp s3://#{@bucket_name}/uploads/#{name} #{local_path}
 			egress:nil,
 			machine_tag:nil,
 			ec2_sns_arn:nil,
-			ami_name:,
-			ebs_root_device:,
+			ami_name:nil,
+			ebs_root_device:nil,
 			spot_price:nil,
 			script: nil,
 			ecs_cluster: nil,
@@ -174,7 +272,23 @@ aws s3 cp s3://#{@bucket_name}/uploads/#{name} #{local_path}
 			eip:nil,
 			&block)
 
-			tasks = EC2Tasks.new(@bucket_name, &block).script
+			if ami_name == nil
+
+				@ami_lookup_resources ||= {}
+
+				if !@ami_lookup_resources[type]
+					@ami_lookup_resources[type] = make "Custom::AMILookup" do
+						InstanceType type
+					end
+				end
+
+				ami_name = @ami_lookup_resources[type]
+				ebs_root_device = @ami_lookup_resources[type].RootDeviceName if ebs_root_device == nil
+			end
+
+			tasks = EC2Tasks.new(@bucket_name, &block)
+
+			task_script = tasks.script
 
 			ingress ||= [ allow(:all) ]
 			egress ||= [ allow(:all) ]
@@ -184,7 +298,7 @@ aws s3 cp s3://#{@bucket_name}/uploads/#{name} #{local_path}
 
 			bucket_name = @bucket_name
 
-			script += "\n#{tasks}\n"
+			script += "\n#{task_script}\n"
 
 			if ecs_cluster
 				script += <<-ECS_START
@@ -405,6 +519,11 @@ ECS_ENGINE_AUTH_DATA={"https://index.docker.io/v1/":{"username":"{{docker_userna
 				end
 
 				tag "Name", machine_tag, propagate_at_launch: true
+
+				tasks.tags.each do |t|
+					tag t[0], t[1], propagate_at_launch: true
+				end
+
 			end
 
 			asg

data/lib/sumomo/ecs.rb

@@ -0,0 +1,113 @@
+
+module Sumomo
+	module Stack
+
+		def sluggify(str)
+			str.gsub(/[^0-9a-zA-Z]/, "_")
+		end
+
+		def make_ecs_cluster(name:"ECSCluster",services:[],machine_config:{},log_retention:30)
+
+			ecs = make "AWS::ECS::Cluster", name: "#{name}"
+
+			volumes = []
+			machine_volume_locations = {}
+
+			service_count = 0
+
+			services.each do |service|
+
+				service_count += 1
+
+				containers = service[:containers]
+				service_name = service[:name] || "Service#{service_count}"
+				service_count = service[:count] || 1
+
+				container_defs = containers.map do |container|
+					definition = {}
+
+					definition["Name"] = "#{sluggify(container[:image]).camelize}"
+					definition["Name"] = container[:name] if container[:name]
+
+					definition["Memory"] = 1024
+
+					loggroup = make "AWS::Logs::LogGroup", name: "#{name}#{definition["Name"]}Logs" do
+						LogGroupName "#{definition["Name"].underscore}_logs"
+						RetentionInDays log_retention
+					end
+
+					definition["LogConfiguration"] = {
+						"LogDriver" => "awslogs",
+						"Options" => {
+							"awslogs-group" => loggroup,
+							"awslogs-region" => ref("AWS::Region")
+						}
+					}
+
+					definition["MountPoints"] = container[:files].map do |file, destination|
+
+						s3_location = "container_files/#{sluggify(service_name)}/#{definition["Name"]}/#{file}"
+						volume_name = sluggify("#{definition["Name"].underscore}_#{destination}").camelize
+
+						upload_file s3_location, File.read(file)
+
+						machine_volume_locations[s3_location] = "/opt/s3/#{s3_location}"
+
+						volumes << {
+							"Name" => volume_name,
+							"Host" => { "SourcePath" => machine_volume_locations[s3_location] }
+						}
+
+						{
+							"ContainerPath" => destination,
+							"SourceVolume" => volume_name
+						}
+					end
+
+					container.each do |key, value|
+						if key != :files
+							definition["#{key}".camelize] = value
+						end
+					end
+
+					definition
+				end
+
+
+				deployment_config = {
+					"MaximumPercent" => 200,
+					"MinimumHealthyPercent" => 50
+				}
+
+				ecs_task = make "AWS::ECS::TaskDefinition", name: "#{name}#{service_name}Task" do
+					ContainerDefinitions container_defs
+					Volumes volumes
+				end
+
+				ecs_service = make "AWS::ECS::Service", name: "#{name}#{service_name}" do
+					Cluster ecs
+					DesiredCount service_count
+					TaskDefinition ecs_task
+					DeploymentConfiguration deployment_config
+				end
+			end
+
+			machine_config[:methods].each do |method_name|
+				parameters = {ecs_cluster: ecs}
+
+				method(method_name).parameters.each do |param|
+					parameters[param[1]] = machine_config[param[1]] if (param[0] == :keyreq or param[0] == :key) and machine_config[param[1]]
+				end
+
+				method(method_name).call(parameters) do
+					machine_volume_locations.each do |s3_loc, machine_loc|
+						mkdir File.dirname(machine_loc)
+						download_file s3_loc, machine_loc
+					end
+				end
+			end
+
+			ecs
+		end
+	end
+end

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - data/sumomo/sources/spot-watcher.sh
 - lib/sumomo.rb
 - lib/sumomo/ec2.rb
+- lib/sumomo/ecs.rb
 - lib/sumomo/momo_extensions/resource.rb
 - lib/sumomo/momo_extensions/stack.rb
 - lib/sumomo/network.rb
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An advanced infrastructure description language for AWS