sumomo 0.8.15 → 0.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d31828749cf57f094afad4100d0a2c41e1e23db623f4d83c7af92ea09973a2b
-  data.tar.gz: 2651d1c3f796f9153199aee4077f7f5ee3aa2c65d35fa764d01309fc90e7b117
+  metadata.gz: 861b39ec9371ce0ecf43abc366deedd675c34e38e3489712797acb7231361c54
+  data.tar.gz: a5411af6f6cb532a72c80ca5cf575e0ba5a2f1cce9ef7742e4a9d50ebfb704c6
 SHA512:
-  metadata.gz: ea85e42594b8bd2c22396d9904277b97307256335f1a2a95c397ecd5cde7b90a2fdbd4a909576080d5e371c2d7130c7c5f3043d6e0086d7a8fbd965b6e7ad700
-  data.tar.gz: f963dd40b6a1ba5a4de069310d6c44e1d55254008093bbc7933ad37096e797b8a10faabc0936b6c591f6bea85a9ac80bb9f3862b33315b8bc7825c5921dd64ac
+  metadata.gz: 948c3afa11295e67d58e4c487be8fd296026ff392f5da3c50d9c718875524c47dfeb76cea0ec00a6fc436844800aeea6a59d5d559193bc3016428e285d14d659
+  data.tar.gz: 07f8164e9b86b8dcce2c50f9bec120078cb5cf2acf7b6a37e489972309e3e3aab6a55aba2bac70f057d8bde06e25f7c43d1bff0e793edc6eaf0b4e8b5989aef1

data/data/sumomo/api_modules/real_script.js

@@ -160,12 +160,13 @@ exports.handler = function(event, context, callback) {
 
     var request = {
         _native_req: event,
-        url: "https://something" + event.path,
+        url: "https://" + event.headers.Host + event.path,
         method: event.httpMethod,
         params: {}
     }
 
     console.log(request);
+    context.callbackWaitsForEmptyEventLoop = false;
 
     router(request, callback, function(err) {
         callback(null, {

data/lib/sumomo/api.rb

@@ -143,7 +143,7 @@ module Sumomo
           body: JSON.stringify(response_object#{pretty_print})
         };
 
-        callback(null, response);
+        return callback(null, response);
       }
 
       var retval = function (#{parameter_list}) {
@@ -163,10 +163,13 @@ module Sumomo
         domain_name,
         name:,
         script: nil,
+        env: {},
         dns: nil,
         cert: nil,
         mtls_truststore: nil,
         logging: true,
+        network: nil,
+        layer: nil,
         with_statements: [], &block)
 
       api = make 'AWS::ApiGateway::RestApi', name: name do
@@ -221,6 +224,9 @@ module Sumomo
 
       fun = make_lambda(
         name: "#{name}Lambda#{@version_number}",
+        env: env,
+        network: network,
+        layer: layer,
         files: files, 
         role: custom_resource_exec_role(with_statements: with_statements) )
 

data/lib/sumomo/stack.rb

@@ -24,8 +24,11 @@ module Sumomo
                     function_key: "cloudformation/lambda/function_#{name}",
                     handler: 'index.handler',
                     runtime: 'nodejs14.x',
+                    env: {},
                     memory_size: 128,
                     timeout: 30,
+                    network: nil,
+                    layer: nil,
                     enable_logging: true,
                     role: nil)
 
@@ -45,6 +48,29 @@ module Sumomo
         end
       end
 
+      vpcconfig = nil
+
+      if network != nil
+
+        layer ||= network.subnets.keys.first
+
+        ingress = [allow_port(:all)]
+        egress = [allow_port(:all)]
+
+        lambda_sec_group = make 'AWS::EC2::SecurityGroup' do
+          GroupDescription "Lambda Security group for layer: #{layer}"
+          SecurityGroupIngress ingress
+          SecurityGroupEgress egress
+          VpcId network.vpc
+        end
+
+        subnetids = network.subnets[layer].map { |x| x[:name] }
+        vpcconfig = {
+          SecurityGroupIds: [lambda_sec_group],
+          SubnetIds: subnetids
+        }
+      end
+
       @store.set_raw(function_key, stringio.string)
 
       stack = self
@@ -58,6 +84,10 @@ module Sumomo
         Runtime runtime
         Timeout timeout
         Role role.Arn
+        VpcConfig vpcconfig unless vpcconfig.nil?
+        Environment do
+          Variables env
+        end
       end
 
       if enable_logging

data/lib/sumomo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sumomo
-  VERSION = '0.8.15'
+  VERSION = '0.8.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.17
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler