-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(api): Add Access log and canary setting support to templates (#643)
- Loading branch information
Showing
16 changed files
with
1,260 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| Globals: | ||
| Api: | ||
| AccessLogSetting: | ||
| DestinationArn: "arn:aws:logs:us-west-2:012345678901/API-Gateway-Execution-Logs_0123456789/prod:log-stream:12345678910" | ||
| Format: "$context.requestId" | ||
|
|
||
| Resources: | ||
| ImplicitApiFunction: | ||
| Type: AWS::Serverless::Function | ||
| Properties: | ||
| CodeUri: s3://sam-demo-bucket/member_portal.zip | ||
| Handler: index.gethtml | ||
| Runtime: nodejs4.3 | ||
| Events: | ||
| GetHtml: | ||
| Type: Api | ||
| Properties: | ||
| Path: / | ||
| Method: get | ||
|
|
||
| ExplicitApi: | ||
| Type: AWS::Serverless::Api | ||
| Properties: | ||
| StageName: Prod | ||
| DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| Globals: | ||
| Api: | ||
| CanarySetting: | ||
| PercentTraffic: 100 | ||
| StageVariablesOverrides: | ||
| sv1: "test" | ||
| sv2: "test2" | ||
| UseStageCache: false | ||
|
|
||
| Resources: | ||
| ImplicitApiFunction: | ||
| Type: AWS::Serverless::Function | ||
| Properties: | ||
| CodeUri: s3://sam-demo-bucket/member_portal.zip | ||
| Handler: index.gethtml | ||
| Runtime: nodejs4.3 | ||
| Events: | ||
| GetHtml: | ||
| Type: Api | ||
| Properties: | ||
| Path: / | ||
| Method: get | ||
|
|
||
| ExplicitApi: | ||
| Type: AWS::Serverless::Api | ||
| Properties: | ||
| StageName: Prod | ||
| DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json |
182 changes: 182 additions & 0 deletions
182
tests/translator/output/api_with_access_log_setting.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| { | ||
| "Resources": { | ||
| "ImplicitApiFunction": { | ||
| "Type": "AWS::Lambda::Function", | ||
| "Properties": { | ||
| "Code": { | ||
| "S3Bucket": "sam-demo-bucket", | ||
| "S3Key": "member_portal.zip" | ||
| }, | ||
| "Handler": "index.gethtml", | ||
| "Role": { | ||
| "Fn::GetAtt": [ | ||
| "ImplicitApiFunctionRole", | ||
| "Arn" | ||
| ] | ||
| }, | ||
| "Runtime": "nodejs4.3", | ||
| "Tags": [ | ||
| { | ||
| "Value": "SAM", | ||
| "Key": "lambda:createdBy" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "ImplicitApiFunctionRole": { | ||
| "Type": "AWS::IAM::Role", | ||
| "Properties": { | ||
| "ManagedPolicyArns": [ | ||
| "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" | ||
| ], | ||
| "AssumeRolePolicyDocument": { | ||
| "Version": "2012-10-17", | ||
| "Statement": [ | ||
| { | ||
| "Action": [ | ||
| "sts:AssumeRole" | ||
| ], | ||
| "Effect": "Allow", | ||
| "Principal": { | ||
| "Service": [ | ||
| "lambda.amazonaws.com" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "ExplicitApiDeploymentf117c932f7": { | ||
| "Type": "AWS::ApiGateway::Deployment", | ||
| "Properties": { | ||
| "RestApiId": { | ||
| "Ref": "ExplicitApi" | ||
| }, | ||
| "Description": "RestApi deployment id: f117c932f75cfa87d23dfed64e9430d0081ef289", | ||
| "StageName": "Stage" | ||
| } | ||
| }, | ||
| "ImplicitApiFunctionGetHtmlPermissionTest": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "ImplicitApiFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "*", | ||
| "__ApiId__": { | ||
| "Ref": "ServerlessRestApi" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "ImplicitApiFunctionGetHtmlPermissionProd": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "ImplicitApiFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "Prod", | ||
| "__ApiId__": { | ||
| "Ref": "ServerlessRestApi" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "ExplicitApi": { | ||
| "Type": "AWS::ApiGateway::RestApi", | ||
| "Properties": { | ||
| "BodyS3Location": { | ||
| "Bucket": "sam-demo-bucket", | ||
| "Key": "webpage_swagger.json" | ||
| } | ||
| } | ||
| }, | ||
| "ExplicitApiProdStage": { | ||
| "Type": "AWS::ApiGateway::Stage", | ||
| "Properties": { | ||
| "AccessLogSetting": { | ||
| "DestinationArn": "arn:aws:logs:us-west-2:012345678901/API-Gateway-Execution-Logs_0123456789/prod:log-stream:12345678910", | ||
| "Format": "$context.requestId" | ||
| }, | ||
| "DeploymentId": { | ||
| "Ref": "ExplicitApiDeploymentf117c932f7" | ||
| }, | ||
| "RestApiId": { | ||
| "Ref": "ExplicitApi" | ||
| }, | ||
| "StageName": "Prod" | ||
| } | ||
| }, | ||
| "ServerlessRestApiProdStage": { | ||
| "Type": "AWS::ApiGateway::Stage", | ||
| "Properties": { | ||
| "AccessLogSetting": { | ||
| "DestinationArn": "arn:aws:logs:us-west-2:012345678901/API-Gateway-Execution-Logs_0123456789/prod:log-stream:12345678910", | ||
| "Format": "$context.requestId" | ||
| }, | ||
| "DeploymentId": { | ||
| "Ref": "ServerlessRestApiDeployment62b96c1a61" | ||
| }, | ||
| "RestApiId": { | ||
| "Ref": "ServerlessRestApi" | ||
| }, | ||
| "StageName": "Prod" | ||
| } | ||
| }, | ||
| "ServerlessRestApiDeployment62b96c1a61": { | ||
| "Type": "AWS::ApiGateway::Deployment", | ||
| "Properties": { | ||
| "RestApiId": { | ||
| "Ref": "ServerlessRestApi" | ||
| }, | ||
| "Description": "RestApi deployment id: 62b96c1a611878eefb13e8ef66dbc71b9ba3dd19", | ||
| "StageName": "Stage" | ||
| } | ||
| }, | ||
| "ServerlessRestApi": { | ||
| "Type": "AWS::ApiGateway::RestApi", | ||
| "Properties": { | ||
| "Body": { | ||
| "info": { | ||
| "version": "1.0", | ||
| "title": { | ||
| "Ref": "AWS::StackName" | ||
| } | ||
| }, | ||
| "paths": { | ||
| "/": { | ||
| "get": { | ||
| "x-amazon-apigateway-integration": { | ||
| "httpMethod": "POST", | ||
| "type": "aws_proxy", | ||
| "uri": { | ||
| "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ImplicitApiFunction.Arn}/invocations" | ||
| } | ||
| }, | ||
| "responses": {} | ||
| } | ||
| } | ||
| }, | ||
| "swagger": "2.0" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.