@aws-solutions-constructs/aws-cloudfront-apigateway-lambda 2.3.0 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +113 -9
- package/README.md +45 -14
- package/lib/index.js +1 -1
- package/package.json +9 -9
- package/test/integ.customCloudfrontLoggingBucket.expected.json +139 -0
- package/test/integ.customCloudfrontLoggingBucket.js +3 -1
- package/test/integ.no-arguments.expected.json +141 -2
- package/test/integ.no-arguments.js +6 -1
- package/test/integ.override-behavior.expected.json +141 -2
- package/test/integ.override-behavior.js +7 -2
package/.jsii
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
"url": "https://aws.amazon.com"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.
|
|
12
|
-
"@aws-solutions-constructs/core": "2.
|
|
13
|
-
"aws-cdk-lib": "^2.
|
|
11
|
+
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.6.0",
|
|
12
|
+
"@aws-solutions-constructs/core": "2.6.0",
|
|
13
|
+
"aws-cdk-lib": "^2.20.0",
|
|
14
14
|
"constructs": "^10.0.0"
|
|
15
15
|
},
|
|
16
16
|
"dependencyClosure": {
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"targets": {
|
|
43
43
|
"dotnet": {
|
|
44
44
|
"iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
|
|
45
|
-
"namespace": "Amazon.
|
|
46
|
-
"packageId": "Amazon.
|
|
45
|
+
"namespace": "Amazon.SolutionsConstructs.AWS.Core",
|
|
46
|
+
"packageId": "Amazon.SolutionsConstructs.AWS.Core",
|
|
47
47
|
"signAssembly": true
|
|
48
48
|
},
|
|
49
49
|
"java": {
|
|
@@ -428,6 +428,19 @@
|
|
|
428
428
|
}
|
|
429
429
|
}
|
|
430
430
|
},
|
|
431
|
+
"aws-cdk-lib.aws_billingconductor": {
|
|
432
|
+
"targets": {
|
|
433
|
+
"dotnet": {
|
|
434
|
+
"namespace": "Amazon.CDK.AWS.BillingConductor"
|
|
435
|
+
},
|
|
436
|
+
"java": {
|
|
437
|
+
"package": "software.amazon.awscdk.services.billingconductor"
|
|
438
|
+
},
|
|
439
|
+
"python": {
|
|
440
|
+
"module": "aws_cdk.aws_billingconductor"
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
},
|
|
431
444
|
"aws-cdk-lib.aws_budgets": {
|
|
432
445
|
"targets": {
|
|
433
446
|
"dotnet": {
|
|
@@ -1235,6 +1248,19 @@
|
|
|
1235
1248
|
}
|
|
1236
1249
|
}
|
|
1237
1250
|
},
|
|
1251
|
+
"aws-cdk-lib.aws_forecast": {
|
|
1252
|
+
"targets": {
|
|
1253
|
+
"dotnet": {
|
|
1254
|
+
"namespace": "Amazon.CDK.AWS.Forecast"
|
|
1255
|
+
},
|
|
1256
|
+
"java": {
|
|
1257
|
+
"package": "software.amazon.awscdk.services.forecast"
|
|
1258
|
+
},
|
|
1259
|
+
"python": {
|
|
1260
|
+
"module": "aws_cdk.aws_forecast"
|
|
1261
|
+
}
|
|
1262
|
+
}
|
|
1263
|
+
},
|
|
1238
1264
|
"aws-cdk-lib.aws_frauddetector": {
|
|
1239
1265
|
"targets": {
|
|
1240
1266
|
"dotnet": {
|
|
@@ -1417,6 +1443,19 @@
|
|
|
1417
1443
|
}
|
|
1418
1444
|
}
|
|
1419
1445
|
},
|
|
1446
|
+
"aws-cdk-lib.aws_inspectorv2": {
|
|
1447
|
+
"targets": {
|
|
1448
|
+
"dotnet": {
|
|
1449
|
+
"namespace": "Amazon.CDK.AWS.InspectorV2"
|
|
1450
|
+
},
|
|
1451
|
+
"java": {
|
|
1452
|
+
"package": "software.amazon.awscdk.services.inspectorv2"
|
|
1453
|
+
},
|
|
1454
|
+
"python": {
|
|
1455
|
+
"module": "aws_cdk.aws_inspectorv2"
|
|
1456
|
+
}
|
|
1457
|
+
}
|
|
1458
|
+
},
|
|
1420
1459
|
"aws-cdk-lib.aws_iot": {
|
|
1421
1460
|
"targets": {
|
|
1422
1461
|
"dotnet": {
|
|
@@ -1547,6 +1586,19 @@
|
|
|
1547
1586
|
}
|
|
1548
1587
|
}
|
|
1549
1588
|
},
|
|
1589
|
+
"aws-cdk-lib.aws_kafkaconnect": {
|
|
1590
|
+
"targets": {
|
|
1591
|
+
"dotnet": {
|
|
1592
|
+
"namespace": "Amazon.CDK.AWS.KafkaConnect"
|
|
1593
|
+
},
|
|
1594
|
+
"java": {
|
|
1595
|
+
"package": "software.amazon.awscdk.services.kafkaconnect"
|
|
1596
|
+
},
|
|
1597
|
+
"python": {
|
|
1598
|
+
"module": "aws_cdk.aws_kafkaconnect"
|
|
1599
|
+
}
|
|
1600
|
+
}
|
|
1601
|
+
},
|
|
1550
1602
|
"aws-cdk-lib.aws_kendra": {
|
|
1551
1603
|
"targets": {
|
|
1552
1604
|
"dotnet": {
|
|
@@ -1586,6 +1638,19 @@
|
|
|
1586
1638
|
}
|
|
1587
1639
|
}
|
|
1588
1640
|
},
|
|
1641
|
+
"aws-cdk-lib.aws_kinesisanalyticsv2": {
|
|
1642
|
+
"targets": {
|
|
1643
|
+
"dotnet": {
|
|
1644
|
+
"namespace": "Amazon.CDK.AWS.KinesisAnalyticsV2"
|
|
1645
|
+
},
|
|
1646
|
+
"java": {
|
|
1647
|
+
"package": "software.amazon.awscdk.services.kinesisanalyticsv2"
|
|
1648
|
+
},
|
|
1649
|
+
"python": {
|
|
1650
|
+
"module": "aws_cdk.aws_kinesisanalyticsv2"
|
|
1651
|
+
}
|
|
1652
|
+
}
|
|
1653
|
+
},
|
|
1589
1654
|
"aws-cdk-lib.aws_kinesisfirehose": {
|
|
1590
1655
|
"targets": {
|
|
1591
1656
|
"dotnet": {
|
|
@@ -1599,6 +1664,19 @@
|
|
|
1599
1664
|
}
|
|
1600
1665
|
}
|
|
1601
1666
|
},
|
|
1667
|
+
"aws-cdk-lib.aws_kinesisvideo": {
|
|
1668
|
+
"targets": {
|
|
1669
|
+
"dotnet": {
|
|
1670
|
+
"namespace": "Amazon.CDK.AWS.KinesisVideo"
|
|
1671
|
+
},
|
|
1672
|
+
"java": {
|
|
1673
|
+
"package": "software.amazon.awscdk.services.kinesisvideo"
|
|
1674
|
+
},
|
|
1675
|
+
"python": {
|
|
1676
|
+
"module": "aws_cdk.aws_kinesisvideo"
|
|
1677
|
+
}
|
|
1678
|
+
}
|
|
1679
|
+
},
|
|
1602
1680
|
"aws-cdk-lib.aws_kms": {
|
|
1603
1681
|
"targets": {
|
|
1604
1682
|
"dotnet": {
|
|
@@ -2028,6 +2106,19 @@
|
|
|
2028
2106
|
}
|
|
2029
2107
|
}
|
|
2030
2108
|
},
|
|
2109
|
+
"aws-cdk-lib.aws_personalize": {
|
|
2110
|
+
"targets": {
|
|
2111
|
+
"dotnet": {
|
|
2112
|
+
"namespace": "Amazon.CDK.AWS.Personalize"
|
|
2113
|
+
},
|
|
2114
|
+
"java": {
|
|
2115
|
+
"package": "software.amazon.awscdk.services.personalize"
|
|
2116
|
+
},
|
|
2117
|
+
"python": {
|
|
2118
|
+
"module": "aws_cdk.aws_personalize"
|
|
2119
|
+
}
|
|
2120
|
+
}
|
|
2121
|
+
},
|
|
2031
2122
|
"aws-cdk-lib.aws_pinpoint": {
|
|
2032
2123
|
"targets": {
|
|
2033
2124
|
"dotnet": {
|
|
@@ -2846,6 +2937,19 @@
|
|
|
2846
2937
|
"module": "aws_cdk.region_info"
|
|
2847
2938
|
}
|
|
2848
2939
|
}
|
|
2940
|
+
},
|
|
2941
|
+
"aws-cdk-lib.triggers": {
|
|
2942
|
+
"targets": {
|
|
2943
|
+
"dotnet": {
|
|
2944
|
+
"namespace": "Amazon.CDK.Triggers"
|
|
2945
|
+
},
|
|
2946
|
+
"java": {
|
|
2947
|
+
"package": "software.amazon.awscdk.triggers"
|
|
2948
|
+
},
|
|
2949
|
+
"python": {
|
|
2950
|
+
"module": "aws_cdk.triggers"
|
|
2951
|
+
}
|
|
2952
|
+
}
|
|
2849
2953
|
}
|
|
2850
2954
|
},
|
|
2851
2955
|
"targets": {
|
|
@@ -2902,7 +3006,7 @@
|
|
|
2902
3006
|
},
|
|
2903
3007
|
"description": "CDK Constructs for AWS Cloudfront to AWS API Gateway to AWS Lambda integration.",
|
|
2904
3008
|
"homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
|
|
2905
|
-
"jsiiVersion": "1.
|
|
3009
|
+
"jsiiVersion": "1.58.0 (build f8ba112)",
|
|
2906
3010
|
"keywords": [
|
|
2907
3011
|
"aws",
|
|
2908
3012
|
"cdk",
|
|
@@ -2922,7 +3026,7 @@
|
|
|
2922
3026
|
},
|
|
2923
3027
|
"name": "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda",
|
|
2924
3028
|
"readme": {
|
|
2925
|
-
"markdown": "# aws-cloudfront-apigateway-lambda module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language** | **Package** |\n|:-------------|-----------------|\n| Python|`aws_solutions_constructs.aws_cloudfront_apigateway_lambda`|\n| Typescript|`@aws-solutions-constructs/aws-cloudfront-apigateway-lambda`|\n| Java|`software.amazon.awsconstructs.services.cloudfrontapigatewaylambda`|\n\nThis AWS Solutions Construct implements an AWS CloudFront fronting an Amazon API Gateway Lambda backed REST API.\n\nHere is a minimal deployable pattern definition
|
|
3029
|
+
"markdown": "# aws-cloudfront-apigateway-lambda module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language** | **Package** |\n|:-------------|-----------------|\n| Python|`aws_solutions_constructs.aws_cloudfront_apigateway_lambda`|\n| Typescript|`@aws-solutions-constructs/aws-cloudfront-apigateway-lambda`|\n| Java|`software.amazon.awsconstructs.services.cloudfrontapigatewaylambda`|\n\nThis AWS Solutions Construct implements an AWS CloudFront fronting an Amazon API Gateway Lambda backed REST API.\n\nHere is a minimal deployable pattern definition:\n\nTypescript\n``` typescript\nimport { Construct } from 'constructs';\nimport { Stack, StackProps } from 'aws-cdk-lib';\nimport { CloudFrontToApiGatewayToLambda } from '@aws-solutions-constructs/aws-cloudfront-apigateway-lambda';\nimport * as lambda from 'aws-cdk-lib/aws-lambda';\n\nnew CloudFrontToApiGatewayToLambda(this, 'test-cloudfront-apigateway-lambda', {\n lambdaFunctionProps: {\n code: lambda.Code.fromAsset(`lambda`),\n runtime: lambda.Runtime.NODEJS_14_X,\n handler: 'index.handler'\n }\n});\n```\n\nPython\n``` python\nfrom aws_solutions_constructs.aws_cloudfront_apigateway_lambda import CloudFrontToApiGatewayToLambda\nfrom aws_cdk import (\n aws_lambda as _lambda,\n Stack\n)\nfrom constructs import Construct\n\nCloudFrontToApiGatewayToLambda(self, 'test-cloudfront-apigateway-lambda',\n lambda_function_props=_lambda.FunctionProps(\n code=_lambda.Code.from_asset('lambda'),\n runtime=_lambda.Runtime.PYTHON_3_9,\n handler='index.handler'\n )\n )\n```\n\nJava\n``` java\nimport software.constructs.Construct;\n\nimport software.amazon.awscdk.Stack;\nimport software.amazon.awscdk.StackProps;\nimport software.amazon.awscdk.services.lambda.*;\nimport software.amazon.awscdk.services.lambda.Runtime;\nimport software.amazon.awsconstructs.services.cloudfrontapigatewaylambda.*;\n\nnew CloudFrontToApiGatewayToLambda(this, \"test-cloudfront-apigateway-lambda\",\n new CloudFrontToApiGatewayToLambdaProps.Builder()\n .lambdaFunctionProps(new FunctionProps.Builder()\n .runtime(Runtime.NODEJS_14_X)\n .code(Code.fromAsset(\"lambda\"))\n .handler(\"index.handler\")\n .build())\n .build());\n```\n\n\n## Pattern Construct Props\n\n| **Name** | **Type** | **Description** |\n|:-------------|:----------------|-----------------|\n|existingLambdaObj?|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Existing instance of Lambda Function object, providing both this and `lambdaFunctionProps` will cause an error.|\n|lambdaFunctionProps?|[`lambda.FunctionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.FunctionProps.html)|Optional user provided props to override the default props for the Lambda function.|\n|apiGatewayProps?|[`api.LambdaRestApiProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.LambdaRestApiProps.html)|Optional user provided props to override the default props for API Gateway|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|logGroupProps?|[`logs.LogGroupProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroupProps.html)|Optional user provided props to override the default props for for the CloudWatchLogs LogGroup.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket.|\n\n## Pattern Properties\n\n| **Name** | **Type** | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.CloudFrontWebDistribution`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.CloudFrontWebDistribution.html)|Returns an instance of cloudfront.CloudFrontWebDistribution created by the construct|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the pattern.|\n|cloudFrontLoggingBucket|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html)|Returns an instance of the logging bucket for CloudFront WebDistribution.|\n|apiGateway|[`api.RestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.RestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|\n|apiGatewayCloudWatchRole?|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for API Gateway for CloudWatch access.|\n|apiGatewayLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for API Gateway access logging to CloudWatch.|\n|lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront WebDistribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront WebDistribution\n\n### Amazon API Gateway\n* Deploy a regional API endpoint\n* Enable CloudWatch logging for API Gateway\n* Configure least privilege access IAM role for API Gateway\n* Set the default authorizationType for all API methods to NONE\n* Enable X-Ray Tracing\n\n### AWS Lambda Function\n* Configure limited privilege access IAM role for Lambda function\n* Enable reusing connections with Keep-Alive for NodeJs Lambda function\n* Enable X-Ray Tracing\n* Set Environment Variables\n * AWS_NODEJS_CONNECTION_REUSE_ENABLED (for Node 10.x and higher functions)\n\n## Architecture\n\n\n***\n© Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
|
|
2926
3030
|
},
|
|
2927
3031
|
"repository": {
|
|
2928
3032
|
"directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda",
|
|
@@ -3228,6 +3332,6 @@
|
|
|
3228
3332
|
"symbolId": "lib/index:CloudFrontToApiGatewayToLambdaProps"
|
|
3229
3333
|
}
|
|
3230
3334
|
},
|
|
3231
|
-
"version": "2.
|
|
3232
|
-
"fingerprint": "
|
|
3335
|
+
"version": "2.6.0",
|
|
3336
|
+
"fingerprint": "ehZz07dpQZz2tATbFk0RVWa6u0Tp5uZzZ1A9/LTQalU="
|
|
3233
3337
|
}
|
package/README.md
CHANGED
|
@@ -20,31 +20,62 @@
|
|
|
20
20
|
|
|
21
21
|
This AWS Solutions Construct implements an AWS CloudFront fronting an Amazon API Gateway Lambda backed REST API.
|
|
22
22
|
|
|
23
|
-
Here is a minimal deployable pattern definition
|
|
23
|
+
Here is a minimal deployable pattern definition:
|
|
24
24
|
|
|
25
|
+
Typescript
|
|
25
26
|
``` typescript
|
|
27
|
+
import { Construct } from 'constructs';
|
|
28
|
+
import { Stack, StackProps } from 'aws-cdk-lib';
|
|
26
29
|
import { CloudFrontToApiGatewayToLambda } from '@aws-solutions-constructs/aws-cloudfront-apigateway-lambda';
|
|
30
|
+
import * as lambda from 'aws-cdk-lib/aws-lambda';
|
|
27
31
|
|
|
28
32
|
new CloudFrontToApiGatewayToLambda(this, 'test-cloudfront-apigateway-lambda', {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
lambdaFunctionProps: {
|
|
34
|
+
code: lambda.Code.fromAsset(`lambda`),
|
|
35
|
+
runtime: lambda.Runtime.NODEJS_14_X,
|
|
36
|
+
handler: 'index.handler'
|
|
37
|
+
}
|
|
34
38
|
});
|
|
35
39
|
```
|
|
36
40
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
Python
|
|
42
|
+
``` python
|
|
43
|
+
from aws_solutions_constructs.aws_cloudfront_apigateway_lambda import CloudFrontToApiGatewayToLambda
|
|
44
|
+
from aws_cdk import (
|
|
45
|
+
aws_lambda as _lambda,
|
|
46
|
+
Stack
|
|
47
|
+
)
|
|
48
|
+
from constructs import Construct
|
|
49
|
+
|
|
50
|
+
CloudFrontToApiGatewayToLambda(self, 'test-cloudfront-apigateway-lambda',
|
|
51
|
+
lambda_function_props=_lambda.FunctionProps(
|
|
52
|
+
code=_lambda.Code.from_asset('lambda'),
|
|
53
|
+
runtime=_lambda.Runtime.PYTHON_3_9,
|
|
54
|
+
handler='index.handler'
|
|
55
|
+
)
|
|
56
|
+
)
|
|
41
57
|
```
|
|
42
58
|
|
|
43
|
-
|
|
59
|
+
Java
|
|
60
|
+
``` java
|
|
61
|
+
import software.constructs.Construct;
|
|
62
|
+
|
|
63
|
+
import software.amazon.awscdk.Stack;
|
|
64
|
+
import software.amazon.awscdk.StackProps;
|
|
65
|
+
import software.amazon.awscdk.services.lambda.*;
|
|
66
|
+
import software.amazon.awscdk.services.lambda.Runtime;
|
|
67
|
+
import software.amazon.awsconstructs.services.cloudfrontapigatewaylambda.*;
|
|
68
|
+
|
|
69
|
+
new CloudFrontToApiGatewayToLambda(this, "test-cloudfront-apigateway-lambda",
|
|
70
|
+
new CloudFrontToApiGatewayToLambdaProps.Builder()
|
|
71
|
+
.lambdaFunctionProps(new FunctionProps.Builder()
|
|
72
|
+
.runtime(Runtime.NODEJS_14_X)
|
|
73
|
+
.code(Code.fromAsset("lambda"))
|
|
74
|
+
.handler("index.handler")
|
|
75
|
+
.build())
|
|
76
|
+
.build());
|
|
77
|
+
```
|
|
44
78
|
|
|
45
|
-
* scope [`Construct`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_core.Construct.html)
|
|
46
|
-
* id `string`
|
|
47
|
-
* props [`CloudFrontToApiGatewayToLambdaProps`](#pattern-construct-props)
|
|
48
79
|
|
|
49
80
|
## Pattern Construct Props
|
|
50
81
|
|
package/lib/index.js
CHANGED
|
@@ -51,5 +51,5 @@ class CloudFrontToApiGatewayToLambda extends constructs_1.Construct {
|
|
|
51
51
|
}
|
|
52
52
|
exports.CloudFrontToApiGatewayToLambda = CloudFrontToApiGatewayToLambda;
|
|
53
53
|
_a = JSII_RTTI_SYMBOL_1;
|
|
54
|
-
CloudFrontToApiGatewayToLambda[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda.CloudFrontToApiGatewayToLambda", version: "2.
|
|
54
|
+
CloudFrontToApiGatewayToLambda[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda.CloudFrontToApiGatewayToLambda", version: "2.6.0" };
|
|
55
55
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;AAmBA,2DAA2D;AAC3D,wFAAwF;AACxF,2CAAuC;AACvC,mGAA6F;AAmD7F,MAAa,8BAA+B,SAAQ,sBAAS;IAS3D;;;;;;;OAOG;IACH,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA0C;QAClF,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjB,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE;YACvD,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;SAC/C,CAAC,CAAC;QAEH,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,kBAAkB,CAAC;YACvE,QAAQ,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QAExG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,mEAAmE;YACnE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAkB,CAAC;YACpE,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACzC,KAAK,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;gBAEvD,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE;oBACtC;wBACE,EAAE,EAAE,KAAK;wBACT,MAAM,EAAE,0IAA0I;qBACnJ;iBACF,CAAC,CAAC;aAEJ;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAA2B,IAAI,kDAAsB,CAAC,IAAI,EAAE,wBAAwB,EAAE;YACvG,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,2BAA2B,EAAE,KAAK,CAAC,2BAA2B;YAC9D,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,yBAAyB,CAAC;QACzE,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;QAC3D,IAAI,CAAC,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IACvE,CAAC;;AAvDH,wEAwDC","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as api from 'aws-cdk-lib/aws-apigateway';\nimport * as lambda from 'aws-cdk-lib/aws-lambda';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as logs from 'aws-cdk-lib/aws-logs';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as defaults from '@aws-solutions-constructs/core';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\nimport { CloudFrontToApiGateway } from '@aws-solutions-constructs/aws-cloudfront-apigateway';\n\n/**\n * @summary The properties for the CloudFrontToApiGatewayToLambda Construct\n */\nexport interface CloudFrontToApiGatewayToLambdaProps {\n  /**\n   * Existing instance of Lambda Function object, providing both this and `lambdaFunctionProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingLambdaObj?: lambda.Function,\n  /**\n   * Optional user provided props to override the default props for the Lambda function.\n   *\n   * @default - Default props are used\n   */\n  readonly lambdaFunctionProps?: lambda.FunctionProps\n  /**\n   * Optional user provided props to override the default props for the API Gateway.\n   *\n   * @default - Default props are used\n   */\n  readonly apiGatewayProps?: api.LambdaRestApiProps | any\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudWatchLogs LogGroup.\n   *\n   * @default - Default props are used\n   */\n  readonly logGroupProps?: logs.LogGroupProps\n  /**\n   * Optional user provided props to override the default props for the CloudFront Logging Bucket.\n   *\n   * @default - Default props are used\n   */\n   readonly cloudFrontLoggingBucketProps?: s3.BucketProps\n}\n\nexport class CloudFrontToApiGatewayToLambda extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly apiGateway: api.RestApi;\n  public readonly apiGatewayCloudWatchRole?: iam.Role;\n  public readonly apiGatewayLogGroup: logs.LogGroup;\n  public readonly lambdaFunction: lambda.Function;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToApiGatewayToLambda class.\n   * @param {cdk.App} scope - represents the scope for all the resources.\n   * @param {string} id - this is a a scope-unique id.\n   * @param {CloudFrontToApiGatewayToLambdaProps} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToApiGatewayToLambdaProps) {\n    super(scope, id);\n    defaults.CheckProps(props);\n\n    this.lambdaFunction = defaults.buildLambdaFunction(this, {\n      existingLambdaObj: props.existingLambdaObj,\n      lambdaFunctionProps: props.lambdaFunctionProps\n    });\n\n    [this.apiGateway, this.apiGatewayCloudWatchRole, this.apiGatewayLogGroup] =\n      defaults.RegionalLambdaRestApi(this, this.lambdaFunction, props.apiGatewayProps, props.logGroupProps);\n\n    this.apiGateway.methods.forEach((apiMethod) => {\n      // Override the API Gateway Authorization Type from AWS_IAM to NONE\n      const child = apiMethod.node.findChild('Resource') as api.CfnMethod;\n      if (child.authorizationType === 'AWS_IAM') {\n        child.addPropertyOverride('AuthorizationType', 'NONE');\n\n        defaults.addCfnSuppressRules(apiMethod, [\n          {\n            id: 'W59',\n            reason: `AWS::ApiGateway::Method AuthorizationType is set to 'NONE' because API Gateway behind CloudFront does not support AWS_IAM authentication`\n          },\n        ]);\n\n      }\n    });\n\n    const apiCloudfront: CloudFrontToApiGateway = new CloudFrontToApiGateway(this, 'CloudFrontToApiGateway', {\n      existingApiGatewayObj: this.apiGateway,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      insertHttpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps\n    });\n\n    this.cloudFrontWebDistribution = apiCloudfront.cloudFrontWebDistribution;\n    this.cloudFrontFunction = apiCloudfront.cloudFrontFunction;\n    this.cloudFrontLoggingBucket = apiCloudfront.cloudFrontLoggingBucket;\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "CDK Constructs for AWS Cloudfront to AWS API Gateway to AWS Lambda integration.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"integ-no-clean": "cdk-integ --no-clean",
|
|
27
27
|
"integ-assert": "cdk-integ-assert-v2",
|
|
28
28
|
"jsii": "jsii",
|
|
29
|
-
"jsii-pacmak": "jsii-pacmak
|
|
29
|
+
"jsii-pacmak": "jsii-pacmak",
|
|
30
30
|
"build+lint+test": "npm run jsii && npm run lint && npm test && npm run integ-assert",
|
|
31
31
|
"snapshot-update": "npm run jsii && npm test -- -u && npm run integ-assert"
|
|
32
32
|
},
|
|
@@ -53,14 +53,14 @@
|
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.
|
|
57
|
-
"@aws-solutions-constructs/core": "2.
|
|
56
|
+
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.6.0",
|
|
57
|
+
"@aws-solutions-constructs/core": "2.6.0"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@aws-cdk/assert": "2.
|
|
60
|
+
"@aws-cdk/assert": "2.20.0",
|
|
61
61
|
"@types/jest": "^27.4.0",
|
|
62
62
|
"@types/node": "^10.3.0",
|
|
63
|
-
"aws-cdk-lib": "2.
|
|
63
|
+
"aws-cdk-lib": "2.20.0",
|
|
64
64
|
"constructs": "^10.0.0"
|
|
65
65
|
},
|
|
66
66
|
"jest": {
|
|
@@ -78,9 +78,9 @@
|
|
|
78
78
|
]
|
|
79
79
|
},
|
|
80
80
|
"peerDependencies": {
|
|
81
|
-
"@aws-solutions-constructs/core": "2.
|
|
82
|
-
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.
|
|
83
|
-
"aws-cdk-lib": "^2.
|
|
81
|
+
"@aws-solutions-constructs/core": "2.6.0",
|
|
82
|
+
"@aws-solutions-constructs/aws-cloudfront-apigateway": "2.6.0",
|
|
83
|
+
"aws-cdk-lib": "^2.20.0",
|
|
84
84
|
"constructs": "^10.0.0"
|
|
85
85
|
},
|
|
86
86
|
"keywords": [
|
|
@@ -617,6 +617,12 @@
|
|
|
617
617
|
"IgnorePublicAcls": true,
|
|
618
618
|
"RestrictPublicBuckets": true
|
|
619
619
|
},
|
|
620
|
+
"Tags": [
|
|
621
|
+
{
|
|
622
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
623
|
+
"Value": "true"
|
|
624
|
+
}
|
|
625
|
+
],
|
|
620
626
|
"VersioningConfiguration": {
|
|
621
627
|
"Status": "Enabled"
|
|
622
628
|
}
|
|
@@ -675,12 +681,69 @@
|
|
|
675
681
|
]
|
|
676
682
|
}
|
|
677
683
|
]
|
|
684
|
+
},
|
|
685
|
+
{
|
|
686
|
+
"Action": [
|
|
687
|
+
"s3:GetBucket*",
|
|
688
|
+
"s3:List*",
|
|
689
|
+
"s3:DeleteObject*"
|
|
690
|
+
],
|
|
691
|
+
"Effect": "Allow",
|
|
692
|
+
"Principal": {
|
|
693
|
+
"AWS": {
|
|
694
|
+
"Fn::GetAtt": [
|
|
695
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
696
|
+
"Arn"
|
|
697
|
+
]
|
|
698
|
+
}
|
|
699
|
+
},
|
|
700
|
+
"Resource": [
|
|
701
|
+
{
|
|
702
|
+
"Fn::GetAtt": [
|
|
703
|
+
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2",
|
|
704
|
+
"Arn"
|
|
705
|
+
]
|
|
706
|
+
},
|
|
707
|
+
{
|
|
708
|
+
"Fn::Join": [
|
|
709
|
+
"",
|
|
710
|
+
[
|
|
711
|
+
{
|
|
712
|
+
"Fn::GetAtt": [
|
|
713
|
+
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2",
|
|
714
|
+
"Arn"
|
|
715
|
+
]
|
|
716
|
+
},
|
|
717
|
+
"/*"
|
|
718
|
+
]
|
|
719
|
+
]
|
|
720
|
+
}
|
|
721
|
+
]
|
|
678
722
|
}
|
|
679
723
|
],
|
|
680
724
|
"Version": "2012-10-17"
|
|
681
725
|
}
|
|
682
726
|
}
|
|
683
727
|
},
|
|
728
|
+
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucketAutoDeleteObjectsCustomResource4AC22AEE": {
|
|
729
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
730
|
+
"Properties": {
|
|
731
|
+
"ServiceToken": {
|
|
732
|
+
"Fn::GetAtt": [
|
|
733
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
734
|
+
"Arn"
|
|
735
|
+
]
|
|
736
|
+
},
|
|
737
|
+
"BucketName": {
|
|
738
|
+
"Ref": "cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2"
|
|
739
|
+
}
|
|
740
|
+
},
|
|
741
|
+
"DependsOn": [
|
|
742
|
+
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucketPolicy416A95E3"
|
|
743
|
+
],
|
|
744
|
+
"UpdateReplacePolicy": "Delete",
|
|
745
|
+
"DeletionPolicy": "Delete"
|
|
746
|
+
},
|
|
684
747
|
"cfapigwlambdaCloudFrontToApiGatewayCloudFrontDistributionF8B75200": {
|
|
685
748
|
"Type": "AWS::CloudFront::Distribution",
|
|
686
749
|
"Properties": {
|
|
@@ -791,6 +854,82 @@
|
|
|
791
854
|
]
|
|
792
855
|
}
|
|
793
856
|
}
|
|
857
|
+
},
|
|
858
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
|
|
859
|
+
"Type": "AWS::IAM::Role",
|
|
860
|
+
"Properties": {
|
|
861
|
+
"AssumeRolePolicyDocument": {
|
|
862
|
+
"Version": "2012-10-17",
|
|
863
|
+
"Statement": [
|
|
864
|
+
{
|
|
865
|
+
"Action": "sts:AssumeRole",
|
|
866
|
+
"Effect": "Allow",
|
|
867
|
+
"Principal": {
|
|
868
|
+
"Service": "lambda.amazonaws.com"
|
|
869
|
+
}
|
|
870
|
+
}
|
|
871
|
+
]
|
|
872
|
+
},
|
|
873
|
+
"ManagedPolicyArns": [
|
|
874
|
+
{
|
|
875
|
+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
|
|
876
|
+
}
|
|
877
|
+
]
|
|
878
|
+
}
|
|
879
|
+
},
|
|
880
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
|
|
881
|
+
"Type": "AWS::Lambda::Function",
|
|
882
|
+
"Properties": {
|
|
883
|
+
"Code": {
|
|
884
|
+
"S3Bucket": {
|
|
885
|
+
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
|
|
886
|
+
},
|
|
887
|
+
"S3Key": "15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538.zip"
|
|
888
|
+
},
|
|
889
|
+
"Timeout": 900,
|
|
890
|
+
"MemorySize": 128,
|
|
891
|
+
"Handler": "__entrypoint__.handler",
|
|
892
|
+
"Role": {
|
|
893
|
+
"Fn::GetAtt": [
|
|
894
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
895
|
+
"Arn"
|
|
896
|
+
]
|
|
897
|
+
},
|
|
898
|
+
"Runtime": "nodejs12.x",
|
|
899
|
+
"Description": {
|
|
900
|
+
"Fn::Join": [
|
|
901
|
+
"",
|
|
902
|
+
[
|
|
903
|
+
"Lambda function for auto-deleting objects in ",
|
|
904
|
+
{
|
|
905
|
+
"Ref": "cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2"
|
|
906
|
+
},
|
|
907
|
+
" S3 bucket."
|
|
908
|
+
]
|
|
909
|
+
]
|
|
910
|
+
}
|
|
911
|
+
},
|
|
912
|
+
"DependsOn": [
|
|
913
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
|
|
914
|
+
],
|
|
915
|
+
"Metadata": {
|
|
916
|
+
"cfn_nag": {
|
|
917
|
+
"rules_to_suppress": [
|
|
918
|
+
{
|
|
919
|
+
"id": "W58",
|
|
920
|
+
"reason": "CDK generated custom resource"
|
|
921
|
+
},
|
|
922
|
+
{
|
|
923
|
+
"id": "W89",
|
|
924
|
+
"reason": "CDK generated custom resource"
|
|
925
|
+
},
|
|
926
|
+
{
|
|
927
|
+
"id": "W92",
|
|
928
|
+
"reason": "CDK generated custom resource"
|
|
929
|
+
}
|
|
930
|
+
]
|
|
931
|
+
}
|
|
932
|
+
}
|
|
794
933
|
}
|
|
795
934
|
},
|
|
796
935
|
"Outputs": {
|
|
@@ -30,10 +30,12 @@ new lib_1.CloudFrontToApiGatewayToLambda(stack, 'cf-apigw-lambda', {
|
|
|
30
30
|
},
|
|
31
31
|
cloudFrontLoggingBucketProps: {
|
|
32
32
|
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
33
|
+
autoDeleteObjects: true,
|
|
33
34
|
encryption: aws_s3_1.BucketEncryption.S3_MANAGED,
|
|
34
35
|
versioned: true
|
|
35
36
|
}
|
|
36
37
|
});
|
|
38
|
+
core_1.suppressAutoDeleteHandlerWarnings(stack);
|
|
37
39
|
// Synth
|
|
38
40
|
app.synth();
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuY3VzdG9tQ2xvdWRmcm9udExvZ2dpbmdCdWNrZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnRlZy5jdXN0b21DbG91ZGZyb250TG9nZ2luZ0J1Y2tldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7O0FBRUgsZ0JBQWdCO0FBQ2hCLDZDQUF3RDtBQUN4RCxnQ0FBd0Q7QUFDeEQsaURBQWlEO0FBQ2pELCtDQUFzRDtBQUN0RCx5REFBMkc7QUFFM0csUUFBUTtBQUNSLE1BQU0sR0FBRyxHQUFHLElBQUksaUJBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksbUJBQUssQ0FBQyxHQUFHLEVBQUUsNkJBQXNCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUNqRSxLQUFLLENBQUMsZUFBZSxDQUFDLFdBQVcsR0FBRyx3RkFBd0YsQ0FBQztBQUU3SCxJQUFJLG9DQUE4QixDQUFDLEtBQUssRUFBRSxpQkFBaUIsRUFBRTtJQUMzRCxtQkFBbUIsRUFBRTtRQUNuQixJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxTQUFTLFNBQVMsQ0FBQztRQUNsRCxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXO1FBQ25DLE9BQU8sRUFBRSxlQUFlO0tBQ3pCO0lBQ0QsNEJBQTRCLEVBQUU7UUFDNUIsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztRQUNwQyxpQkFBaUIsRUFBRSxJQUFJO1FBQ3ZCLFVBQVUsRUFBRSx5QkFBZ0IsQ0FBQyxVQUFVO1FBQ3ZDLFNBQVMsRUFBRSxJQUFJO0tBQ2hCO0NBQ0YsQ0FBQyxDQUFDO0FBQ0gsd0NBQWlDLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFekMsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8vICFjZGstaW50ZWcgKlxuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvQXBpR2F0ZXdheVRvTGFtYmRhIH0gZnJvbSBcIi4uL2xpYlwiO1xuaW1wb3J0ICogYXMgbGFtYmRhIGZyb20gJ2F3cy1jZGstbGliL2F3cy1sYW1iZGEnO1xuaW1wb3J0IHsgQnVja2V0RW5jcnlwdGlvbiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtczNcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUsIHN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbi8vIFNldHVwXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5jb25zdCBzdGFjayA9IG5ldyBTdGFjayhhcHAsIGdlbmVyYXRlSW50ZWdTdGFja05hbWUoX19maWxlbmFtZSkpO1xuc3RhY2sudGVtcGxhdGVPcHRpb25zLmRlc2NyaXB0aW9uID0gJ0ludGVncmF0aW9uIFRlc3QgZm9yIGF3cy1jbG91ZGZyb250LWFwaWdhdGV3YXktbGFtYmRhIGN1c3RvbSBDbG91ZGZyb250IExvZ2dpbmcgQnVja2V0JztcblxubmV3IENsb3VkRnJvbnRUb0FwaUdhdGV3YXlUb0xhbWJkYShzdGFjaywgJ2NmLWFwaWd3LWxhbWJkYScsIHtcbiAgbGFtYmRhRnVuY3Rpb25Qcm9wczoge1xuICAgIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Bc3NldChgJHtfX2Rpcm5hbWV9L2xhbWJkYWApLFxuICAgIHJ1bnRpbWU6IGxhbWJkYS5SdW50aW1lLk5PREVKU18xNF9YLFxuICAgIGhhbmRsZXI6ICdpbmRleC5oYW5kbGVyJ1xuICB9LFxuICBjbG91ZEZyb250TG9nZ2luZ0J1Y2tldFByb3BzOiB7XG4gICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZLFxuICAgIGF1dG9EZWxldGVPYmplY3RzOiB0cnVlLFxuICAgIGVuY3J5cHRpb246IEJ1Y2tldEVuY3J5cHRpb24uUzNfTUFOQUdFRCxcbiAgICB2ZXJzaW9uZWQ6IHRydWVcbiAgfVxufSk7XG5zdXBwcmVzc0F1dG9EZWxldGVIYW5kbGVyV2FybmluZ3Moc3RhY2spO1xuXG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=
|
|
@@ -617,12 +617,18 @@
|
|
|
617
617
|
"IgnorePublicAcls": true,
|
|
618
618
|
"RestrictPublicBuckets": true
|
|
619
619
|
},
|
|
620
|
+
"Tags": [
|
|
621
|
+
{
|
|
622
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
623
|
+
"Value": "true"
|
|
624
|
+
}
|
|
625
|
+
],
|
|
620
626
|
"VersioningConfiguration": {
|
|
621
627
|
"Status": "Enabled"
|
|
622
628
|
}
|
|
623
629
|
},
|
|
624
|
-
"UpdateReplacePolicy": "
|
|
625
|
-
"DeletionPolicy": "
|
|
630
|
+
"UpdateReplacePolicy": "Delete",
|
|
631
|
+
"DeletionPolicy": "Delete",
|
|
626
632
|
"Metadata": {
|
|
627
633
|
"cfn_nag": {
|
|
628
634
|
"rules_to_suppress": [
|
|
@@ -675,12 +681,69 @@
|
|
|
675
681
|
]
|
|
676
682
|
}
|
|
677
683
|
]
|
|
684
|
+
},
|
|
685
|
+
{
|
|
686
|
+
"Action": [
|
|
687
|
+
"s3:GetBucket*",
|
|
688
|
+
"s3:List*",
|
|
689
|
+
"s3:DeleteObject*"
|
|
690
|
+
],
|
|
691
|
+
"Effect": "Allow",
|
|
692
|
+
"Principal": {
|
|
693
|
+
"AWS": {
|
|
694
|
+
"Fn::GetAtt": [
|
|
695
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
696
|
+
"Arn"
|
|
697
|
+
]
|
|
698
|
+
}
|
|
699
|
+
},
|
|
700
|
+
"Resource": [
|
|
701
|
+
{
|
|
702
|
+
"Fn::GetAtt": [
|
|
703
|
+
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421",
|
|
704
|
+
"Arn"
|
|
705
|
+
]
|
|
706
|
+
},
|
|
707
|
+
{
|
|
708
|
+
"Fn::Join": [
|
|
709
|
+
"",
|
|
710
|
+
[
|
|
711
|
+
{
|
|
712
|
+
"Fn::GetAtt": [
|
|
713
|
+
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421",
|
|
714
|
+
"Arn"
|
|
715
|
+
]
|
|
716
|
+
},
|
|
717
|
+
"/*"
|
|
718
|
+
]
|
|
719
|
+
]
|
|
720
|
+
}
|
|
721
|
+
]
|
|
678
722
|
}
|
|
679
723
|
],
|
|
680
724
|
"Version": "2012-10-17"
|
|
681
725
|
}
|
|
682
726
|
}
|
|
683
727
|
},
|
|
728
|
+
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucketAutoDeleteObjectsCustomResourceD4126D01": {
|
|
729
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
730
|
+
"Properties": {
|
|
731
|
+
"ServiceToken": {
|
|
732
|
+
"Fn::GetAtt": [
|
|
733
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
734
|
+
"Arn"
|
|
735
|
+
]
|
|
736
|
+
},
|
|
737
|
+
"BucketName": {
|
|
738
|
+
"Ref": "testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421"
|
|
739
|
+
}
|
|
740
|
+
},
|
|
741
|
+
"DependsOn": [
|
|
742
|
+
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucketPolicy4A551B79"
|
|
743
|
+
],
|
|
744
|
+
"UpdateReplacePolicy": "Delete",
|
|
745
|
+
"DeletionPolicy": "Delete"
|
|
746
|
+
},
|
|
684
747
|
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudFrontDistribution0AFC98FC": {
|
|
685
748
|
"Type": "AWS::CloudFront::Distribution",
|
|
686
749
|
"Properties": {
|
|
@@ -791,6 +854,82 @@
|
|
|
791
854
|
]
|
|
792
855
|
}
|
|
793
856
|
}
|
|
857
|
+
},
|
|
858
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
|
|
859
|
+
"Type": "AWS::IAM::Role",
|
|
860
|
+
"Properties": {
|
|
861
|
+
"AssumeRolePolicyDocument": {
|
|
862
|
+
"Version": "2012-10-17",
|
|
863
|
+
"Statement": [
|
|
864
|
+
{
|
|
865
|
+
"Action": "sts:AssumeRole",
|
|
866
|
+
"Effect": "Allow",
|
|
867
|
+
"Principal": {
|
|
868
|
+
"Service": "lambda.amazonaws.com"
|
|
869
|
+
}
|
|
870
|
+
}
|
|
871
|
+
]
|
|
872
|
+
},
|
|
873
|
+
"ManagedPolicyArns": [
|
|
874
|
+
{
|
|
875
|
+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
|
|
876
|
+
}
|
|
877
|
+
]
|
|
878
|
+
}
|
|
879
|
+
},
|
|
880
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
|
|
881
|
+
"Type": "AWS::Lambda::Function",
|
|
882
|
+
"Properties": {
|
|
883
|
+
"Code": {
|
|
884
|
+
"S3Bucket": {
|
|
885
|
+
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
|
|
886
|
+
},
|
|
887
|
+
"S3Key": "15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538.zip"
|
|
888
|
+
},
|
|
889
|
+
"Timeout": 900,
|
|
890
|
+
"MemorySize": 128,
|
|
891
|
+
"Handler": "__entrypoint__.handler",
|
|
892
|
+
"Role": {
|
|
893
|
+
"Fn::GetAtt": [
|
|
894
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
895
|
+
"Arn"
|
|
896
|
+
]
|
|
897
|
+
},
|
|
898
|
+
"Runtime": "nodejs12.x",
|
|
899
|
+
"Description": {
|
|
900
|
+
"Fn::Join": [
|
|
901
|
+
"",
|
|
902
|
+
[
|
|
903
|
+
"Lambda function for auto-deleting objects in ",
|
|
904
|
+
{
|
|
905
|
+
"Ref": "testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421"
|
|
906
|
+
},
|
|
907
|
+
" S3 bucket."
|
|
908
|
+
]
|
|
909
|
+
]
|
|
910
|
+
}
|
|
911
|
+
},
|
|
912
|
+
"DependsOn": [
|
|
913
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
|
|
914
|
+
],
|
|
915
|
+
"Metadata": {
|
|
916
|
+
"cfn_nag": {
|
|
917
|
+
"rules_to_suppress": [
|
|
918
|
+
{
|
|
919
|
+
"id": "W58",
|
|
920
|
+
"reason": "CDK generated custom resource"
|
|
921
|
+
},
|
|
922
|
+
{
|
|
923
|
+
"id": "W89",
|
|
924
|
+
"reason": "CDK generated custom resource"
|
|
925
|
+
},
|
|
926
|
+
{
|
|
927
|
+
"id": "W92",
|
|
928
|
+
"reason": "CDK generated custom resource"
|
|
929
|
+
}
|
|
930
|
+
]
|
|
931
|
+
}
|
|
932
|
+
}
|
|
794
933
|
}
|
|
795
934
|
},
|
|
796
935
|
"Outputs": {
|
|
@@ -28,7 +28,12 @@ const lambdaProps = {
|
|
|
28
28
|
};
|
|
29
29
|
new lib_1.CloudFrontToApiGatewayToLambda(stack, 'test-cloudfront-apigateway-lambda', {
|
|
30
30
|
lambdaFunctionProps: lambdaProps,
|
|
31
|
+
cloudFrontLoggingBucketProps: {
|
|
32
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
33
|
+
autoDeleteObjects: true
|
|
34
|
+
},
|
|
31
35
|
});
|
|
36
|
+
core_1.suppressAutoDeleteHandlerWarnings(stack);
|
|
32
37
|
// Synth
|
|
33
38
|
app.synth();
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tYXJndW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcubm8tYXJndW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxnQkFBZ0I7QUFDaEIsNkNBQXdEO0FBQ3hELGdDQUF3RDtBQUN4RCxpREFBaUQ7QUFDakQseURBQTJHO0FBRTNHLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLGlCQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLG1CQUFLLENBQUMsR0FBRyxFQUFFLDZCQUFzQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDakUsS0FBSyxDQUFDLGVBQWUsQ0FBQyxXQUFXLEdBQUcsdURBQXVELENBQUM7QUFFNUYsTUFBTSxXQUFXLEdBQXlCO0lBQ3hDLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLFNBQVMsU0FBUyxDQUFDO0lBQ2xELE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVc7SUFDbkMsT0FBTyxFQUFFLGVBQWU7Q0FDekIsQ0FBQztBQUVGLElBQUksb0NBQThCLENBQUMsS0FBSyxFQUFFLG1DQUFtQyxFQUFFO0lBQzdFLG1CQUFtQixFQUFFLFdBQVc7SUFDaEMsNEJBQTRCLEVBQUU7UUFDNUIsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztRQUNwQyxpQkFBaUIsRUFBRSxJQUFJO0tBQ3hCO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsd0NBQWlDLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDekMsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8vICFjZGstaW50ZWcgKlxuaW1wb3J0IHsgQXBwLCBSZW1vdmFsUG9saWN5LCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvQXBpR2F0ZXdheVRvTGFtYmRhIH0gZnJvbSBcIi4uL2xpYlwiO1xuaW1wb3J0ICogYXMgbGFtYmRhIGZyb20gJ2F3cy1jZGstbGliL2F3cy1sYW1iZGEnO1xuaW1wb3J0IHsgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZSwgc3VwcHJlc3NBdXRvRGVsZXRlSGFuZGxlcldhcm5pbmdzIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCBmb3IgYXdzLWNsb3VkZnJvbnQtYXBpZ2F0ZXdheS1sYW1iZGEnO1xuXG5jb25zdCBsYW1iZGFQcm9wczogbGFtYmRhLkZ1bmN0aW9uUHJvcHMgPSB7XG4gIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Bc3NldChgJHtfX2Rpcm5hbWV9L2xhbWJkYWApLFxuICBydW50aW1lOiBsYW1iZGEuUnVudGltZS5OT0RFSlNfMTRfWCxcbiAgaGFuZGxlcjogJ2luZGV4LmhhbmRsZXInXG59O1xuXG5uZXcgQ2xvdWRGcm9udFRvQXBpR2F0ZXdheVRvTGFtYmRhKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LWFwaWdhdGV3YXktbGFtYmRhJywge1xuICBsYW1iZGFGdW5jdGlvblByb3BzOiBsYW1iZGFQcm9wcyxcbiAgY2xvdWRGcm9udExvZ2dpbmdCdWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICBhdXRvRGVsZXRlT2JqZWN0czogdHJ1ZVxuICB9LFxufSk7XG5cbnN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyhzdGFjayk7XG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=
|
|
@@ -578,12 +578,18 @@
|
|
|
578
578
|
"IgnorePublicAcls": true,
|
|
579
579
|
"RestrictPublicBuckets": true
|
|
580
580
|
},
|
|
581
|
+
"Tags": [
|
|
582
|
+
{
|
|
583
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
584
|
+
"Value": "true"
|
|
585
|
+
}
|
|
586
|
+
],
|
|
581
587
|
"VersioningConfiguration": {
|
|
582
588
|
"Status": "Enabled"
|
|
583
589
|
}
|
|
584
590
|
},
|
|
585
|
-
"UpdateReplacePolicy": "
|
|
586
|
-
"DeletionPolicy": "
|
|
591
|
+
"UpdateReplacePolicy": "Delete",
|
|
592
|
+
"DeletionPolicy": "Delete",
|
|
587
593
|
"Metadata": {
|
|
588
594
|
"cfn_nag": {
|
|
589
595
|
"rules_to_suppress": [
|
|
@@ -636,12 +642,69 @@
|
|
|
636
642
|
]
|
|
637
643
|
}
|
|
638
644
|
]
|
|
645
|
+
},
|
|
646
|
+
{
|
|
647
|
+
"Action": [
|
|
648
|
+
"s3:GetBucket*",
|
|
649
|
+
"s3:List*",
|
|
650
|
+
"s3:DeleteObject*"
|
|
651
|
+
],
|
|
652
|
+
"Effect": "Allow",
|
|
653
|
+
"Principal": {
|
|
654
|
+
"AWS": {
|
|
655
|
+
"Fn::GetAtt": [
|
|
656
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
657
|
+
"Arn"
|
|
658
|
+
]
|
|
659
|
+
}
|
|
660
|
+
},
|
|
661
|
+
"Resource": [
|
|
662
|
+
{
|
|
663
|
+
"Fn::GetAtt": [
|
|
664
|
+
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0",
|
|
665
|
+
"Arn"
|
|
666
|
+
]
|
|
667
|
+
},
|
|
668
|
+
{
|
|
669
|
+
"Fn::Join": [
|
|
670
|
+
"",
|
|
671
|
+
[
|
|
672
|
+
{
|
|
673
|
+
"Fn::GetAtt": [
|
|
674
|
+
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0",
|
|
675
|
+
"Arn"
|
|
676
|
+
]
|
|
677
|
+
},
|
|
678
|
+
"/*"
|
|
679
|
+
]
|
|
680
|
+
]
|
|
681
|
+
}
|
|
682
|
+
]
|
|
639
683
|
}
|
|
640
684
|
],
|
|
641
685
|
"Version": "2012-10-17"
|
|
642
686
|
}
|
|
643
687
|
}
|
|
644
688
|
},
|
|
689
|
+
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucketAutoDeleteObjectsCustomResource028E07CD": {
|
|
690
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
691
|
+
"Properties": {
|
|
692
|
+
"ServiceToken": {
|
|
693
|
+
"Fn::GetAtt": [
|
|
694
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
695
|
+
"Arn"
|
|
696
|
+
]
|
|
697
|
+
},
|
|
698
|
+
"BucketName": {
|
|
699
|
+
"Ref": "cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0"
|
|
700
|
+
}
|
|
701
|
+
},
|
|
702
|
+
"DependsOn": [
|
|
703
|
+
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucketPolicyC3092436"
|
|
704
|
+
],
|
|
705
|
+
"UpdateReplacePolicy": "Delete",
|
|
706
|
+
"DeletionPolicy": "Delete"
|
|
707
|
+
},
|
|
645
708
|
"cfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistribution94A35932": {
|
|
646
709
|
"Type": "AWS::CloudFront::Distribution",
|
|
647
710
|
"Properties": {
|
|
@@ -830,6 +893,82 @@
|
|
|
830
893
|
]
|
|
831
894
|
}
|
|
832
895
|
}
|
|
896
|
+
},
|
|
897
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
|
|
898
|
+
"Type": "AWS::IAM::Role",
|
|
899
|
+
"Properties": {
|
|
900
|
+
"AssumeRolePolicyDocument": {
|
|
901
|
+
"Version": "2012-10-17",
|
|
902
|
+
"Statement": [
|
|
903
|
+
{
|
|
904
|
+
"Action": "sts:AssumeRole",
|
|
905
|
+
"Effect": "Allow",
|
|
906
|
+
"Principal": {
|
|
907
|
+
"Service": "lambda.amazonaws.com"
|
|
908
|
+
}
|
|
909
|
+
}
|
|
910
|
+
]
|
|
911
|
+
},
|
|
912
|
+
"ManagedPolicyArns": [
|
|
913
|
+
{
|
|
914
|
+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
|
|
915
|
+
}
|
|
916
|
+
]
|
|
917
|
+
}
|
|
918
|
+
},
|
|
919
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
|
|
920
|
+
"Type": "AWS::Lambda::Function",
|
|
921
|
+
"Properties": {
|
|
922
|
+
"Code": {
|
|
923
|
+
"S3Bucket": {
|
|
924
|
+
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
|
|
925
|
+
},
|
|
926
|
+
"S3Key": "15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538.zip"
|
|
927
|
+
},
|
|
928
|
+
"Timeout": 900,
|
|
929
|
+
"MemorySize": 128,
|
|
930
|
+
"Handler": "__entrypoint__.handler",
|
|
931
|
+
"Role": {
|
|
932
|
+
"Fn::GetAtt": [
|
|
933
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
934
|
+
"Arn"
|
|
935
|
+
]
|
|
936
|
+
},
|
|
937
|
+
"Runtime": "nodejs12.x",
|
|
938
|
+
"Description": {
|
|
939
|
+
"Fn::Join": [
|
|
940
|
+
"",
|
|
941
|
+
[
|
|
942
|
+
"Lambda function for auto-deleting objects in ",
|
|
943
|
+
{
|
|
944
|
+
"Ref": "cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0"
|
|
945
|
+
},
|
|
946
|
+
" S3 bucket."
|
|
947
|
+
]
|
|
948
|
+
]
|
|
949
|
+
}
|
|
950
|
+
},
|
|
951
|
+
"DependsOn": [
|
|
952
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
|
|
953
|
+
],
|
|
954
|
+
"Metadata": {
|
|
955
|
+
"cfn_nag": {
|
|
956
|
+
"rules_to_suppress": [
|
|
957
|
+
{
|
|
958
|
+
"id": "W58",
|
|
959
|
+
"reason": "CDK generated custom resource"
|
|
960
|
+
},
|
|
961
|
+
{
|
|
962
|
+
"id": "W89",
|
|
963
|
+
"reason": "CDK generated custom resource"
|
|
964
|
+
},
|
|
965
|
+
{
|
|
966
|
+
"id": "W92",
|
|
967
|
+
"reason": "CDK generated custom resource"
|
|
968
|
+
}
|
|
969
|
+
]
|
|
970
|
+
}
|
|
971
|
+
}
|
|
833
972
|
}
|
|
834
973
|
},
|
|
835
974
|
"Outputs": {
|
|
@@ -57,7 +57,11 @@ const construct = new lib_1.CloudFrontToApiGatewayToLambda(stack, 'cf-api-lambda
|
|
|
57
57
|
defaultBehavior: {
|
|
58
58
|
cachePolicy: someCachePolicy
|
|
59
59
|
}
|
|
60
|
-
}
|
|
60
|
+
},
|
|
61
|
+
cloudFrontLoggingBucketProps: {
|
|
62
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
63
|
+
autoDeleteObjects: true
|
|
64
|
+
},
|
|
61
65
|
});
|
|
62
66
|
const apiEndPoint = construct.apiGateway;
|
|
63
67
|
const apiEndPointUrlWithoutProtocol = cdk.Fn.select(1, cdk.Fn.split("://", apiEndPoint.url));
|
|
@@ -86,6 +90,7 @@ function suppressWarnings(method) {
|
|
|
86
90
|
}
|
|
87
91
|
};
|
|
88
92
|
}
|
|
93
|
+
core_1.suppressAutoDeleteHandlerWarnings(stack);
|
|
89
94
|
// Synth
|
|
90
95
|
app.synth();
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"integ.override-behavior.js","sourceRoot":"","sources":["integ.override-behavior.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\n/// !cdk-integ *\nimport { App, RemovalPolicy, Stack } from \"aws-cdk-lib\";\nimport { CloudFrontToApiGatewayToLambda } from \"../lib\";\nimport * as lambda from 'aws-cdk-lib/aws-lambda';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as apigateway from 'aws-cdk-lib/aws-apigateway';\nimport * as cdk from 'aws-cdk-lib';\nimport { Duration } from \"aws-cdk-lib\";\nimport * as origins from 'aws-cdk-lib/aws-cloudfront-origins';\nimport { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core';\n\n// Setup\nconst app = new App();\nconst stack = new Stack(app, generateIntegStackName(__filename));\nstack.templateOptions.description = 'Integration Test for aws-cloudfront-apigateway-lambda';\n\nconst lambdaProps: lambda.FunctionProps = {\n  code: lambda.Code.fromAsset(`${__dirname}/lambda`),\n  runtime: lambda.Runtime.NODEJS_14_X,\n  handler: 'index.handler'\n};\n\n// Some Caching for static content\nconst someCachePolicy = new cloudfront.CachePolicy(stack, 'SomeCachePolicy', {\n  cachePolicyName: 'SomeCachePolicy',\n  defaultTtl: Duration.hours(8),\n  minTtl: Duration.hours(5),\n  maxTtl: Duration.hours(10),\n});\n\n// Disable Caching for dynamic content\nconst noCachePolicy = new cloudfront.CachePolicy(stack, 'NoCachePolicy', {\n  cachePolicyName: 'NoCachePolicy',\n  defaultTtl: Duration.minutes(0),\n  minTtl: Duration.minutes(0),\n  maxTtl: Duration.minutes(0),\n});\n\nconst construct = new CloudFrontToApiGatewayToLambda(stack, 'cf-api-lambda-override', {\n  lambdaFunctionProps: lambdaProps,\n  apiGatewayProps: {\n    proxy: false,\n    defaultMethodOptions: {\n      authorizationType: apigateway.AuthorizationType.NONE,\n    },\n  },\n  cloudFrontDistributionProps: {\n    defaultBehavior: {\n      cachePolicy: someCachePolicy\n    }\n  },\n  cloudFrontLoggingBucketProps: {\n    removalPolicy: RemovalPolicy.DESTROY,\n    autoDeleteObjects: true\n  },\n});\n\nconst apiEndPoint = construct.apiGateway;\nconst apiEndPointUrlWithoutProtocol = cdk.Fn.select(1, cdk.Fn.split(\"://\", apiEndPoint.url));\nconst apiEndPointDomainName = cdk.Fn.select(0, cdk.Fn.split(\"/\", apiEndPointUrlWithoutProtocol));\n\nconst staticResource = construct.apiGateway.root.addResource('static');\nconst staticMethod = staticResource.addMethod('GET', new apigateway.HttpIntegration('http://amazon.com'));\n\nconst dynamicResource = construct.apiGateway.root.addResource('dynamic');\nconst dynamicMethod = dynamicResource.addMethod('GET');\n\n// Add behavior\nconstruct.cloudFrontWebDistribution.addBehavior('/dynamic', new origins.HttpOrigin(apiEndPointDomainName, {\n  originPath: `/${apiEndPoint.deploymentStage.stageName}/dynamic`\n}), {\n  cachePolicy: noCachePolicy\n});\n// Suppress CFN_NAG warnings\nsuppressWarnings(staticMethod);\nsuppressWarnings(dynamicMethod);\n\nfunction suppressWarnings(method: apigateway.Method) {\n  const child = method.node.findChild('Resource') as apigateway.CfnMethod;\n  child.cfnOptions.metadata = {\n    cfn_nag: {\n      rules_to_suppress: [{\n        id: 'W59',\n        reason: `AWS::ApiGateway::Method AuthorizationType is set to 'NONE' because API Gateway behind CloudFront does not support AWS_IAM authentication`\n      }]\n    }\n  };\n}\n\nsuppressAutoDeleteHandlerWarnings(stack);\n// Synth\napp.synth();\n"]}
|