lamby 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8846dc8b26074a2887d0f5d0a605cd19345c4f1c5d36e2be5f856606c95f12e
-  data.tar.gz: 2251ce4c68c2e7d1160f1917cce9e858dab4e19d068edcaf310e997ac698d2ce
+  metadata.gz: 680b99fd678aef833c4bdca9cee66b2adcb171f8e0ada61fffec9443f6304c21
+  data.tar.gz: 41664f4e4e02e4ab88112ad6f5f16ec59901cbd7f58639833a322658afec9443
 SHA512:
-  metadata.gz: 197fb20357ba00b1dd50a2c2ef6a6804532a861afe9fa2ae4490c1fa1d5ea8648e02ba505070afc06f96051a913ae89f2a1403c41e3750ac96d8af239468d633
-  data.tar.gz: 258e6f51dbc28f483286068e2b749a843e50a082fc18a198bf5242f27b509eb93f845bf06ab4bd49b2a6daacb00759794b77fd4b88991f088ce8ae59d38427f9
+  metadata.gz: 7705fcb6bf84b50267a0a51008d0003b506198cbfd72c69d7b1114c97780f52f89793374f10d2a36fb0ec7932243e13ba5e8a29b69ab8d8eaa4d9cbb37f16861
+  data.tar.gz: 73f4038e54a8a5417cef4586c25497dcad49af932b3359ae3827a115b5d018c42f57a7b39ce8ef43d5da1b6be6251f945e6bf5ee72b2c66d67587d0f11f5c36f

data/CHANGELOG.md

@@ -1,51 +1,84 @@
 <!-- -*- mode: markdown -*- -->
+
 # Keep A Changelog!
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.6.1
+
+#### Fixed
+
+- Support redirects with empty response body.
+
+#### Added
+
+- Tests for enabling Rack::Deflate middleware by passing RACK_DEFLATE_ENABLED env variable.
+
+## 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.
+- Install files to favor containers.
 
 ## v2.2.2
 
 #### Changed
 
-* More ActiveSupport removal. Better ENV.to_h.
+- More ActiveSupport removal. Better ENV.to_h.
 
 ## v2.2.1
 
 #### Changed
 
-* More ActiveSupport removal from SsmParameterStore.
+- More ActiveSupport removal from SsmParameterStore.
 
 ## v2.2.0
 
 #### Changed
 
-* Remove dependency on `activesupport` for rack-only applications.
-* Remove ActiveSupport artifacts:
+- 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
+- Add a check against the `RAILS_ENV` AND `RACK_ENV` environment
   variables prior to enabling debug mode.
 
 ## v2.1.0
 
 #### Changed
 
-* Only load the railtie if `Rails` is defined.
+- Only load the railtie if `Rails` is defined.
 
 ## v2.0.1
 
 #### Changed
 
-* Remove Rails runtime dep. Only rack is needed.
+- Remove Rails runtime dep. Only rack is needed.
 
 ## v2.0.0
 
@@ -53,120 +86,107 @@ Support for new API Gateway HTTP APIs!!!
 
 #### Changed
 
-* The `Lamby.handler` must have a `:rack` option. One of `:http`, `:rest`, `:alb`.
-* Renamed template generators to match options above.
-* The `lamby:install` task now defaults to HTTP API.
-* Changed the name of `:api` rack option to `:rest`.
-* Removed `export` from Dotenv files. Better Docker compatability.
+- The `Lamby.handler` must have a `:rack` option. One of `:http`, `:rest`, `:alb`.
+- Renamed template generators to match options above.
+- The `lamby:install` task now defaults to HTTP API.
+- Changed the name of `:api` rack option to `:rest`.
+- Removed `export` from Dotenv files. Better Docker compatability.
 
 #### Added
 
-* New rack handler for HTTP API v1 and v2.
-* Lots of backfill tests for, ALBs & REST APIs.
-
+- New rack handler for HTTP API v1 and v2.
+- Lots of backfill tests for, ALBs & REST APIs.
 
 ## v1.0.3
 
 #### Changed
 
-* Change shebangs to `#!/usr/bin/env bash`
-
+- Change shebangs to `#!/usr/bin/env bash`
 
 ## v1.0.2
 
 #### Changed
 
-* Adds an optional 'overwrite' parameter to #to_env.
+- Adds an optional 'overwrite' parameter to #to_env.
 
 ## v1.0.1
 
 #### Changed
 
-* Links in bin/build templates to point to lamby.custominktech.com site.
-
+- Links in bin/build templates to point to lamby.custominktech.com site.
 
 ## v1.0.0
 
 #### Fixed
 
-* ALB query params & binary responses. Fixes #38.
-
+- ALB query params & binary responses. Fixes #38.
 
 ## v0.6.0
 
 #### Added
 
-* APPLICATION LOAD BALANACER SUPPORT!!! The new default. Use `rack: :api` option to handler for API Gateway support.
+- APPLICATION LOAD BALANACER SUPPORT!!! The new default. Use `rack: :api` option to handler for API Gateway support.
 
 #### Changed
 
-* Rake task `lamby:install` now defaults to `application_load_balancer`
-
+- Rake task `lamby:install` now defaults to `application_load_balancer`
 
 ## v0.5.1
 
 #### Fixed
 
-* The .gitignore file template. Fix .aws-sam dir.
-
+- The .gitignore file template. Fix .aws-sam dir.
 
 ## v0.5.0
 
 #### Added
 
-* Template generators for first install. Ex: `./bin/rake -r lamby lamby:install:api_gateway`.
-* New `Lamby::SsmParameterStore.get!` helper.
-
+- Template generators for first install. Ex: `./bin/rake -r lamby lamby:install:api_gateway`.
+- New `Lamby::SsmParameterStore.get!` helper.
 
 ## v0.4.1
 
 #### Fixed
 
-* Fix type in v0.4.0 fix below.
-
+- Fix type in v0.4.0 fix below.
 
 ## v0.4.0
 
 #### Fixed
 
-* File uploads in #33 using `CONTENT_TYPE` and `CONTENT_LENGTH`.
-
+- File uploads in #33 using `CONTENT_TYPE` and `CONTENT_LENGTH`.
 
 ## v0.3.2
 
 #### Added
 
-* Pass Request ID for CloudWatch logs. Fixes #30.
-
+- Pass Request ID for CloudWatch logs. Fixes #30.
 
 ## v0.3.1
 
 #### Changed
 
-* Docs and SAM template tweaks.
-
+- Docs and SAM template tweaks.
 
 ## v0.3.0
 
 #### Added
 
-* Secure configs rake task.
-* Project bin setup and tests.
+- Secure configs rake task.
+- Project bin setup and tests.
 
 #### Changed
 
-* SAM template tweaks.
-
+- SAM template tweaks.
 
 ## v0.2.0
 
 #### Changed
 
-* Simple docs and project re-organization.
-
+- Simple docs and project re-organization.
 
 ## v0.1.0
 
 #### Added
 
-* New gem and placeholder in rubygems.
+- New gem and placeholder in rubygems.

data/Gemfile.lock

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

data/Rakefile

@@ -10,4 +10,12 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
 end
 
-task :default => :test
+Rake::TestTask.new(:test_deflate) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/rack_deflate_test.rb"]
+  t.verbose = false
+  t.warning = false
+end
+
+task :default => [:test, :test_deflate]

data/bin/_test

@@ -4,3 +4,4 @@ set -e
 export RAILS_ENV="test"
 
 bundle exec rake test
+RACK_DEFLATE_ENABLED=1 bundle exec rake test_deflate

data/lib/lamby/handler.rb

@@ -31,15 +31,23 @@ 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 }
+        @body.each { |part| rbody << part if part }
       end
     end
 
     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/_deploy

@@ -1,14 +1,24 @@
 #!/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.$(whoami)"}
+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/myorg/APPNAMEHERE"
+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:=$(
@@ -21,7 +31,7 @@ export VPCID=${VPCID:=$(
 export SUBNETS=${SUBNETS:=$(
   aws ec2 describe-subnets \
     --output text \
-    --filters "Name=state,Values=available,Name=vpc-id,Values=$VPCID" \
+    --filters 'Name=state,Values=available' "Name=vpc-id,Values=$VPCID" \
     --query 'Subnets[*].SubnetId' | \
     tr -s '[:blank:]' ','
 )}
@@ -37,13 +47,13 @@ sam package \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
   --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
 echo "== SAM deploy..."
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \

data/lib/lamby/templates/alb/deploy

@@ -3,6 +3,10 @@ set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
+
 docker-compose run \
    -e CLOUDFORMATION_BUCKET \
    cicd \

data/lib/lamby/templates/http/_deploy

@@ -1,14 +1,24 @@
 #!/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.$(whoami)"}
+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/myorg/APPNAMEHERE"
+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 \
@@ -22,13 +32,13 @@ sam package \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
   --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
 echo "== SAM deploy..."
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \

data/lib/lamby/templates/http/deploy

@@ -3,6 +3,10 @@ set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
+
 docker-compose run \
    -e CLOUDFORMATION_BUCKET \
    cicd \

data/lib/lamby/templates/rest/_deploy

@@ -1,14 +1,24 @@
 #!/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.$(whoami)"}
+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/myorg/APPNAMEHERE"
+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 \
@@ -22,13 +32,13 @@ sam package \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
   --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "APPNAMEHERE-${RAILS_ENV}"
+  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
 echo "== SAM deploy..."
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
+  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \

data/lib/lamby/templates/rest/deploy

@@ -3,6 +3,10 @@ set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
+if [[ "$OSTYPE" == *"darwin"* ]]; then
+  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
+fi
+
 docker-compose run \
    -e CLOUDFORMATION_BUCKET \
    cicd \

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '2.5.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack