sumomo 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eeb93420ce5a5e732c9083fc72375a35f76ffec
-  data.tar.gz: ed8e2800baf73e0e093d38508345ac5a12dfc7a3
+  metadata.gz: 82038b259fd91406f002951849bd381049ab781f
+  data.tar.gz: 7ab6b857aab5696045677d6e46f28d39a2534b05
 SHA512:
-  metadata.gz: 3103ccae5a572266e85b516059cf3b6a48921c486d70a905aa29d2e8e431ae706024e8656cdf9e84ebcdbfbf1404f1054f61df8f7f52bbc7a5f6cef10830b70b
-  data.tar.gz: 33c1a56f112b3e4a554ca0fdc9145d7ccac5b601be9ec2280e80213f048fbd668390e6f3adf6c30299f9ca2f1a752e3b40a18ab631e57e03980dd443a2d901d8
+  metadata.gz: 97951e0b224355cc51028f4ddbc21f3d826aa9f3d9e5dd8b2b859f326f55597e743f5469cbb56b8332b3a99138dbe12028d2639f33609bfc5db6babbacc18420
+  data.tar.gz: 0c532926c529ae656dc2a65966ddaa23724caa930add7f2c485ffe7002cad0894358c6b74beea59eef3c94ba2c94e93d8169c1996e3c55f8a9e6a7732858638e

data/data/sumomo/api_modules/real_script.js

@@ -0,0 +1,51 @@
+'use strict';
+console.log('Loading API');
+
+var os                  = require('os');
+var http                = require('http');
+var url                 = require('url');
+var merge               = require('utils-merge');
+var Router              = require('router')
+
+var router = Router();
+
+function prepare(handler)
+{
+    return function(request, callback)
+    {
+        try 
+        {
+            request._native_req.pathParameters = request.params
+            handler(request._native_req, callback);
+        }
+        catch (e)
+        {
+            console.log(e);
+            callback(e, {
+                statusCode: 500, 
+                body: JSON.stringify({message: "Internal Server Error"}, null, 2)
+            });
+        }
+    }
+}
+
+// {{ ROUTES }}
+
+exports.handler = function(event, context, callback) {
+
+    var request = {
+        _native_req: event,
+        url: "https://something" + event.path,
+        method: event.httpMethod,
+        params: {}
+    }
+
+    console.log(request);
+
+    router(request, callback, function(err) {
+        callback(null, {
+            statusCode: 404, 
+            body: JSON.stringify({message: "File not found"}, null, 2)
+        })
+    });
+};

data/data/sumomo/api_modules/test_script.js

@@ -0,0 +1,146 @@
+'use strict';
+console.log('Loading API');
+
+var os           = require('os');
+var finalhandler = require('finalhandler');
+var http         = require('http');
+var url          = require('url');
+var merge        = require('utils-merge');
+var Router       = require('router')
+
+var router = Router();
+
+var response_sent = false;
+
+var server = http.createServer(function(req, res) {
+
+	var request = {
+		_native_req: req,
+		url: req.url,
+		method: req.method,
+		params: {}
+	}
+
+ 	router(request, res, function(err) {
+
+		res.statusCode = 404;
+		res.end(JSON.stringify({message: "File not found"}));
+ 	});
+});
+
+// Simulate API Gateway Lambda Proxy Event
+function prepare(handler)
+{
+	return function(request, res)
+	{
+		var body = [];
+		var req = request._native_req;
+
+		function callback(exception, response)
+		{
+			if (response.headers)
+			{
+				for (var key in response.headers)
+				{
+					res.setHeader(key, response.headers[key]);
+				}
+			}
+			res.statusCode = response.statusCode || 404;
+			res.end(response.body || null);
+		}
+
+		req.on('data', function(chunk) {
+			body.push(chunk);
+
+		}).on('end', function() {
+
+			var completed_body = Buffer.concat(body).toString();
+
+			var parsed_url = url.parse(req.url, true);
+
+			var headers = {};
+
+			headers["Accept"] = "*/*";
+			headers["CloudFront-Forwarded-Proto"] = "https";
+			headers["CloudFront-Is-Desktop-Viewer"] = "true";
+			headers["CloudFront-Is-Mobile-Viewer"] = "false";
+			headers["CloudFront-Is-SmartTV-Viewer"] = "false";
+			headers["CloudFront-Is-Tablet-Viewer"] = "false";
+			headers["CloudFront-Viewer-Country"] = "US";
+			headers["Content-Type"] = "";
+			headers["Host"] = "";
+			headers["User-Agent"] = "";
+			headers["Via"] = "1.1 1234567890abcdefghijklmnopqrstuv.cloudfront.net (CloudFront)";
+			headers["X-Amz-Cf-Id"] = "0000000000000000000000000-000000000-000000000000000000==";
+			headers["X-Amzn-Trace-Id"] = "Root=1-00000000-ffffffffffffffffffffffff";
+			headers["X-Forwarded-For"] = req.connection.remoteAddress;
+			headers["X-Forwarded-Port"] = "443";
+			headers["X-Forwarded-Proto"] = "https";
+
+			for(var key in req.headers)
+			{
+				var uppercased = key.replace(/(^|-)[a-z]/g, function(text){ return text.toUpperCase(); });
+
+				headers[uppercased] = req.headers[key];
+			}
+
+			var request_event = {
+				resource: "/{proxy+}",
+				path: parsed_url.pathname,
+				httpMethod: req.method,
+				headers: headers,
+				queryStringParameters: url.parse(req.url, true).query,
+				pathParameters: req.params,
+				stageVariables: null,
+				requestContext: {
+					path: parsed_url.pathname,
+					accountId: "000000000000",
+					resourceId: "123abc",
+					stage: "test",
+					requestId: "00000000-0000-0000-0000-000000000000",
+					identity: {
+						cognitoIdentityId: null,
+						accountId: null,
+						cognitoIdentityId: null,
+						caller: null,
+						apiKey: "",
+						sourceIp: req.connection.remoteAddress,
+						accessKey: null,
+						cognitoAuthenticationType: null,
+						cognitoAuthenticationProvider: null,
+						userArn: null,
+						userAgent: headers["User-Agent"],
+						user: null
+
+					},
+					resourcePath: "/{proxy+}",
+					httpMethod: req.method,
+					apiId: "12345abcde"
+				},
+
+				body: completed_body,
+				isBase64Encoded: false
+
+			};
+
+			req._native_req = undefined;
+
+ 			try
+ 			{
+		 		handler(request_event, callback);
+ 			}
+ 			catch (e)
+ 			{
+				console.log(e);
+				callback(e, {
+		 			statusCode: 500, 
+		 			body: JSON.stringify({message: "Internal Server Error"}, null, 2)
+				});
+ 			}
+		});
+	};
+}
+
+// {{ ROUTES }}
+
+server.listen(3000)

data/data/sumomo/custom_resources/APIDomainName.js

@@ -59,6 +59,7 @@ function deleteName(onSuccess, onFail)
   function(err)
   {
     // If it doesn't exist it was not created in the first place
+    onSuccess(name);
   });
 }
 

data/exe/sumomo

@@ -4,7 +4,7 @@ require "trollop"
 require "sumomo"
 require "yaml"
 
-SUB_COMMANDS = %w(delete create update)
+SUB_COMMANDS = %w(delete create update outputs testapi)
 global_opts = Trollop::options do
   banner <<-USAGE
   Sumomo v#{Sumomo::VERSION}
@@ -42,6 +42,18 @@ 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}"
 end

data/lib/sumomo.rb

@@ -177,6 +177,50 @@ module Sumomo
 		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, &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.datadir("sumomo"), "api_modules", "test_script.js"))
+        	script.sub!("// {{ ROUTES }}", apigen.generate);
+
+			File.write(".test.js", script)
+
+			exec "NODE_PATH=#{File.join(Gem.datadir("sumomo"), "api_modules", "node_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)

data/lib/sumomo/api.rb

@@ -2,10 +2,10 @@
 module Sumomo
   module Stack
 
-
     class APIGenerator
-      def initialize(&block)
+      def initialize(pretty_print: false, &block)
         @methods = {}
+        @pretty_print = pretty_print
         instance_eval(&block)
       end
 
@@ -24,6 +24,13 @@ module Sumomo
       end
 
       def generate
+
+        if @pretty_print
+            pretty_print = ", null, 2"
+        else
+            pretty_print = ""
+        end
+
         result = ""
         @methods.each do |path, resource|
             resource.each do |method, method_info|
@@ -46,7 +53,7 @@ module Sumomo
           headers: {
               "Content-Type" : "application/json; charset=utf-8"
           },
-          body: JSON.stringify(response_object)
+          body: JSON.stringify(response_object#{pretty_print})
         };
 
         callback(null, response);
@@ -71,60 +78,7 @@ module Sumomo
             Name name
         end
 
-        script ||= <<-SCRIPT
-
-    'use strict';
-    console.log('Loading API');
-
-    var os                  = require('os');
-    var http                = require('http');
-    var url                 = require('url');
-    var merge               = require('utils-merge');
-    var Router              = require('router')
-
-    var router = Router();
-
-    function prepare(handler)
-    {
-        return function(request, callback)
-        {
-            try 
-            {
-                request._native_req.pathParameters = request.params
-                handler(request._native_req, callback);
-            }
-            catch (e)
-            {
-                console.log(e);
-                callback(e, {
-                    statusCode: 500, 
-                    body: JSON.stringify({message: "Internal Server Error"}, null, 2)
-                });
-            }
-        }
-    }
-
-    // {{ ROUTES }}
-
-    exports.handler = function(event, context, callback) {
-
-        var request = {
-            _native_req: event,
-            url: "https://something" + event.path,
-            method: event.httpMethod,
-            params: {}
-        }
-
-        console.log(request);
-
-        router(request, callback, function(err) {
-            callback(null, {
-                statusCode: 404, 
-                body: JSON.stringify({message: "File not found"}, null, 2)
-            })
-        });
-    };
-    SCRIPT
+        script ||= File.read(File.join(Gem.datadir("sumomo"), "api_modules", "real_script.js"))
 
         apigen = APIGenerator.new(&block);
         script.sub!("// {{ ROUTES }}", apigen.generate);

data/lib/sumomo/ecs.rb

@@ -143,6 +143,14 @@ module Sumomo
 									Port container_port
 									Protocol "HTTP"
 									VpcId network[:vpc]
+
+									if container[:alb_sticky]
+										TargetGroupAttributes({
+											"stickiness.enabled" => true,
+											"stickiness.type" => "lb_cookie"
+										}.map{|k,v| {Key: k, Value: v} })
+										container.delete(:alb_sticky)
+									end
 								end
 
 								alb_action = {

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2511,6 +2511,8 @@ files:
 - data/sumomo/api_modules/node_modules/xmlbuilder/lib/XMLText.js
 - data/sumomo/api_modules/node_modules/xmlbuilder/lib/index.js
 - data/sumomo/api_modules/node_modules/xmlbuilder/package.json
+- data/sumomo/api_modules/real_script.js
+- data/sumomo/api_modules/test_script.js
 - data/sumomo/custom_resource_utils.js
 - data/sumomo/custom_resources/AMILookup.js
 - data/sumomo/custom_resources/APIDomainName.js