sumomo 0.8.3 → 0.8.9

data/data/sumomo/custom_resources/USEastCertificate.js

@@ -1,5 +1,7 @@
 var acm = new aws.ACM({region: "us-east-1"}); // MUST be us-east-1.
 
+var return_properties = {};
+
 function extractRootDomain(domain)
 {
   var splitArr = domain.split('.');
@@ -15,39 +17,46 @@ function extractRootDomain(domain)
 
 function wait_for_approval(domain_name, on_success, on_fail)
 {
-  setTimeout(function()
+  get_domain(domain_name, function(data)
   {
-    get_domain(domain_name, function(data)
-    {
-      var params = {
-        CertificateArn: data.arn
-      };
-      acm.describeCertificate(params, function(err, cert_data) {
-        if (err)
+    var params = {
+      CertificateArn: data.arn
+    };
+
+    acm.describeCertificate(params, function(err, cert_data) {
+      if (err)
+      {
+        on_fail(err);
+      }
+      else
+      {
+        // Do not wait if we requested DNS validation        
+        if (request.ResourceProperties.ValidationMethod === "DNS")
+        {
+          return_properties.RecordName = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Name;
+          return_properties.RecordType = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Type;
+          return_properties.RecordValue = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Value;
+          return on_success(data.arn);
+        }
+
+        if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
+        {
+          on_success(data.arn);
+        }
+        else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
         {
-          on_fail(err);
+          on_fail("Verification Failed");
         }
         else
         {
-          if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
-          {
-            on_success(data.arn);
-          }
-          else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
-          {
-            on_fail("Verification Failed");
-          }
-          else
+          setTimeout(function()
           {
             wait_for_approval(domain_name, on_success, on_fail);
-          }
+          }, 3000);
         }
-      });
-
-    }, on_fail);
-
-
-  }, 3000);
+      }
+    });
+  }, on_fail);
 }
 
 function create(domain_name, on_success, on_fail)
@@ -62,6 +71,11 @@ function create(domain_name, on_success, on_fail)
     ]
   }
 
+  if (request.ResourceProperties.ValidationMethod === "DNS")
+  {
+    params.ValidationMethod = "DNS";
+  }
+
   console.log("Requesting Cert");
   acm.requestCertificate(params, function(err, data)
   {
@@ -129,12 +143,11 @@ function fail(err)
   Cloudformation.send(request, context, Cloudformation.FAILED, {}, "Error: " + err);
 }
 
-
 if (request.RequestType == "Create")
 {
   create(request.ResourceProperties.DomainName, function(data)
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data);
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data);
   }, fail);
 }
 
@@ -144,14 +157,14 @@ if (request.RequestType == "Update")
   {
     create(request.ResourceProperties.DomainName, function(data)
     {
-      Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data);
+      Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data);
     }, fail);
   }
   else
   {
     get_domain(function(data)
     {
-      Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data.arn);
+      Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data.arn);
     }, fail);
   }
 }
@@ -160,10 +173,10 @@ if (request.RequestType == "Delete")
 {
   destroy(request.ResourceProperties.DomainName, function()
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", "(deleted)");
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", "(deleted)");
   }, 
   function()
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", "(don't care)");
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", "(don't care)");
   });
 }

data/data/sumomo/custom_resources/USEastCertificateWaiter.js

@@ -0,0 +1,60 @@
+var acm = new aws.ACM({region: "us-east-1"}); // MUST be us-east-1.
+
+var arn = request.ResourceProperties.Certificate;
+
+function wait_for_approval(on_success, on_fail)
+{
+  var params = {
+    CertificateArn: arn
+  };
+
+  acm.describeCertificate(params, function(err, cert_data) {
+    if (err)
+    {
+      on_fail(err);
+    }
+    else
+    {
+      if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
+      {
+        on_success();
+      }
+      else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
+      {
+        on_fail("Verification Failed");
+      }
+      else
+      {
+        setTimeout(function()
+        {
+          wait_for_approval(on_success, on_fail);
+        }, 3000);
+      }
+    }
+  });
+}
+
+function fail(err)
+{
+  Cloudformation.send(request, context, Cloudformation.FAILED, {}, "Error: " + err);
+}
+
+function success()
+{
+  Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success");
+}
+
+if (request.RequestType == "Create")
+{
+  wait_for_approval(success, fail);
+}
+
+if (request.RequestType == "Update")
+{
+  wait_for_approval(success, fail);
+}
+
+if (request.RequestType == "Delete")
+{
+  success();
+}

data/exe/sumomo

@@ -1,61 +1,70 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "trollop"
-require "sumomo"
-require "yaml"
+require 'trollop'
+require 'sumomo'
+require 'yaml'
 
-SUB_COMMANDS = %w(delete create update outputs testapi)
-global_opts = Trollop::options do
+SUB_COMMANDS = %w[delete create update outputs testapi].freeze
+global_opts = Trollop.options do
   banner <<-USAGE
   Sumomo v#{Sumomo::VERSION}
 
   Usage: sumomo [options] <create|update|delete|outputs> <stackname>
   USAGE
 
-  opt :region, "AWS region to use", type: :string, default: "ap-northeast-1"
-  opt :profile, "AWS credential profile to use", type: :string, default: "default"
+  opt :region, 'AWS region to use', type: :string, default: 'ap-northeast-1'
+  opt :profile, 'AWS credential profile to use', type: :string, default: 'default'
 
   stop_on SUB_COMMANDS
 end
 
-ENV["AWS_PROFILE"] = global_opts[:profile]
+ENV['AWS_PROFILE'] = global_opts[:profile]
 
-puts "Using profile:"
-p ENV["AWS_PROFILE"]
+puts 'Using profile:'
+p ENV['AWS_PROFILE']
 
 cmd = ARGV.shift # get the subcommand
 
 cmd_opts = case cmd
-when "delete"
-	Sumomo::delete_stack(name: ARGV[0], region: global_opts[:region])
-
-when "create", "update"
-	local_opts = Trollop::options do
-		opt :filename, "File that describes the stack", type: :string, default: "Sumomofile"
-	end
-	Sumomo::create_stack(name: ARGV[0], region: global_opts[:region]) do
-		proc = Proc.new {}
-		eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
-	end
-
-when "outputs"
-	puts "Outputs for stack #{ARGV[0]}"
-	puts Sumomo::get_stack_outputs(name: ARGV[0], region: global_opts[:region]).to_yaml
-
-when "testapi"
-	local_opts = Trollop::options do
-		opt :filename, "File that describes the stack", type: :string, default: "Sumomofile"
-		opt :apiname, "Name of the API you want to test", type: :string
-		opt :prettyprint, "Test API outputs JSON with nice indentation", type: :boolean, default: true
-	end
-	puts "API Test Mode"
-	Sumomo::test_api(local_opts[:apiname], local_opts[:prettyprint]) do
-		proc = Proc.new {}
-		eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
-	end
-	exit(0)
-else
-	Trollop::die "Unknown subcommand #{cmd.inspect}"
+           when 'delete'
+             Sumomo.delete_stack(name: ARGV[0], region: global_opts[:region])
+
+           when 'create', 'update'
+             local_opts = Trollop.options do
+               opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
+             end
+             Sumomo.create_stack(name: ARGV[0], region: global_opts[:region]) do
+               proc = proc {}
+               eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
+             end
+
+           when 'outputs'
+             puts "Outputs for stack #{ARGV[0]}"
+             puts Sumomo.get_stack_outputs(name: ARGV[0], region: global_opts[:region]).to_yaml
+
+           when 'login'
+             puts "Login to stack #{ARGV[0]} instance at #{ARGV[1]}"
+             `aws s3 cp s3://#{ARGV[0]}/cloudformation/#{ARGV[0]}_master_key.pem x.txt`
+             key = JSON.parse(File.read('x.txt'))['value']
+             File.write('key.pem', key)
+             `chmod 0600 key.pem`
+             exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]}"
+
+           when 'testapi'
+             local_opts = Trollop.options do
+               opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
+               opt :apiname, 'Name of the API you want to test', type: :string
+               opt :prettyprint, 'Test API outputs JSON with nice indentation', type: :boolean, default: true
+             end
+             puts 'API Test Mode'
+             Sumomo.test_api(local_opts[:apiname], local_opts[:prettyprint]) do
+               proc = proc {}
+               eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
+             end
+             exit(0)
+           else
+             Trollop.die "Unknown subcommand #{cmd.inspect}"
 end
 
-Sumomo::wait_for_stack(name: ARGV[0], region: global_opts[:region])
+Sumomo.wait_for_stack(name: ARGV[0], region: global_opts[:region])

data/lib/sumomo.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'momo'
 require 's3cabinet'
 require 'aws-sdk'
 require 'zip'
 require 'yaml'
 
-require "sumomo/version"
+require 'sumomo/version'
 require 'sumomo/api'
 require 'sumomo/cdn'
 require 'sumomo/dns'
@@ -16,236 +18,237 @@ require 'sumomo/momo_extensions/resource'
 require 'sumomo/momo_extensions/stack'
 
 module Sumomo
-
-	def self.make_master_key_name(name:)
-		"#{name}_master_key"
-	end
-
-	def self.make_master_key_key(name:)
-		"cloudformation/#{make_master_key_name(name: name)}.pem"
-	end
-
-	def self.update_stack(name:, region:, sns_arn:nil, &block)
-
-		cf = Aws::CloudFormation::Client.new(region: region)
-		s3 = Aws::S3::Client.new(region: region)
-		ec2 = Aws::EC2::Client.new(region: region)
-
-		begin
-			s3.head_bucket(bucket: name)
-		rescue Aws::S3::Errors::NotFound => e
-			s3.create_bucket(bucket: name)
-		end
-
-		store = S3Cabinet::S3Cabinet.new(nil, nil, name, region)
-
-		master_key_name = make_master_key_name(name: name)
-		master_key_key = make_master_key_key(name: name)
-
-		if !store.get(master_key_key)
-
-			resp = nil
-			begin
-				puts "No master key found, creating..."
-				resp = ec2.create_key_pair(key_name: master_key_name)
-			rescue
-				puts "Master key conflict! Deleting old one"
-				ec2.delete_key_pair(key_name: master_key_name)
-				resp = ec2.create_key_pair(key_name: master_key_name)
-			end
-			
-			store.set(master_key_key, resp.key_material)
-			store.set("#{master_key_key}.fingerprint", resp.key_fingerprint)
-
-		end
-
-		dummy_number = store.get("cloudformation/dummy_number")
-		if dummy_number == nil
-			dummy_number = 0
-		end
-		dummy_number += 1
-		store.set("cloudformation/dummy_number", dummy_number)
-
-		hidden_values = []
-
-		template = Momo::cfl do
-			inject Sumomo::Stack
-
-			@region = region
-			@version_number = dummy_number
-			@custom_resources = {}
-			@bucket_name = name
-			@store = store
-			@master_key_name = master_key_name
-			@ec2 = ec2
-			@cf = cf
-			@s3 = s3
-
-			make "AWS::EC2::SecurityGroup", name: "DummyResource" do
-				GroupDescription "Dummy thing for Cloudformation Deployment."
-				Tags [{"Key" => "Name", "Value" => "dummyfordeploy#{dummy_number}"}]
-			end
-
-			instance_eval(&block)
-
-			hidden_values = @hidden_values
-
-		end.templatize
-
-		# TODO if the template is too big, split it into nested templates
-
-		#puts JSON.parse(template).to_yaml
-		
-		store.set_raw("cloudformation/template", template)
-
-		update_options = {
-			stack_name: name, 
-			template_url: store.url("cloudformation/template"), 
-			parameters: hidden_values,
-			capabilities: ["CAPABILITY_IAM"]
-		}
-
-		begin
-			cf.update_stack(update_options)
-		rescue => e
-			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
-
-	def self.wait_for_stack(name:, region:)
-		cf = Aws::CloudFormation::Client.new(region: region)
-
-		stack_id = name
-
-		begin
-			resp = cf.describe_stack_events(stack_name: stack_id)
-			top_event = resp.stack_events[0]
-			top_event_id = top_event.event_id
-			puts "#{top_event.logical_resource_id} #{top_event.resource_status} #{top_event.resource_status_reason}"
-		rescue => e
-			puts "describe_stack_events: #{e.message}"
-		end
-
-		failure_count = 0
-		loop do 
-			begin
-				unless /^arn\:/.match(stack_id)
-					stack_id = cf.describe_stacks(stack_name: stack_id).stacks[0].stack_id
-					#puts "Unique Stack ID: #{stack_id}"
-				end
-
-				resp = cf.describe_stack_events(stack_name: stack_id)
-				curr = 0
-				lines = []
-				loop do 
-					curr_event = resp.stack_events[curr]
-					break if curr_event.event_id == top_event_id
-					lines << "#{curr_event.logical_resource_id} #{curr_event.resource_status} #{curr_event.resource_status_reason}"
-					break if curr == resp.stack_events.length - 1
-					curr += 1
-				end
-
-				lines.reverse.each { |x| puts x }
-
-				top_event_id = resp.stack_events[0].event_id
-			rescue => e
-				puts "describe_stack_events: #{e.message}"
-				failure_count += 1
-				break if failure_count > 5
-			end
-
-
-			sleep 1
-			begin
-				resp = cf.describe_stacks(stack_name: stack_id)
-
-				break if /(COMPLETE$)|(FAILED$)/.match(resp.stacks[0].stack_status)
-
-			rescue => e
-				puts "describe_stacks: #{e.message}"
-				break
-			end
-		end 
-	end
-
-	class APITester
-
-		attr_accessor :apis
-		def initialize(&block)
-			@apis = {}
-			instance_eval(&block)
-		end
-
-		def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, with_statements: [], &block)
-			@apis[name] = block
-		end
-
-      	def method_missing(name, *args, &block)
-      	end
-	end
-
-	def self.test_api(apiname, pretty_print, &block)
-		tester = APITester.new(&block)
-		test_name = nil
-		if tester.apis.length == 1
-			test_name = tester.apis.keys.first
-		elsif apiname
-			if tester.apis.has_key? apiname
-				test_name = apiname
-			else
-				puts "Unknown API name. Please choose from one of the APIs: #{tester.apis.keys.inspect}"
-			end
-		else
-			puts "Please choose from one of the APIs: #{tester.apis.keys.inspect}"
-		end
-
-		if test_name
-			puts "Testing API #{test_name}"
-			apigen = Stack::APIGenerator.new(pretty_print: pretty_print, &tester.apis[test_name])
-		
-			script = File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "test_script.js"))
-        	script.sub!("// {{ ROUTES }}", apigen.generate);
-        	script.gsub!("{{ SCRIPT }}", apigen.init_script);
-
-			File.write(".test.js", script)
-			Stack::APIGenerator.combine_modules(".test_modules")
-
-			exec "NODE_PATH=.test_modules node .test.js"
-		end
-	end
-
-	def self.delete_stack(name:, region:, retain_bucket: false)
-		cf = Aws::CloudFormation::Client.new(region: region)
-		ec2 = Aws::EC2::Client.new(region: region)
-
-		cf.delete_stack(stack_name: name)
-		ec2.delete_key_pair(key_name: make_master_key_name(name: name))
-
-		if !retain_bucket
-			self.wait_for_stack(name: name, region: region)
-			s3 = Aws::S3::Resource.new(region: region)
-			bucket = s3.bucket(name)
-			bucket.delete!
-		end
-	end
-
-	def self.get_stack_outputs(name:, region:)
-		cf = Aws::CloudFormation::Client.new(region: region)
-
-		map = {}
-		cf.describe_stacks(stack_name: name).stacks[0].outputs.each do |x|
-			map[x.output_key] = x.output_value
-		end
-
-		map
-	end
-
-	singleton_class.send(:alias_method, :create_stack, :update_stack)
+  def self.make_master_key_name(name:)
+    "#{name}_master_key"
+  end
+
+  def self.make_master_key_key(name:)
+    "cloudformation/#{make_master_key_name(name: name)}.pem"
+  end
+
+  def self.update_stack(name:, region:, sns_arn: nil, &block)
+    cf = Aws::CloudFormation::Client.new(region: region)
+    s3 = Aws::S3::Client.new(region: region)
+    ec2 = Aws::EC2::Client.new(region: region)
+
+    begin
+      s3.head_bucket(bucket: name)
+    rescue Aws::S3::Errors::NotFound => e
+      s3.create_bucket(bucket: name)
+    end
+
+    store = S3Cabinet::S3Cabinet.new(nil, nil, name, region)
+
+    master_key_name = make_master_key_name(name: name)
+    master_key_key = make_master_key_key(name: name)
+
+    unless store.get(master_key_key)
+
+      resp = nil
+      begin
+        puts 'No master key found, creating...'
+        resp = ec2.create_key_pair(key_name: master_key_name)
+      rescue StandardError
+        puts 'Master key conflict! Deleting old one'
+        ec2.delete_key_pair(key_name: master_key_name)
+        resp = ec2.create_key_pair(key_name: master_key_name)
+      end
+
+      store.set(master_key_key, resp.key_material)
+      store.set("#{master_key_key}.fingerprint", resp.key_fingerprint)
+
+    end
+
+    dummy_number = store.get('cloudformation/dummy_number')
+    dummy_number = 0 if dummy_number.nil?
+    dummy_number += 1
+    store.set('cloudformation/dummy_number', dummy_number)
+
+    hidden_values = []
+
+    template = Momo.cfl do
+      inject Sumomo::Stack
+
+      @region = region
+      @version_number = dummy_number
+      @custom_resources = {}
+      @bucket_name = name
+      @store = store
+      @master_key_name = master_key_name
+      @ec2 = ec2
+      @cf = cf
+      @s3 = s3
+      @has_dummy = true
+      @dummy_vpc = nil
+      @timeout = nil
+
+      instance_eval(&block)
+
+      dummy_vpc = @dummy_vpc
+
+      if @has_dummy
+        make 'AWS::EC2::SecurityGroup', name: 'DummyResource' do
+          GroupDescription 'Dummy resource for tracking Cloudformation Deployment.'
+          VpcId dummy_vpc unless dummy_vpc.nil?
+          Tags [{ 'Key' => 'Name', 'Value' => "dummyfordeploy#{dummy_number}" }]
+        end
+      end
+
+      hidden_values = @hidden_values
+    end.templatize
+
+    # TODO: if the template is too big, split it into nested templates
+
+    # puts JSON.parse(template).to_yaml
+
+    store.set_raw('cloudformation/template', template)
+
+    update_options = {
+      stack_name: name,
+      template_url: store.url('cloudformation/template'),
+      parameters: hidden_values,
+      capabilities: ['CAPABILITY_IAM']
+    }
+
+    begin
+      cf.update_stack(update_options)
+    rescue StandardError => e
+      if e.message.end_with? 'does not exist'
+        update_options[:timeout_in_minutes] = @timeout if @timeout
+        update_options[:notification_arns] = sns_arn if sns_arn
+        cf.create_stack(update_options)
+      else
+        p e
+        puts "Error: #{e.message}"
+      end
+    end
+  end
+
+  def self.wait_for_stack(name:, region:)
+    cf = Aws::CloudFormation::Client.new(region: region)
+
+    stack_id = name
+
+    begin
+      resp = cf.describe_stack_events(stack_name: stack_id)
+      top_event = resp.stack_events[0]
+      top_event_id = top_event.event_id
+      puts "#{top_event.logical_resource_id} #{top_event.resource_status} #{top_event.resource_status_reason}"
+    rescue StandardError => e
+      puts "describe_stack_events: #{e.message}"
+    end
+
+    failure_count = 0
+    loop do
+      begin
+        unless /^arn\:/.match(stack_id)
+          stack_id = cf.describe_stacks(stack_name: stack_id).stacks[0].stack_id
+          # puts "Unique Stack ID: #{stack_id}"
+        end
+
+        resp = cf.describe_stack_events(stack_name: stack_id)
+        curr = 0
+        lines = []
+        loop do
+          curr_event = resp.stack_events[curr]
+          break if curr_event.event_id == top_event_id
+
+          lines << "#{curr_event.logical_resource_id} #{curr_event.resource_status} #{curr_event.resource_status_reason}"
+          break if curr == resp.stack_events.length - 1
+
+          curr += 1
+        end
+
+        lines.reverse.each { |x| puts x }
+
+        top_event_id = resp.stack_events[0].event_id
+      rescue StandardError => e
+        puts "describe_stack_events: #{e.message}"
+        failure_count += 1
+        break if failure_count > 5
+      end
+
+      sleep 1
+      begin
+        resp = cf.describe_stacks(stack_name: stack_id)
+
+        break if /(COMPLETE$)|(FAILED$)/.match(resp.stacks[0].stack_status)
+      rescue StandardError => e
+        puts "describe_stacks: #{e.message}"
+        break
+      end
+    end
+  end
+
+  class APITester
+    attr_accessor :apis
+    def initialize(&block)
+      @apis = {}
+      instance_eval(&block)
+    end
+
+    def make_api(_domain_name, name:, script: nil, dns: nil, cert: nil, with_statements: [], &block)
+      @apis[name] = block
+    end
+
+    def method_missing(name, *args, &block); end
+  end
+
+  def self.test_api(apiname, pretty_print, &block)
+    tester = APITester.new(&block)
+    test_name = nil
+    if tester.apis.length == 1
+      test_name = tester.apis.keys.first
+    elsif apiname
+      if tester.apis.key? apiname
+        test_name = apiname
+      else
+        puts "Unknown API name. Please choose from one of the APIs: #{tester.apis.keys.inspect}"
+      end
+    else
+      puts "Please choose from one of the APIs: #{tester.apis.keys.inspect}"
+    end
+
+    if test_name
+      puts "Testing API #{test_name}"
+      apigen = Stack::APIGenerator.new(pretty_print: pretty_print, &tester.apis[test_name])
+
+      script = File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, 'data', 'sumomo', 'api_modules', 'test_script.js'))
+      script.sub!('// {{ ROUTES }}', apigen.generate)
+      script.gsub!('{{ SCRIPT }}', apigen.init_script)
+
+      File.write('.test.js', script)
+      Stack::APIGenerator.combine_modules('.test_modules')
+
+      exec 'NODE_PATH=.test_modules node .test.js'
+    end
+  end
+
+  def self.delete_stack(name:, region:, retain_bucket: false)
+    cf = Aws::CloudFormation::Client.new(region: region)
+    ec2 = Aws::EC2::Client.new(region: region)
+
+    cf.delete_stack(stack_name: name)
+    ec2.delete_key_pair(key_name: make_master_key_name(name: name))
+
+    unless retain_bucket
+      wait_for_stack(name: name, region: region)
+      s3 = Aws::S3::Resource.new(region: region)
+      bucket = s3.bucket(name)
+      bucket.delete!
+    end
+  end
+
+  def self.get_stack_outputs(name:, region:)
+    cf = Aws::CloudFormation::Client.new(region: region)
+
+    map = {}
+    cf.describe_stacks(stack_name: name).stacks[0].outputs.each do |x|
+      map[x.output_key] = x.output_value
+    end
+
+    map
+  end
+
+  singleton_class.send(:alias_method, :create_stack, :update_stack)
 end