jets 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf0010dec35019800760689c22c39c6bc681f6cb47595a535cd1bf66a09eacbf
-  data.tar.gz: fc3eb23ae40583381ba7c11c0cb1e5907a753a664a56e3b0251d2538e52b72c7
+  metadata.gz: 5ecc5e447f03b9d40dade6bff50a44934927025c95ccf361f982cc53604df333
+  data.tar.gz: 73c5f39837c54978981ec64d95fb35357120a9713b607da78489f7c90f2b6dcc
 SHA512:
-  metadata.gz: 175d11b87fdfdab670311753d3c5c4451defc9f1f1efd9dd091caedc314e14f7493635b33314227bc24386d2dfb5923d3a239ddfc995c6ea714978989350bd0d
-  data.tar.gz: 1fbe09dd204c1478e532c2d62b565fabcf6d201a8512241b6efbe86a2bb4c07f2f6689aaf897e33ccc08504894907a327b7e3230c871a29d1d4785becdc44d05
+  metadata.gz: f2e6263c94821deef72dede51d7f7bb90f5f23a097a019e934f43244ad281f3aacfe64c7ff11645a13b059927b5d4607de4e299b9290cbd77cd29323643c929a
+  data.tar.gz: e9d1d33c1941262bca8139d7d0512b0ab89ec9e4b0300d2d232ca4de083c0eeffe009e5e62910ea5c2661fd8bda4f35295246b5cc18e37a129b1126b5b16a65c

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.1.2]
+- Add option to specify authorization type application-wide option and on a per-route basis.
+- Add option to specify endpoint type of the ApiGateway: config.api.endpoint_type option
+- pull request #74 from adam-harwood/route_authorization
+- pull request #75 from adam-harwood/apig_endpoint_configuration
+- pull request #76 from tongueroo/api-endpoint
+- pull request #77 from tongueroo/api-auth
+- fix jets new, comment out building of middleware during boot for now
+
 ## [1.1.1]
 - provide instructions to run jets upgrade:v1 for config.ru update
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.1.1)
+    jets (1.1.2)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -65,33 +65,33 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.114.0)
-    aws-sdk-cloudformation (1.12.0)
-      aws-sdk-core (~> 3, >= 3.37.0)
+    aws-partitions (1.115.0)
+    aws-sdk-cloudformation (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.10.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-cloudwatchlogs (1.11.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.38.0)
+    aws-sdk-core (3.39.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.16.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-dynamodb (1.17.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.11.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-kms (1.12.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-lambda (1.14.0)
-      aws-sdk-core (~> 3, >= 3.37.0)
+    aws-sdk-lambda (1.15.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.24.1)
-      aws-sdk-core (~> 3, >= 3.37.0)
+    aws-sdk-s3 (1.25.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sdk-sns (1.8.1)
-      aws-sdk-core (~> 3, >= 3.37.0)
+    aws-sdk-sns (1.9.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     builder (3.2.3)

data/lib/jets/application.rb

@@ -78,6 +78,10 @@ class Jets::Application
     config.session.store = Rack::Session::Cookie # note when accessing it use session[:store] since .store is an OrderedOptions method
     config.session.options = {}
 
+    config.api = ActiveSupport::OrderedOptions.new
+    config.api.authorization_type = "NONE"
+    config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
+
     config
   end
 

data/lib/jets/booter.rb

@@ -11,7 +11,7 @@ class Jets::Booter
       setup_db
       app_initializers
       turbine_initializers
-      build_middleware_stack
+      # build_middleware_stack # TODO: figure out how to build middleware during Jets.boot without breaking jets new and webpacker:install
 
       @booted = true
     end

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -24,6 +24,8 @@ Jets.application.configure do
   # config.function.role = "arn:aws:iam::#{Jets.aws.account}:role/service-role/pre-created"
   # config.function.memory_size = 1536
 
+  # config.api.endpoint_type = 'PRIVATE' # Default is 'EDGE' (https://docs.aws.amazon.com/apigateway/api-reference/link-relation/restapi-create/#endpointConfiguration)
+
   # config.function.environment = {
   #   global_app_key1: "global_app_value1",
   #   global_app_key2: "global_app_value2",

data/lib/jets/resource/api_gateway/cors.rb

@@ -10,7 +10,7 @@ module Jets::Resource::ApiGateway
           properties: {
             resource_id: "!Ref #{resource_id}",
             rest_api_id: "!Ref RestApi",
-            authorization_type: "NONE",
+            authorization_type: authorization_type,
             http_method: "OPTIONS",
             method_responses: [{
               status_code: '200',

data/lib/jets/resource/api_gateway/method.rb

@@ -21,7 +21,7 @@ module Jets::Resource::ApiGateway
             rest_api_id: "!Ref RestApi",
             http_method: @route.method,
             request_parameters: {},
-            authorization_type: "NONE",
+            authorization_type: authorization_type,
             integration: {
               integration_http_method: "POST",
               type: "AWS_PROXY",
@@ -64,6 +64,12 @@ module Jets::Resource::ApiGateway
     memoize :cors
 
   private
+
+    def authorization_type
+      type = @route.authorization_type || Jets.config.api.authorization_type
+      type.upcase
+    end
+
     def resource_id
       @route.path == '' ?
        "RootResourceId" :

data/lib/jets/resource/api_gateway/rest_api.rb

@@ -1,17 +1,21 @@
 module Jets::Resource::ApiGateway
   class RestApi < Jets::Resource::Base
+
     def definition
       {
         rest_api: {
           type: "AWS::ApiGateway::RestApi",
           properties: {
             name: Jets::Naming.gateway_api_name,
+            endpoint_configuration: {
+              types: types
+            }
             # binary_media_types: ['*/*'], # TODO: comment out, breaking form post
           }
         }
       }
     end
-
+    
     def outputs
       {
         "RestApi" => "!Ref RestApi",
@@ -19,5 +23,10 @@ module Jets::Resource::ApiGateway
         "RootResourceId" => "!GetAtt RestApi.RootResourceId",
       }
     end
+
+    def types
+      endpoint_type = Jets.config.api.endpoint_type || 'EDGE'
+      [endpoint_type.upcase]
+    end
   end
 end

data/lib/jets/route.rb

@@ -120,6 +120,10 @@ class Jets::Route
     { key => value }
   end
 
+  def authorization_type
+    @options[:authorization_type]
+  end
+
 private
   def ensure_jets_format(path)
     path.split('/').map do |s|

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack