lamby 2.1.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb411b8d5961ebef380fdd6148d5349481a9f8d5ec4f935e6d3db25647b8c81
-  data.tar.gz: 889122ece8d9d93a695f8d941f37e56e898dc20c4c3e529e07fe89b87b7f043d
+  metadata.gz: ea85858e75126722596d3e49dc1818022c608730820b4898315eae359bed946b
+  data.tar.gz: 99388d1a58a5f750b5d4e98a42c3249a882eaf5604acc2776dcf0bb47f956c8b
 SHA512:
-  metadata.gz: dd62c1917031b62e0364e381dd003a24e7836e852656f02f2d4c8b77f4804b3c283a7303b4eb16ed5f5165eef8c6fa0e717e46bc15e559885e29cb7a7bab383c
-  data.tar.gz: 531a661486ef2473f83730f5bf22601429fffc52e39164bc38b473984a321ad3ce294fd21d81bef2e254746d4481af6190031470e64e1d50d55c0d995de53769
+  metadata.gz: ad20c220066a5388bdd91098facb475c3f146dad0ac5ec7f78ce173c5cbee2d77d5e7fb7f244ea0064d18191e27b218c61a3cac96f680fda528ab483921e5ce5
+  data.tar.gz: 2a91f225a1dc75594dbf9b315cdf9784f5afa1f26ced765f8e125f0ecb672ae704d6a01a2dd5e81d636dcb76a112ca07e1419c3a14b65e5029ef716ebfc83e75

data/CHANGELOG.md

@@ -3,6 +3,44 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.5.1
+
+#### Fixed
+
+* Quoting in describe-subnets #62 Thanks @atwoodjw
+
+## v2.5.0
+
+#### Changed
+
+* Install files to favor containers.
+
+## v2.2.2
+
+#### Changed
+
+* More ActiveSupport removal. Better ENV.to_h.
+
+## v2.2.1
+
+#### Changed
+
+* More ActiveSupport removal from SsmParameterStore.
+
+## v2.2.0
+
+#### Changed
+
+* Remove dependency on `activesupport` for rack-only applications.
+* Remove ActiveSupport artifacts:
+  - Replace `strip_heredoc` with `<<~HEREDOC`.
+  - Remove instances of `Object#try`, replace with `&.`.
+  - Use `Rack::Utils.build_nested_query` in place of `Object#to_query`.
+  - Replace `Object#present?` with `to_s.empty?`.
+  - Replace `Array.wrap` with `Array[obj].compact.flatten`.
+* Add a check against the `RAILS_ENV` AND `RACK_ENV` environment
+  variables prior to enabling debug mode.
+
 ## v2.1.0
 
 #### Changed
@@ -29,7 +67,7 @@ Support for new API Gateway HTTP APIs!!!
 
 #### Added
 
-* New reack handler for HTTP API v1 and v2.
+* New rack handler for HTTP API v1 and v2.
 * Lots of backfill tests for, ALBs & REST APIs.
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (2.1.0)
+    lamby (2.5.1)
       rack
 
 GEM

data/lib/lamby.rb

@@ -1,7 +1,6 @@
 require 'lamby/logger'
 require 'rack'
 require 'base64'
-require 'active_support/all'
 require 'lamby/version'
 require 'lamby/sam_helpers'
 require 'lamby/rack'

data/lib/lamby/debug.rb

@@ -6,7 +6,7 @@ module Lamby
 
     def on?(event)
       params = event['multiValueQueryStringParameters'] || event['queryStringParameters']
-      (Rails.env.development? || ENV['LAMBY_DEBUG']) && params && params['debug'] == '1'
+      (development? || ENV['LAMBY_DEBUG']) && params && params['debug'] == '1'
     end
 
     def call(event, context, env)
@@ -42,5 +42,12 @@ module Lamby
       HTML
     end
 
+    def development?
+      ENV.to_h
+        .slice('RACK_ENV', 'RAILS_ENV')
+        .values
+        .any? { |v| v.to_s.casecmp('development').zero? }
+    end
+
   end
 end

data/lib/lamby/rack.rb

@@ -71,10 +71,20 @@ module Lamby
           value.map{ |v| "#{key}=#{v}" }.join('&')
         end.flatten.join('&')
       else
-        event['queryStringParameters'].try(:to_query)
+        build_query_string
       end
     end
 
+    def build_query_string
+      return if event['queryStringParameters'].nil?
+
+      Rack::Utils.build_nested_query(
+        event.fetch('queryStringParameters')
+      )
+        .gsub('[', '%5B')
+        .gsub(']', '%5D')
+    end
+
     def base64_encoded?
       event['isBase64Encoded']
     end

data/lib/lamby/rack_alb.rb

@@ -11,7 +11,7 @@ module Lamby
 
     def response(handler)
       hhdrs = handler.headers
-      multivalue_headers = hhdrs.transform_values { |v| Array.wrap(v) } if multi_value?
+      multivalue_headers = hhdrs.transform_values { |v| Array[v].compact.flatten } if multi_value?
       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

@@ -38,8 +38,8 @@ module Lamby
 
     def env_headers
       super.tap do |hdrs|
-        if event['cookies'].present?
-          hdrs[HTTP_COOKIE] = event['cookies'].join('; ')
+        if cookies.any?
+          hdrs[HTTP_COOKIE] = cookies.join('; ')
         end
       end
     end
@@ -48,6 +48,10 @@ module Lamby
       event.dig('requestContext', 'http', 'method') || event['httpMethod']
     end
 
+    def cookies
+      event['cookies'] || []
+    end
+
     # Using custom domain names with v1.0 yields a good `path` parameter sans
     # stage. However, v2.0 and others do not. So we are just going to remove stage
     # no matter waht from other places for both.

data/lib/lamby/ssm_parameter_store.rb

@@ -16,12 +16,13 @@ module Lamby
       end
 
       def get!(path)
-        parts = path.from(1).split('/')
+        parts = path[1..-1].split('/')
         env = parts.pop
         path = "/#{parts.join('/')}"
-        new(path).get!.params.detect do |p|
+        param = new(path).get!.params.detect do |p|
           p.env == env
-        end.try(:value)
+        end
+        param&.value
       end
 
     end
@@ -44,7 +45,7 @@ module Lamby
 
     def get!
       get_all!
-      get_history! if label.present?
+      get_history! unless label.to_s.empty?
       self
     end
 
@@ -98,7 +99,7 @@ module Lamby
         with_decryption: true,
         max_results: MAX_RESULTS
       }.tap { |options|
-        token = @all_response.try(:next_token)
+        token = @all_response&.next_token
         options[:next_token] = token if token
       }
     end
@@ -137,7 +138,7 @@ module Lamby
         with_decryption: true,
         max_results: MAX_RESULTS
       }.tap { |options|
-        token = @hist_response.try(:next_token)
+        token = @hist_response&.next_token
         options[:next_token] = token if token
       }
     end

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.strip_heredoc
+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,52 @@
+#!/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)"}
+
+# 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/myorg/APPNAMEHERE"
+
+./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 "APPNAMEHERE-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "APPNAMEHERE-${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,9 @@
 #!/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
-
-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.strip_heredoc
+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,35 @@
+#!/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)"}
+
+# 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/myorg/APPNAMEHERE"
+
+./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 "APPNAMEHERE-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "APPNAMEHERE-${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,9 @@
 #!/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
-
-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.strip_heredoc
+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,35 @@
+#!/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)"}
+
+# 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/myorg/APPNAMEHERE"
+
+./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 "APPNAMEHERE-${RAILS_ENV}"
+
+echo "== SAM deploy..."
+sam deploy \
+  --region "$AWS_DEFAULT_REGION" \
+  --template-file ./.aws-sam/build/packaged.yaml \
+  --stack-name "APPNAMEHERE-${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,9 @@
 #!/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
-
-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.1.0'
+  VERSION = '2.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2021-01-16 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