Update aws-sam-translator Dependency #1448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

sriram-mv merged 5 commits into aws:develop from ShreyaGangishetty:sam-dependency-bump-branch97577

Oct 21, 2019

requirements/base.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ Flask~=1.0.2 @@
     boto3~=1.9, >=1.9.56
     PyYAML~=5.1
     cookiecutter~=1.6.0
-    aws-sam-translator==1.14.0
+    aws-sam-translator==1.15.1
     docker~=4.0
     dateparser~=0.7
     python-dateutil~=2.6
@@ Expand Down @@

requirements/isolated.txt

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     arrow==0.15.2
     attrs==19.1.0
     aws-lambda-builders==0.5.0
-    aws-sam-translator==1.14.0
+    aws-sam-translator==1.15.1
     binaryornot==0.4.4
     boto3==1.9.228
     botocore==1.12.228
@@ Expand Down @@

tests/functional/commands/validate/lib/models/all_policy_templates.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -98,8 +98,7 @@ Resources: @@
             - CloudWatchDashboardPolicy: {}
-            - RekognitionFacesPolicy:
-                CollectionId: collection
+            - RekognitionFacesPolicy: {}
             - RekognitionLabelsPolicy: {}
@@ Expand Down Expand Up / @@ -146,3 +145,9 @@ Resources: @@
             - StepFunctionsExecutionPolicy:
                 StateMachineName: name
+            - CodeCommitCrudPolicy:
+                RepositoryName: name
+            - CodeCommitReadPolicy:
+                RepositoryName: name

tests/functional/commands/validate/lib/models/api_request_model.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ Resources: @@
               type: object
               properties:
                 username:
-                  type: string
+                  type: string

tests/functional/commands/validate/lib/models/api_request_model_openapi_3.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ Resources: @@
         Type: AWS::Serverless::Api
         Properties:
           StageName: Prod
-          OpenApiVersion: '3.0.1'
+          OpenApiVersion: 3.0
           Models:
             User:
               type: object
@@ Expand Down @@

tests/functional/commands/validate/lib/models/api_with_apikey_default_override.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,51 @@
+    Resources:
+      MyApiWithAuth:
+        Type: "AWS::Serverless::Api"
+        Properties:
+          StageName: Prod
+          Auth:
+            ApiKeyRequired: true
+      MyFunctionWithApiKeyRequiredDefault:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithApiKeyRequiredDefault:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAuth
+                Path: /ApiKeyDefault
+                Method: get
+      MyFunctionWithApiKeyRequiredTrue:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithApiKeyRequiredTrue:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAuth
+                Path: /ApiKeyTrue
+                Method: get
+                Auth:
+                  ApiKeyRequired: true
+      MyFunctionWithApiKeyRequiredFalse:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithApiKeyRequiredFalse:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAuth
+                Path: /ApiKeyFalse
+                Method: get
+                Auth:
+                  ApiKeyRequired: false

tests/functional/commands/validate/lib/models/api_with_apikey_required.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    Resources:
+      MyApiWithoutAuth:
+        Type: "AWS::Serverless::Api"
+        Properties:
+          StageName: Prod
+      MyFunctionWithApiKeyRequired:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithApiKeyRequired:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithoutAuth
+                Path: /ApiKeyRequiredTrue
+                Method: get
+                Auth:
+                  ApiKeyRequired: true

tests/functional/commands/validate/lib/models/api_with_apikey_required_openapi_3.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    Resources:
+      MyApiWithoutAuth:
+        Type: "AWS::Serverless::Api"
+        Properties:
+          StageName: Prod
+          OpenApiVersion: '3.0.1'
+      MyFunctionWithApiKeyRequired:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithApiKeyRequired:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithoutAuth
+                Path: /ApiKeyRequiredTrue
+                Method: get
+                Auth:
+                  ApiKeyRequired: true

tests/functional/commands/validate/lib/models/api_with_auth_all_maximum.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ Resources: @@
           StageName: Prod
           Auth:
             DefaultAuthorizer: MyCognitoAuth
+            ApiKeyRequired: true
             Authorizers:
               MyCognitoAuth:
                 UserPoolArn: arn:aws:1
@@ Expand Down @@

tests/functional/commands/validate/lib/models/api_with_auth_all_maximum_openapi_3.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Resources: @@
           OpenApiVersion: '3.0.1'
           Auth:
             DefaultAuthorizer: MyCognitoAuth
+            ApiKeyRequired: true
             Authorizers:
               MyCognitoAuth:
                 UserPoolArn: arn:aws:1
@@ Expand Down @@

tests/functional/commands/validate/lib/models/api_with_aws_account_blacklist.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,25 @@
+    Globals:
+      Api:
+        Auth:
+          ResourcePolicy:
+            AwsAccountBlacklist: ['12345']
+    Resources:
+      MyFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+          InlineCode: |
+            exports.handler = async (event) => {
+              const response = {
+                statusCode: 200,
+                body: JSON.stringify('Hello from Lambda!'),
+              };
+              return response;
+            };
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            Api:
+              Type: Api
+              Properties:
+                Method: Put
+                Path: /get

tests/functional/commands/validate/lib/models/api_with_aws_account_whitelist.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,28 @@
+    Resources:
+      MyFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+          InlineCode: |
+            exports.handler = async (event) => {
+              const response = {
+                statusCode: 200,
+                body: JSON.stringify('Hello from Lambda!'),
+              };
+              return response;
+            };
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            Api:
+              Type: Api
+              Properties:
+                Auth:
+                  ResourcePolicy:
+                    AwsAccountWhitelist: [
+                      "12345"
+                    ]
+                    AwsAccountBlacklist: [
+                      "67890"
+                    ]
+                Method: Put
+                Path: /get

tests/functional/commands/validate/lib/models/api_with_aws_iam_auth_overrides.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,11 @@
     Resources:
+      MyApiWithAwsIamAuthNoCallerCredentials:
+        Type: "AWS::Serverless::Api"
+        Properties:
+          StageName: Prod
+          Auth:
+            DefaultAuthorizer: AWS_IAM
+            InvokeRole: NONE
       MyApiWithAwsIamAuth:
         Type: "AWS::Serverless::Api"
         Properties:
@@ Expand Down Expand Up / @@ -84,3 +91,64 @@ Resources: @@
                 Auth:
                   Authorizer: AWS_IAM
                   InvokeRole: arn:aws:iam::456::role/something-else
+      MyFunctionNONEInvokeRole:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            API3:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuth
+                Method: get
+                Path: /MyFunctionNONEInvokeRole
+                Auth:
+                  Authorizer: AWS_IAM
+                  InvokeRole: NONE
+      MyFunctionNullInvokeRole:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            API3:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuth
+                Method: get
+                Path: /MyFunctionNullInvokeRole
+                Auth:
+                  Authorizer: AWS_IAM
+                  InvokeRole: null
+      MyFunctionCallerCredentialsOverride:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            API3:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuthNoCallerCredentials
+                Method: get
+                Path: /
+                Auth:
+                  Authorizer: AWS_IAM
+                  InvokeRole: CALLER_CREDENTIALS
+      MyFunctionNoCallerCredentials:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            API3:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuthNoCallerCredentials
+                Method: post
+                Path: /

...ctional/commands/validate/lib/models/api_with_default_aws_iam_auth_and_no_auth_route.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,29 @@
+    Resources:
+      MyApiWithAwsIamAuth:
+        Type: "AWS::Serverless::Api"
+        Properties:
+          StageName: Prod
+          Auth:
+            DefaultAuthorizer: AWS_IAM
+      MyFunctionWithAwsIamAuth:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://bucket/key
+          Handler: index.handler
+          Runtime: nodejs8.10
+          Events:
+            MyApiWithAwsIamAuth:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuth
+                Path: /
+                Method: post
+            MyApiWithNoAuth:
+              Type: Api
+              Properties:
+                RestApiId: !Ref MyApiWithAwsIamAuth
+                Path: /
+                Method: get
+                Auth:
+                  Authorizer: 'NONE'

tests/functional/commands/validate/lib/models/api_with_incompatible_stage_name.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,56 @@
+    Resources:
+      HyphenFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://sam-demo-bucket/member_portal.zip
+          Handler: index.gethtml
+          Runtime: nodejs4.3
+          Events:
+            GetHtml:
+              Type: Api
+              Properties:
+                RestApiId: HyphenApi
+                Path: /
+                Method: get
+                RequestModel:
+                  Model: User
+                  Required: true
+      HyphenApi:
+        Type: AWS::Serverless::Api
+        Properties:
+          StageName: hoge-fuga
+          Models:
+            User:
+              type: object
+              properties:
+                username:
+                  type: string
+      UnderscoreFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+          CodeUri: s3://sam-demo-bucket/member_portal.zip
+          Handler: index.gethtml
+          Runtime: nodejs4.3
+          Events:
+            GetHtml:
+              Type: Api
+              Properties:
+                RestApiId: UnderscoreApi
+                Path: /
+                Method: get
+                RequestModel:
+                  Model: User
+                  Required: true
+      UnderscoreApi:
+        Type: AWS::Serverless::Api
+        Properties:
+          StageName: hoge_fuga
+          Models:
+            User:
+              type: object
+              properties:
+                username:
+                  type: string

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update aws-sam-translator Dependency #1448

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!