lamby 2.2.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149e90cb77c4ba7fa86e278f1b5faff11e271eec286de22564f423c7510b9b41
-  data.tar.gz: 804d1d2df7a4ed8f61b3d7fdde9ee8d3c73c9902d5b846ced5f39b4680b3f672
+  metadata.gz: 5d9a016b7bcfeb2c05897068c0f4bae484e1769331da8687e1caf743a7acd55a
+  data.tar.gz: 0cf5b19f4db83a839aaa64e7f498395803c926cb1088f00779dc02a504211268
 SHA512:
-  metadata.gz: '0911fda5872e2ea6b74c0fc0d358da8c641f89ebaf59c7ea143c62fb80baa35f5e0e301d21b4222535b42bdb0c3bad3d028083355321e0b8178d0b4e18b9c6c0'
-  data.tar.gz: 7d827e35e4c19f714ddfb30182d00d51b944513c9ccf667782218be2429eb397f27c0cfdc2737b00aa2c992075061c8e5b3e7fdad59be2efb9097542156311cf
+  metadata.gz: b4ec3d030577596053e61a85c9e3d64917e06caab8b7119a6fcf3bba4d4ba787804e8ebdfa0c175b1925b61ef25c9026eca5989c93c61637b2db89fdaca4f74c
+  data.tar.gz: cc7ea0e3b008d694e144f19abdc373b623c80f1df7c8369dee997e0ca3b1ddea98cfb78ecb9836418653d02670604a2d548f38d371d9ac6f80aaf70b088749ba

data/CHANGELOG.md

@@ -3,6 +3,34 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.6.0
+
+#### Fixed
+
+* Support multiple Set-Cookie headers for all rest types.
+
+## v2.5.3
+
+#### Fixed
+
+* Base64 encode response body if the rack response is gzip or brotli compressed.
+
+## v2.5.2
+
+* SSM file always overwrites. Fixes #65.
+
+## v2.5.1
+
+#### Fixed
+
+* Quoting in describe-subnets #62 Thanks @atwoodjw
+
+## v2.5.0
+
+#### Changed
+
+* Install files to favor containers.
+
 ## v2.2.2
 
 #### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (2.2.2)
+    lamby (2.6.0)
       rack
 
 GEM
@@ -166,4 +166,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.1.4
+   2.2.7

data/lib/lamby/handler.rb

@@ -31,6 +31,13 @@ module Lamby
       @headers
     end
 
+    def set_cookies
+      return @set_cookies if defined?(@set_cookies)
+      @set_cookies = if @headers && @headers['Set-Cookie']
+        @headers.delete('Set-Cookie').split("\n")
+      end
+    end
+
     def body
       @rbody ||= ''.tap do |rbody|
         @body.each { |part| rbody << part }
@@ -40,6 +47,7 @@ module Lamby
     def call
       return self if @called
       @status, @headers, @body = call_app
+      set_cookies
       @called = true
       self
     end
@@ -47,6 +55,7 @@ module Lamby
     def base64_encodeable?
       @headers && (
         @headers['Content-Transfer-Encoding'] == 'binary' ||
+        content_encoding_compressed? ||
         @headers['X-Lamby-Base64'] == '1'
       )
     end
@@ -80,5 +89,9 @@ module Lamby
       end
     end
 
+    def content_encoding_compressed?
+      content_encoding_header = @headers['Content-Encoding'] || ''
+      content_encoding_header.split(', ').any? { |h| ['br', 'gzip'].include?(h) }
+    end
   end
 end

data/lib/lamby/rack_alb.rb

@@ -11,7 +11,10 @@ module Lamby
 
     def response(handler)
       hhdrs = handler.headers
-      multivalue_headers = hhdrs.transform_values { |v| Array[v].compact.flatten } if multi_value?
+      if multi_value?
+        multivalue_headers = hhdrs.transform_values { |v| Array[v].compact.flatten }
+        multivalue_headers['Set-Cookie'] = handler.set_cookies if handler.set_cookies
+      end
       status_description = "#{handler.status} #{::Rack::Utils::HTTP_STATUS_CODES[handler.status]}"
       base64_encode = hhdrs['Content-Transfer-Encoding'] == 'binary' || hhdrs['X-Lamby-Base64'] == '1'
       body = Base64.strict_encode64(handler.body) if base64_encode

data/lib/lamby/rack_http.rb

@@ -6,6 +6,15 @@ module Lamby
         { isBase64Encoded: true, body: handler.body64 }
       else
         super
+      end.tap do |r|
+        if cookies = handler.set_cookies
+          if payload_version_one?
+            r[:multiValueHeaders] ||= {}
+            r[:multiValueHeaders]['Set-Cookie'] = cookies
+          else
+            r[:cookies] = cookies
+          end
+        end
       end
     end
 
@@ -79,6 +88,9 @@ module Lamby
         'HTTP/1.1'
     end
 
+    def payload_version_one?
+      event['version'] == '1.0'
+    end
 
   end
 end

data/lib/lamby/rack_rest.rb

@@ -6,6 +6,11 @@ module Lamby
         { isBase64Encoded: true, body: handler.body64 }
       else
         super
+      end.tap do |r|
+        if cookies = handler.set_cookies
+          r[:multiValueHeaders] ||= {}
+          r[:multiValueHeaders]['Set-Cookie'] = cookies
+        end
       end
     end
 

data/lib/lamby/ssm_parameter_store.rb

@@ -40,7 +40,7 @@ module Lamby
     end
 
     def to_dotenv
-      File.open(dotenv_file, 'w') { |f| f.write(dotenv_contents) }
+      File.open(dotenv_file, 'a') { |f| f.write(dotenv_contents) }
     end
 
     def get!

data/lib/lamby/templates/alb.rb

@@ -7,19 +7,27 @@ say 'Copying files...'
 copy_file tpl_file('app.rb'), app_file('app.rb')
 copy_file tpl_file('template.yaml'), app_file('template.yaml')
 gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
+copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
+copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
+copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
+  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
-copy_file tpl_file('build'), app_file('bin/build')
-chmod app_file('bin/build'), 0755
+copy_file tpl_file('_build'), app_file('bin/_build')
+gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
 chmod app_file('bin/deploy'), 0755
+copy_file tpl_file('_deploy'), app_file('bin/_deploy')
+gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_deploy'), 0755
 gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/alb/Dockerfile

@@ -0,0 +1,3 @@
+FROM public.ecr.aws/lambda/ruby:2.7
+COPY . .
+CMD ["app.handler"]

data/lib/lamby/templates/alb/Dockerfile-build

@@ -0,0 +1,15 @@
+FROM amazon/aws-sam-cli-build-image-ruby2.7
+
+# Ensure minimum required SAM version.
+# RUN pip install awscli && \
+#     pip uninstall --yes aws-sam-cli && \
+#     pip install aws-sam-cli==v1.13.2
+
+# Node for JavaScript.
+# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
+#     yum install -y nodejs && \
+#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+#     yum install -y yarn
+
+WORKDIR /var/task

data/lib/lamby/templates/alb/_build

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -e
+
+echo '== Simulate SAM Build Directory =='
+RESOURCE="RailsLambda"
+SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
+rm -rf ./.lamby ./.aws-sam
+cp -r . "$SAM_TEMP"
+mkdir -p ./.lamby
+cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
+pushd "./.lamby/$RESOURCE"
+
+echo '== Cleaning Dev Dependencies =='
+rm -rf ./.bundle \
+       ./vendor/bundle
+
+echo '== Bundle For Deployment =='
+bundle config --local deployment true
+bundle config --local without 'development test'
+bundle config --local path './vendor/bundle'
+bundle install --quiet --jobs 4
+
+echo "== Environments & Configuration =="
+# ./bin/rails \
+#   -rlamby \
+#   lamby:ssm:dotenv \
+#   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
+
+echo "== Asset Hosts & Precompiling =="
+# NODE_ENV='production' \
+#   RAILS_GROUPS=assets \
+#   ./bin/rails assets:precompile
+
+echo "== Cleanup Unused Files & Directories =="
+rm -rf \
+  log \
+  node_modules \
+  test \
+  tmp \
+  vendor/bundle/ruby/2.7.0/cache

data/lib/lamby/templates/alb/_deploy

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+set -e
+
+export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
+export RAILS_ENV=${RAILS_ENV:="production"}
+export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
+export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
+
+# https://github.com/aws/aws-sam-cli/issues/2447
+export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
+
+echo '== Creating ECR repository =='
+echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
+aws ecr create-repository \
+  --repository-name "$DEPLOYMENT_NAME" \
+  --image-tag-mutability MUTABLE \
+  --image-scanning-configuration scanOnPush=true \
+  --region "$AWS_DEFAULT_REGION" || true
+
+# Build our application code into a deployment folder
+./bin/_build
+
+export VPCID=${VPCID:=$(
+  aws ec2 describe-vpcs \
+    --output text \
+    --filters 'Name=state,Values=available' \
+    --query 'Vpcs[0].VpcId'
+)}
+
+export SUBNETS=${SUBNETS:=$(
+  aws ec2 describe-subnets \
+    --output text \
+    --filters 'Name=state,Values=available' "Name=vpc-id,Values=$VPCID" \
+    --query 'Subnets[*].SubnetId' | \
+    tr -s '[:blank:]' ','
+)}
+
+sam build \
+  --parameter-overrides \
+  RailsEnv="${RAILS_ENV}"
+
+echo "== SAM package..."
+sam package \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/template.yaml \
+  --output-template-file ./.aws-sam/build/packaged.yaml \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --capabilities "CAPABILITY_IAM" \
+  --parameter-overrides \
+    RailsEnv="${RAILS_ENV}" \
+    VpcId=${VPCID} \
+    Subnets=${SUBNETS}

data/lib/lamby/templates/alb/app.rb

@@ -1,4 +1,6 @@
+ENV['RAILS_SERVE_STATIC_FILES'] = '1'
 require_relative 'config/boot'
+require 'dotenv' ; Dotenv.load ".env.#{ENV['RAILS_ENV']}"
 require 'lamby'
 require_relative 'config/application'
 require_relative 'config/environment'

data/lib/lamby/templates/alb/deploy

@@ -1,39 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.$(whoami)"}
+export RAILS_ENV=${RAILS_ENV:=production}
 
-./bin/build
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
 
-export VPCID=${VPCID:=$(
-  aws ec2 describe-vpcs \
-    --output text \
-    --filters 'Name=state,Values=available' \
-    --query 'Vpcs[0].VpcId'
-)}
-
-export SUBNETS=${SUBNETS:=$(
-  aws ec2 describe-subnets \
-    --output text \
-    --filters "Name=state,Values=available,Name=vpc-id,Values=$VPCID" \
-    --query 'Subnets[*].SubnetId' | \
-    tr -s '[:blank:]' ','
-)}
-
-sam package \
-  --region ${AWS_DEFAULT_REGION} \
-  --template-file ./.aws-sam/build/template.yaml \
-  --output-template-file ./.aws-sam/build/packaged.yaml \
-  --s3-bucket $CLOUDFORMATION_BUCKET \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
-
-sam deploy \
-  --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}-${AWS_DEFAULT_REGION}" \
-  --capabilities "CAPABILITY_IAM" \
-  --parameter-overrides \
-    RailsEnv=${RAILS_ENV} \
-    VpcId=${VPCID} \
-    Subnets=${SUBNETS}
+docker-compose run \
+   -e CLOUDFORMATION_BUCKET \
+   cicd \
+   ./bin/_deploy

data/lib/lamby/templates/alb/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.7'
+services:
+  cicd:
+    build:
+      context: .
+      dockerfile: Dockerfile-build
+    environment:
+      - RAILS_ENV=${RAILS_ENV-development}
+      - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
+      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+    volumes:
+      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
+      - ~/.aws:/root/.aws:delegated
+      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
+      - .:/var/task:delegated
+      - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/alb/template.yaml

@@ -28,14 +28,14 @@ Resources:
 
   RailsLoadBalancerTargetGroup:
     Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    DependsOn: RailsFunctionInvokePermission
+    DependsOn: RailsLambdaInvokePermission
     Properties:
       TargetType: lambda
       TargetGroupAttributes:
         - Key: lambda.multi_value_headers.enabled
           Value: true
       Targets:
-        - Id: !GetAtt RailsFunction.Arn
+        - Id: !GetAtt RailsLambda.Arn
 
   RailsLoadBalancerHttpListener:
     Type: 'AWS::ElasticLoadBalancingV2::Listener'
@@ -58,26 +58,26 @@ Resources:
           ToPort: 80
           CidrIp: 0.0.0.0/0
 
-  RailsFunctionInvokePermission:
+  RailsLambdaInvokePermission:
     Type: AWS::Lambda::Permission
     Properties:
-      FunctionName: !GetAtt RailsFunction.Arn
+      FunctionName: !GetAtt RailsLambda.Arn
       Action: 'lambda:InvokeFunction'
       Principal: elasticloadbalancing.amazonaws.com
 
-  RailsFunction:
+  RailsLambda:
     Type: AWS::Serverless::Function
+    Metadata:
+      DockerContext: ./.lamby/RailsLambda
+      Dockerfile: Dockerfile
     Properties:
-      CodeUri: .
-      Handler: app.handler
-      Runtime: ruby2.7
       MemorySize: 512
       Timeout: 30
       Environment:
         Variables:
           RAILS_ENV: !Ref RailsEnv
       FunctionName: !Join [ '', [ 'APPNAMEHERE-', !Ref RailsEnv, '-', !Ref 'AWS::Region' ] ]
-      AutoPublishAlias: live
+      PackageType: Image
 
 Outputs:
 
@@ -85,6 +85,6 @@ Outputs:
     Description: Application Load Balancer DNS Name
     Value: !GetAtt RailsLoadBalancer.DNSName
 
-  RailsFunctionArn:
+  RailsLambdaArn:
     Description: Lambda ARN
-    Value: !GetAtt RailsFunction.Arn
+    Value: !GetAtt RailsLambda.Arn

data/lib/lamby/templates/http.rb

@@ -7,19 +7,27 @@ say 'Copying files...'
 copy_file tpl_file('app.rb'), app_file('app.rb')
 copy_file tpl_file('template.yaml'), app_file('template.yaml')
 gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
+copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
+copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
+copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
+  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
-copy_file tpl_file('build'), app_file('bin/build')
-chmod app_file('bin/build'), 0755
+copy_file tpl_file('_build'), app_file('bin/_build')
+gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
 chmod app_file('bin/deploy'), 0755
+copy_file tpl_file('_deploy'), app_file('bin/_deploy')
+gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_deploy'), 0755
 gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/http/Dockerfile

@@ -0,0 +1,3 @@
+FROM public.ecr.aws/lambda/ruby:2.7
+COPY . .
+CMD ["app.handler"]

data/lib/lamby/templates/http/Dockerfile-build

@@ -0,0 +1,15 @@
+FROM amazon/aws-sam-cli-build-image-ruby2.7
+
+# Ensure minimum required SAM version.
+# RUN pip install awscli && \
+#     pip uninstall --yes aws-sam-cli && \
+#     pip install aws-sam-cli==v1.13.2
+
+# Node for JavaScript.
+# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
+#     yum install -y nodejs && \
+#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+#     yum install -y yarn
+
+WORKDIR /var/task

data/lib/lamby/templates/http/_build

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -e
+
+echo '== Simulate SAM Build Directory =='
+RESOURCE="RailsLambda"
+SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
+rm -rf ./.lamby ./.aws-sam
+cp -r . "$SAM_TEMP"
+mkdir -p ./.lamby
+cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
+pushd "./.lamby/$RESOURCE"
+
+echo '== Cleaning Dev Dependencies =='
+rm -rf ./.bundle \
+       ./vendor/bundle
+
+echo '== Bundle For Deployment =='
+bundle config --local deployment true
+bundle config --local without 'development test'
+bundle config --local path './vendor/bundle'
+bundle install --quiet --jobs 4
+
+echo "== Environments & Configuration =="
+# ./bin/rails \
+#   -rlamby \
+#   lamby:ssm:dotenv \
+#   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
+
+echo "== Asset Hosts & Precompiling =="
+# NODE_ENV='production' \
+#   RAILS_GROUPS=assets \
+#   ./bin/rails assets:precompile
+
+echo "== Cleanup Unused Files & Directories =="
+rm -rf \
+  log \
+  node_modules \
+  test \
+  tmp \
+  vendor/bundle/ruby/2.7.0/cache

data/lib/lamby/templates/http/_deploy

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -e
+
+export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
+export RAILS_ENV=${RAILS_ENV:="production"}
+export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
+export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
+
+# https://github.com/aws/aws-sam-cli/issues/2447
+export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
+
+echo '== Creating ECR repository =='
+echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
+aws ecr create-repository \
+  --repository-name "$DEPLOYMENT_NAME" \
+  --image-tag-mutability MUTABLE \
+  --image-scanning-configuration scanOnPush=true \
+  --region "$AWS_DEFAULT_REGION" || true
+
+# Build our application code into a deployment folder
+./bin/_build
+
+sam build \
+  --parameter-overrides \
+  RailsEnv="${RAILS_ENV}"
+
+echo "== SAM package..."
+sam package \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/template.yaml \
+  --output-template-file ./.aws-sam/build/packaged.yaml \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --capabilities "CAPABILITY_IAM" \
+  --parameter-overrides \
+    RailsEnv="${RAILS_ENV}"

data/lib/lamby/templates/http/app.rb

@@ -1,4 +1,6 @@
+ENV['RAILS_SERVE_STATIC_FILES'] = '1'
 require_relative 'config/boot'
+require 'dotenv' ; Dotenv.load ".env.#{ENV['RAILS_ENV']}"
 require 'lamby'
 require_relative 'config/application'
 require_relative 'config/environment'

data/lib/lamby/templates/http/deploy

@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.$(whoami)"}
+export RAILS_ENV=${RAILS_ENV:=production}
 
-./bin/build
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
 
-sam package \
-  --region ${AWS_DEFAULT_REGION} \
-  --template-file ./.aws-sam/build/template.yaml \
-  --output-template-file ./.aws-sam/build/packaged.yaml \
-  --s3-bucket $CLOUDFORMATION_BUCKET \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
-
-sam deploy \
-  --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}-${AWS_DEFAULT_REGION}" \
-  --capabilities "CAPABILITY_IAM" \
-  --parameter-overrides \
-    RailsEnv=${RAILS_ENV}
+docker-compose run \
+   -e CLOUDFORMATION_BUCKET \
+   cicd \
+   ./bin/_deploy

data/lib/lamby/templates/http/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.7'
+services:
+  cicd:
+    build:
+      context: .
+      dockerfile: Dockerfile-build
+    environment:
+      - RAILS_ENV=${RAILS_ENV-development}
+      - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
+      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+    volumes:
+      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
+      - ~/.aws:/root/.aws:delegated
+      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
+      - .:/var/task:delegated
+      - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/http/template.yaml

@@ -13,12 +13,12 @@ Parameters:
 
 Resources:
 
-  RailsFunction:
+  RailsLambda:
     Type: AWS::Serverless::Function
+    Metadata:
+      DockerContext: ./.lamby/RailsLambda
+      Dockerfile: Dockerfile
     Properties:
-      CodeUri: .
-      Handler: app.handler
-      Runtime: ruby2.7
       MemorySize: 512
       Timeout: 30
       Environment:
@@ -30,7 +30,7 @@ Resources:
           Type: HttpApi
           Properties:
             ApiId: !Ref RailsApi
-      AutoPublishAlias: live
+      PackageType: Image
 
   RailsApi:
     Type: AWS::Serverless::HttpApi
@@ -43,6 +43,6 @@ Outputs:
     Description: API Gateway Endpoint
     Value: !Sub "https://${RailsApi}.execute-api.${AWS::Region}.amazonaws.com/${RailsEnv}/"
 
-  RailsFunctionArn:
+  RailsLambdaArn:
     Description: Lambda ARN
-    Value: !GetAtt RailsFunction.Arn
+    Value: !GetAtt RailsLambda.Arn

data/lib/lamby/templates/rest.rb

@@ -7,19 +7,27 @@ say 'Copying files...'
 copy_file tpl_file('app.rb'), app_file('app.rb')
 copy_file tpl_file('template.yaml'), app_file('template.yaml')
 gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
+copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
+copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
+copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
+  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
-copy_file tpl_file('build'), app_file('bin/build')
-chmod app_file('bin/build'), 0755
+copy_file tpl_file('_build'), app_file('bin/_build')
+gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
 chmod app_file('bin/deploy'), 0755
+copy_file tpl_file('_deploy'), app_file('bin/_deploy')
+gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
+chmod app_file('bin/_deploy'), 0755
 gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/rest/Dockerfile

@@ -0,0 +1,3 @@
+FROM public.ecr.aws/lambda/ruby:2.7
+COPY . .
+CMD ["app.handler"]

data/lib/lamby/templates/rest/Dockerfile-build

@@ -0,0 +1,15 @@
+FROM amazon/aws-sam-cli-build-image-ruby2.7
+
+# Ensure minimum required SAM version.
+# RUN pip install awscli && \
+#     pip uninstall --yes aws-sam-cli && \
+#     pip install aws-sam-cli==v1.13.2
+
+# Node for JavaScript.
+# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
+#     yum install -y nodejs && \
+#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+#     yum install -y yarn
+
+WORKDIR /var/task

data/lib/lamby/templates/rest/_build

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -e
+
+echo '== Simulate SAM Build Directory =='
+RESOURCE="RailsLambda"
+SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
+rm -rf ./.lamby ./.aws-sam
+cp -r . "$SAM_TEMP"
+mkdir -p ./.lamby
+cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
+pushd "./.lamby/$RESOURCE"
+
+echo '== Cleaning Dev Dependencies =='
+rm -rf ./.bundle \
+       ./vendor/bundle
+
+echo '== Bundle For Deployment =='
+bundle config --local deployment true
+bundle config --local without 'development test'
+bundle config --local path './vendor/bundle'
+bundle install --quiet --jobs 4
+
+echo "== Environments & Configuration =="
+# ./bin/rails \
+#   -rlamby \
+#   lamby:ssm:dotenv \
+#   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
+
+echo "== Asset Hosts & Precompiling =="
+# NODE_ENV='production' \
+#   RAILS_GROUPS=assets \
+#   ./bin/rails assets:precompile
+
+echo "== Cleanup Unused Files & Directories =="
+rm -rf \
+  log \
+  node_modules \
+  test \
+  tmp \
+  vendor/bundle/ruby/2.7.0/cache

data/lib/lamby/templates/rest/_deploy

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -e
+
+export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
+export RAILS_ENV=${RAILS_ENV:="production"}
+export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
+export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
+
+# https://github.com/aws/aws-sam-cli/issues/2447
+export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
+
+echo '== Creating ECR repository =='
+echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
+aws ecr create-repository \
+  --repository-name "$DEPLOYMENT_NAME" \
+  --image-tag-mutability MUTABLE \
+  --image-scanning-configuration scanOnPush=true \
+  --region "$AWS_DEFAULT_REGION" || true
+
+# Build our application code into a deployment folder
+./bin/_build
+
+sam build \
+  --parameter-overrides \
+  RailsEnv="${RAILS_ENV}"
+
+echo "== SAM package..."
+sam package \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/template.yaml \
+  --output-template-file ./.aws-sam/build/packaged.yaml \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --image-repository "$IMAGE_REPOSITORY" \
+  --capabilities "CAPABILITY_IAM" \
+  --parameter-overrides \
+    RailsEnv="${RAILS_ENV}"

data/lib/lamby/templates/rest/app.rb

@@ -1,4 +1,6 @@
+ENV['RAILS_SERVE_STATIC_FILES'] = '1'
 require_relative 'config/boot'
+require 'dotenv' ; Dotenv.load ".env.#{ENV['RAILS_ENV']}"
 require 'lamby'
 require_relative 'config/application'
 require_relative 'config/environment'

data/lib/lamby/templates/rest/deploy

@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.$(whoami)"}
+export RAILS_ENV=${RAILS_ENV:=production}
 
-./bin/build
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
 
-sam package \
-  --region ${AWS_DEFAULT_REGION} \
-  --template-file ./.aws-sam/build/template.yaml \
-  --output-template-file ./.aws-sam/build/packaged.yaml \
-  --s3-bucket $CLOUDFORMATION_BUCKET \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
-
-sam deploy \
-  --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}-${AWS_DEFAULT_REGION}" \
-  --capabilities "CAPABILITY_IAM" \
-  --parameter-overrides \
-    RailsEnv=${RAILS_ENV}
+docker-compose run \
+   -e CLOUDFORMATION_BUCKET \
+   cicd \
+   ./bin/_deploy

data/lib/lamby/templates/rest/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.7'
+services:
+  cicd:
+    build:
+      context: .
+      dockerfile: Dockerfile-build
+    environment:
+      - RAILS_ENV=${RAILS_ENV-development}
+      - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
+      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+    volumes:
+      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
+      - ~/.aws:/root/.aws:delegated
+      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
+      - .:/var/task:delegated
+      - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/rest/template.yaml

@@ -28,7 +28,7 @@ Resources:
             x-amazon-apigateway-any-method:
               x-amazon-apigateway-integration:
                 uri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${RailsFunction.Arn}:live/invocations
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${RailsLambda.Arn}:live/invocations
                 httpMethod: POST
                 type: aws_proxy
           /{resource+}:
@@ -40,18 +40,18 @@ Resources:
                   type: string
               x-amazon-apigateway-integration:
                 uri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${RailsFunction.Arn}:live/invocations
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${RailsLambda.Arn}:live/invocations
                 httpMethod: POST
                 type: aws_proxy
         x-amazon-apigateway-binary-media-types:
           - '*/*'
 
-  RailsFunction:
+  RailsLambda:
     Type: AWS::Serverless::Function
+    Metadata:
+      DockerContext: ./.lamby/RailsLambda
+      Dockerfile: Dockerfile
     Properties:
-      CodeUri: .
-      Handler: app.handler
-      Runtime: ruby2.7
       MemorySize: 512
       Timeout: 30
       Environment:
@@ -71,7 +71,7 @@ Resources:
             Path: /{resource+}
             Method: ANY
             RestApiId: !Ref RailsApi
-      AutoPublishAlias: live
+      PackageType: Image
 
 Outputs:
 
@@ -79,6 +79,6 @@ Outputs:
     Description: API Gateway Endpoint
     Value: !Sub "https://${RailsApi}.execute-api.${AWS::Region}.amazonaws.com/${RailsEnv}/"
 
-  RailsFunctionArn:
+  RailsLambdaArn:
     Description: Lambda ARN
-    Value: !GetAtt RailsFunction.Arn
+    Value: !GetAtt RailsLambda.Arn

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '2.2.2'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -163,19 +163,31 @@ files:
 - lib/lamby/tasks.rake
 - lib/lamby/templates.rake
 - lib/lamby/templates/alb.rb
+- lib/lamby/templates/alb/Dockerfile
+- lib/lamby/templates/alb/Dockerfile-build
+- lib/lamby/templates/alb/_build
+- lib/lamby/templates/alb/_deploy
 - lib/lamby/templates/alb/app.rb
-- lib/lamby/templates/alb/build
 - lib/lamby/templates/alb/deploy
+- lib/lamby/templates/alb/docker-compose.yml
 - lib/lamby/templates/alb/template.yaml
 - lib/lamby/templates/http.rb
+- lib/lamby/templates/http/Dockerfile
+- lib/lamby/templates/http/Dockerfile-build
+- lib/lamby/templates/http/_build
+- lib/lamby/templates/http/_deploy
 - lib/lamby/templates/http/app.rb
-- lib/lamby/templates/http/build
 - lib/lamby/templates/http/deploy
+- lib/lamby/templates/http/docker-compose.yml
 - lib/lamby/templates/http/template.yaml
 - lib/lamby/templates/rest.rb
+- lib/lamby/templates/rest/Dockerfile
+- lib/lamby/templates/rest/Dockerfile-build
+- lib/lamby/templates/rest/_build
+- lib/lamby/templates/rest/_deploy
 - lib/lamby/templates/rest/app.rb
-- lib/lamby/templates/rest/build
 - lib/lamby/templates/rest/deploy
+- lib/lamby/templates/rest/docker-compose.yml
 - lib/lamby/templates/rest/template.yaml
 - lib/lamby/templates/shared.rb
 - lib/lamby/version.rb

data/lib/lamby/templates/alb/build

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Clean any previous bundle/builds.
-rm -rf ./.aws-sam/build
-
-# Ensure native extensions built for platform.
-sam build --use-container
-
-# [HOOK] Environments & Configuration
-# https://lamby.custominktech.com/docs/environment_and_configuration
-
-# [HOOK] Asset Hosts & Precompiling
-# https://lamby.custominktech.com/docs/asset_host_and_precompiling
-
-# Clean un-needed artifacts.
-pushd ./.aws-sam/build/RailsFunction/
-rm -rf .aws-sam \
-  .git \
-  log \
-  test \
-  tmp
-popd

data/lib/lamby/templates/http/build

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Clean any previous bundle/builds.
-rm -rf ./.aws-sam/build
-
-# Ensure native extensions built for platform.
-sam build --use-container
-
-# [HOOK] Environments & Configuration
-# https://lamby.custominktech.com/docs/environment_and_configuration
-
-# [HOOK] Asset Hosts & Precompiling
-# https://lamby.custominktech.com/docs/asset_host_and_precompiling
-
-# Clean un-needed artifacts.
-pushd ./.aws-sam/build/RailsFunction/
-rm -rf .aws-sam \
-  .git \
-  log \
-  test \
-  tmp
-popd

data/lib/lamby/templates/rest/build

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Clean any previous bundle/builds.
-rm -rf ./.aws-sam/build
-
-# Ensure native extensions built for platform.
-sam build --use-container
-
-# [HOOK] Environments & Configuration
-# https://lamby.custominktech.com/docs/environment_and_configuration
-
-# [HOOK] Asset Hosts & Precompiling
-# https://lamby.custominktech.com/docs/asset_host_and_precompiling
-
-# Clean un-needed artifacts.
-pushd ./.aws-sam/build/RailsFunction/
-rm -rf .aws-sam \
-  .git \
-  log \
-  test \
-  tmp
-popd