-
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 support for X-Ray to AWS::Serverless::Api (#657)
- Loading branch information
Showing
14 changed files
with
420 additions
and
6 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
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,21 @@ | ||
| Resources: | ||
| HtmlFunction: | ||
| 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: HtmlApi | ||
| Path: / | ||
| Method: get | ||
|
|
||
| HtmlApi: | ||
| Type: AWS::Serverless::Api | ||
| Properties: | ||
| StageName: Prod | ||
| DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json | ||
| TracingEnabled: true |
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,121 @@ | ||
| { | ||
| "Resources": { | ||
| "HtmlFunctionRole": { | ||
| "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" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlApiProdStage": { | ||
| "Type": "AWS::ApiGateway::Stage", | ||
| "Properties": { | ||
| "DeploymentId": { | ||
| "Ref": "HtmlApiDeploymentf117c932f7" | ||
| }, | ||
| "RestApiId": { | ||
| "Ref": "HtmlApi" | ||
| }, | ||
| "StageName": "Prod", | ||
| "TracingEnabled": true | ||
| } | ||
| }, | ||
| "HtmlFunctionGetHtmlPermissionProd": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "HtmlFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "Prod", | ||
| "__ApiId__": "HtmlApi" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlFunctionGetHtmlPermissionTest": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "HtmlFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "*", | ||
| "__ApiId__": "HtmlApi" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlApiDeploymentf117c932f7": { | ||
| "Type": "AWS::ApiGateway::Deployment", | ||
| "Properties": { | ||
| "RestApiId": { | ||
| "Ref": "HtmlApi" | ||
| }, | ||
| "Description": "RestApi deployment id: f117c932f75cfa87d23dfed64e9430d0081ef289", | ||
| "StageName": "Stage" | ||
| } | ||
| }, | ||
| "HtmlApi": { | ||
| "Type": "AWS::ApiGateway::RestApi", | ||
| "Properties": { | ||
| "BodyS3Location": { | ||
| "Bucket": "sam-demo-bucket", | ||
| "Key": "webpage_swagger.json" | ||
| } | ||
| } | ||
| }, | ||
| "HtmlFunction": { | ||
| "Type": "AWS::Lambda::Function", | ||
| "Properties": { | ||
| "Code": { | ||
| "S3Bucket": "sam-demo-bucket", | ||
| "S3Key": "member_portal.zip" | ||
| }, | ||
| "Handler": "index.gethtml", | ||
| "Role": { | ||
| "Fn::GetAtt": [ | ||
| "HtmlFunctionRole", | ||
| "Arn" | ||
| ] | ||
| }, | ||
| "Runtime": "nodejs4.3", | ||
| "Tags": [ | ||
| { | ||
| "Value": "SAM", | ||
| "Key": "lambda:createdBy" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
129 changes: 129 additions & 0 deletions
129
tests/translator/output/aws-cn/api_with_xray_tracing.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,129 @@ | ||
| { | ||
| "Resources": { | ||
| "HtmlFunctionRole": { | ||
| "Type": "AWS::IAM::Role", | ||
| "Properties": { | ||
| "ManagedPolicyArns": [ | ||
| "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" | ||
| ], | ||
| "AssumeRolePolicyDocument": { | ||
| "Version": "2012-10-17", | ||
| "Statement": [ | ||
| { | ||
| "Action": [ | ||
| "sts:AssumeRole" | ||
| ], | ||
| "Effect": "Allow", | ||
| "Principal": { | ||
| "Service": [ | ||
| "lambda.amazonaws.com" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlApiProdStage": { | ||
| "Type": "AWS::ApiGateway::Stage", | ||
| "Properties": { | ||
| "DeploymentId": { | ||
| "Ref": "HtmlApiDeploymentf117c932f7" | ||
| }, | ||
| "RestApiId": { | ||
| "Ref": "HtmlApi" | ||
| }, | ||
| "StageName": "Prod", | ||
| "TracingEnabled": true | ||
| } | ||
| }, | ||
| "HtmlFunctionGetHtmlPermissionProd": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "HtmlFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws-cn:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "Prod", | ||
| "__ApiId__": "HtmlApi" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlFunctionGetHtmlPermissionTest": { | ||
| "Type": "AWS::Lambda::Permission", | ||
| "Properties": { | ||
| "Action": "lambda:invokeFunction", | ||
| "Principal": "apigateway.amazonaws.com", | ||
| "FunctionName": { | ||
| "Ref": "HtmlFunction" | ||
| }, | ||
| "SourceArn": { | ||
| "Fn::Sub": [ | ||
| "arn:aws-cn:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/GET/", | ||
| { | ||
| "__Stage__": "*", | ||
| "__ApiId__": "HtmlApi" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "HtmlApiDeploymentf117c932f7": { | ||
| "Type": "AWS::ApiGateway::Deployment", | ||
| "Properties": { | ||
| "RestApiId": { | ||
| "Ref": "HtmlApi" | ||
| }, | ||
| "Description": "RestApi deployment id: f117c932f75cfa87d23dfed64e9430d0081ef289", | ||
| "StageName": "Stage" | ||
| } | ||
| }, | ||
| "HtmlApi": { | ||
| "Type": "AWS::ApiGateway::RestApi", | ||
| "Properties": { | ||
| "EndpointConfiguration": { | ||
| "Types": [ | ||
| "REGIONAL" | ||
| ] | ||
| }, | ||
| "BodyS3Location": { | ||
| "Bucket": "sam-demo-bucket", | ||
| "Key": "webpage_swagger.json" | ||
| }, | ||
| "Parameters": { | ||
| "endpointConfigurationTypes": "REGIONAL" | ||
| } | ||
| } | ||
| }, | ||
| "HtmlFunction": { | ||
| "Type": "AWS::Lambda::Function", | ||
| "Properties": { | ||
| "Code": { | ||
| "S3Bucket": "sam-demo-bucket", | ||
| "S3Key": "member_portal.zip" | ||
| }, | ||
| "Handler": "index.gethtml", | ||
| "Role": { | ||
| "Fn::GetAtt": [ | ||
| "HtmlFunctionRole", | ||
| "Arn" | ||
| ] | ||
| }, | ||
| "Runtime": "nodejs4.3", | ||
| "Tags": [ | ||
| { | ||
| "Value": "SAM", | ||
| "Key": "lambda:createdBy" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.