@aws-solutions-constructs/aws-apigateway-dynamodb 2.45.0 → 2.47.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 +5 -5
- package/lib/index.js +1 -1
- package/package.json +5 -5
- package/test/{integ.additional-request-templates-custom-resource-name.expected.json → integ.apiddb-additional-request-templates-custom-resource-name.expected.json} +21 -21
- package/test/integ.apiddb-additional-request-templates-custom-resource-name.js +60 -0
- package/test/{integ.additional-request-templates.expected.json → integ.apiddb-additional-request-templates.expected.json} +19 -19
- package/test/integ.apiddb-additional-request-templates.js +50 -0
- package/test/{integ.apigateway-dynamodb-CRUD.expected.json → integ.apiddb-apigateway-dynamodb-CRUD.expected.json} +46 -46
- package/test/integ.apiddb-apigateway-dynamodb-CRUD.js +35 -0
- package/test/{integ.apigateway-dynamodb-existing-table.expected.json → integ.apiddb-apigateway-dynamodb-existing-table.expected.json} +19 -19
- package/test/integ.apiddb-apigateway-dynamodb-existing-table.js +42 -0
- package/test/{integ.custom-integration-responses.expected.json → integ.apiddb-custom-integration-responses.expected.json} +19 -19
- package/test/integ.apiddb-custom-integration-responses.js +48 -0
- package/test/{integ.no-arguments.expected.json → integ.apiddb-no-arguments.expected.json} +19 -19
- package/test/integ.apiddb-no-arguments.js +28 -0
- package/test/integ.additional-request-templates-custom-resource-name.js +0 -60
- package/test/integ.additional-request-templates.js +0 -50
- package/test/integ.apigateway-dynamodb-CRUD.js +0 -35
- package/test/integ.apigateway-dynamodb-existing-table.js +0 -42
- package/test/integ.custom-integration-responses.js +0 -48
- package/test/integ.no-arguments.js +0 -28
- /package/test/{integ.additional-request-templates-custom-resource-name.d.ts → integ.apiddb-additional-request-templates-custom-resource-name.d.ts} +0 -0
- /package/test/{integ.additional-request-templates.d.ts → integ.apiddb-additional-request-templates.d.ts} +0 -0
- /package/test/{integ.apigateway-dynamodb-CRUD.d.ts → integ.apiddb-apigateway-dynamodb-CRUD.d.ts} +0 -0
- /package/test/{integ.apigateway-dynamodb-existing-table.d.ts → integ.apiddb-apigateway-dynamodb-existing-table.d.ts} +0 -0
- /package/test/{integ.custom-integration-responses.d.ts → integ.apiddb-custom-integration-responses.d.ts} +0 -0
- /package/test/{integ.no-arguments.d.ts → integ.apiddb-no-arguments.d.ts} +0 -0
package/.jsii
CHANGED
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
"url": "https://aws.amazon.com"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@aws-solutions-constructs/core": "2.
|
|
12
|
-
"aws-cdk-lib": "^2.
|
|
11
|
+
"@aws-solutions-constructs/core": "2.47.0",
|
|
12
|
+
"aws-cdk-lib": "^2.111.0",
|
|
13
13
|
"constructs": "^10.0.0"
|
|
14
14
|
},
|
|
15
15
|
"dependencyClosure": {
|
|
@@ -3579,7 +3579,7 @@
|
|
|
3579
3579
|
},
|
|
3580
3580
|
"description": "CDK Constructs for AWS API Gateway and Amazon DynamoDB integration.",
|
|
3581
3581
|
"homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
|
|
3582
|
-
"jsiiVersion": "1.
|
|
3582
|
+
"jsiiVersion": "1.92.0 (build db7f27d)",
|
|
3583
3583
|
"keywords": [
|
|
3584
3584
|
"aws",
|
|
3585
3585
|
"cdk",
|
|
@@ -4174,6 +4174,6 @@
|
|
|
4174
4174
|
"symbolId": "lib/index:ApiGatewayToDynamoDBProps"
|
|
4175
4175
|
}
|
|
4176
4176
|
},
|
|
4177
|
-
"version": "2.
|
|
4178
|
-
"fingerprint": "
|
|
4177
|
+
"version": "2.47.0",
|
|
4178
|
+
"fingerprint": "sgzhOY6+5GqGIIhWEDAiniTzAYBZT9DzQWpX3Rqw2Go="
|
|
4179
4179
|
}
|
package/lib/index.js
CHANGED
|
@@ -210,5 +210,5 @@ class ApiGatewayToDynamoDB extends constructs_1.Construct {
|
|
|
210
210
|
}
|
|
211
211
|
exports.ApiGatewayToDynamoDB = ApiGatewayToDynamoDB;
|
|
212
212
|
_a = JSII_RTTI_SYMBOL_1;
|
|
213
|
-
ApiGatewayToDynamoDB[_a] = { fqn: "@aws-solutions-constructs/aws-apigateway-dynamodb.ApiGatewayToDynamoDB", version: "2.
|
|
213
|
+
ApiGatewayToDynamoDB[_a] = { fqn: "@aws-solutions-constructs/aws-apigateway-dynamodb.ApiGatewayToDynamoDB", version: "2.47.0" };
|
|
214
214
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 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 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 * as dynamodb from 'aws-cdk-lib/aws-dynamodb';\nimport { getPartitionKeyNameFromTable } from '@aws-solutions-constructs/core';\nimport * as logs from 'aws-cdk-lib/aws-logs';\n\n/**\n * @summary The properties for the ApiGatewayToDynamoDB class.\n */\nexport interface ApiGatewayToDynamoDBProps {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly dynamoTableProps?: dynamodb.TableProps;\n  /**\n   * Existing instance of DynamoDB table object, providing both this and `dynamoTableProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingTableObj?: dynamodb.Table;\n  /**\n   * Optional user-provided props to override the default props for the API Gateway.\n   *\n   * @default - Default properties are used.\n   */\n  readonly apiGatewayProps?: api.RestApiProps;\n  /**\n   * Optional resource name on the API\n   * This property is useful if your integration does not directly use the partition key name\n   *\n   * @default - partition key name, retrieved from the DynamoDB table object\n   */\n  readonly resourceName?: string;\n  /**\n   * Whether to deploy an API Gateway Method for POST HTTP operations on the DynamoDB table (i.e. dynamodb:PutItem).\n   *\n   * @default - false\n   */\n  readonly allowCreateOperation?: boolean;\n  /**\n   * API Gateway Request Template for the create method for the default `application/json` content-type.\n   * This property is required if the `allowCreateOperation` property is set to true.\n   *\n   * @default - None\n   */\n  readonly createRequestTemplate?: string;\n  /**\n   * Optional Create Request Templates for content-types other than `application/json`.\n   * Use the `createRequestTemplate` property to set the request template for the `application/json` content-type.\n   * This property can only be specified if the `allowCreateOperation` property is set to true.\n   *\n   * @default - None\n   */\n  readonly additionalCreateRequestTemplates?: { [contentType: string]: string; };\n  /**\n   * Optional, custom API Gateway Integration Response for the create method.\n   * This property can only be specified if the `allowCreateOperation` property is set to true.\n   *\n   * @default - [{statusCode:\"200\"},{statusCode:\"500\",responseTemplates:{\"text/html\":\"Error\"},selectionPattern:\"500\"}]\n   */\n  readonly createIntegrationResponses?: api.IntegrationResponse[];\n  /**\n   * Whether to deploy an API Gateway Method for GET HTTP operations on DynamoDB table (i.e. dynamodb:Query).\n   *\n   * @default - true\n   */\n  readonly allowReadOperation?: boolean;\n  /**\n   * API Gateway Request Template for the read method for the default `application/json` content-type.\n   *\n   * The default template only supports a partition key and not partition + sort keys.\n   *\n   * @default - `{ \\\n   *       \"TableName\": \"DYNAMODB_TABLE_NAME\", \\\n   *       \"KeyConditionExpression\": \"PARTITION_KEY_NAME = :v1\", \\\n   *       \"ExpressionAttributeValues\": { \\\n   *         \":v1\": { \\\n   *           \"S\": \"$input.params('PARTITION_KEY_NAME')\" \\\n   *         } \\\n   *       } \\\n   *     }`\n   */\n  readonly readRequestTemplate?: string;\n  /**\n   * Optional Read Request Templates for content-types other than `application/json`.\n   * Use the `readRequestTemplate` property to set the request template for the `application/json` content-type.\n   *\n   * @default - None\n   */\n  readonly additionalReadRequestTemplates?: { [contentType: string]: string; };\n  /**\n   * Optional, custom API Gateway Integration Response for the read method.\n   *\n   * @default - [{statusCode:\"200\"},{statusCode:\"500\",responseTemplates:{\"text/html\":\"Error\"},selectionPattern:\"500\"}]\n   */\n  readonly readIntegrationResponses?: api.IntegrationResponse[];\n  /**\n   * Whether to deploy API Gateway Method for PUT HTTP operations on DynamoDB table (i.e. dynamodb:UpdateItem).\n   *\n   * @default - false\n   */\n  readonly allowUpdateOperation?: boolean;\n  /**\n   * API Gateway Request Template for the update method.\n   * This property is required if the `allowUpdateOperation` property is set to true.\n   *\n   * @default - None\n   */\n  readonly updateRequestTemplate?: string;\n  /**\n   * Optional Update Request Templates for content-types other than `application/json`.\n   * Use the `updateRequestTemplate` property to set the request template for the `application/json` content-type.\n   * This property can only be specified if the `allowUpdateOperation` property is set to true.\n   *\n   * @default - None\n   */\n  readonly additionalUpdateRequestTemplates?: { [contentType: string]: string; };\n  /**\n   * Optional, custom API Gateway Integration Response for the update method.\n   * This property can only be specified if the `allowUpdateOperation` property is set to true.\n   *\n   * @default - [{statusCode:\"200\"},{statusCode:\"500\",responseTemplates:{\"text/html\":\"Error\"},selectionPattern:\"500\"}]\n   */\n  readonly updateIntegrationResponses?: api.IntegrationResponse[];\n  /**\n   * Whether to deploy API Gateway Method for DELETE HTTP operations on DynamoDB table (i.e. dynamodb:DeleteItem).\n   *\n   * @default - false\n   */\n  readonly allowDeleteOperation?: boolean;\n  /**\n   * API Gateway Request Template for the delete method for the default `application/json` content-type.\n   * This property can only be specified if the `allowDeleteOperation` property is set to true.\n   *\n   * @default - `{ \\\n   *       \"TableName\": \"DYNAMODB_TABLE_NAME\", \\\n   *       \"Key\": { \\\n   *         \"${partitionKeyName}\": { \\\n   *           \"S\": \"$input.params('PARTITION_KEY_NAME')\" \\\n   *           } \\\n   *         }, \\\n   *       \"ReturnValues\": \"ALL_OLD\" \\\n   *     }`\n   */\n  readonly deleteRequestTemplate?: string;\n  /**\n   * Optional Delete request templates for content-types other than `application/json`.\n   * Use the `deleteRequestTemplate` property to set the request template for the `application/json` content-type.\n   * This property can only be specified if the `allowDeleteOperation` property is set to true.\n   *\n   * @default - None\n   */\n  readonly additionalDeleteRequestTemplates?: { [contentType: string]: string; };\n  /**\n   * Optional, custom API Gateway Integration Response for the delete method.\n   * This property can only be specified if the `allowDeleteOperation` property is set to true.\n   *\n   * @default - [{statusCode:\"200\"},{statusCode:\"500\",responseTemplates:{\"text/html\":\"Error\"},selectionPattern:\"500\"}]\n   */\n  readonly deleteIntegrationResponses?: api.IntegrationResponse[];\n  /**\n   * 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\n/**\n * @summary The ApiGatewayToDynamoDB class.\n */\nexport class ApiGatewayToDynamoDB extends Construct {\n  public readonly dynamoTable: dynamodb.Table;\n  public readonly apiGatewayRole: iam.Role;\n  public readonly apiGateway: api.RestApi;\n  public readonly apiGatewayCloudWatchRole?: iam.Role;\n  public readonly apiGatewayLogGroup: logs.LogGroup;\n  /**\n   * @summary Constructs a new instance of the ApiGatewayToDynamoDB 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: ApiGatewayToDynamoDBProps) {\n    super(scope, id);\n    defaults.CheckDynamoDBProps(props);\n\n    if (this.CheckCreateRequestProps(props)) {\n      throw new Error(`The 'allowCreateOperation' property must be set to true when setting any of the following: ` +\n        `'createRequestTemplate', 'additionalCreateRequestTemplates', 'createIntegrationResponses'`);\n    }\n    if (this.CheckReadRequestProps(props)) {\n      throw new Error(`The 'allowReadOperation' property must be set to true or undefined when setting any of the following: ` +\n        `'readRequestTemplate', 'additionalReadRequestTemplates', 'readIntegrationResponses'`);\n    }\n    if (this.CheckUpdateRequestProps(props)) {\n      throw new Error(`The 'allowUpdateOperation' property must be set to true when setting any of the following: ` +\n        `'updateRequestTemplate', 'additionalUpdateRequestTemplates', 'updateIntegrationResponses'`);\n    }\n    if (this.CheckDeleteRequestProps(props)) {\n      throw new Error(`The 'allowDeleteOperation' property must be set to true when setting any of the following: ` +\n        `'deleteRequestTemplate', 'additionalDeleteRequestTemplates', 'deleteIntegrationResponses'`);\n    }\n\n    // Set the default props for DynamoDB table\n    const dynamoTableProps: dynamodb.TableProps = defaults.consolidateProps(defaults.DefaultTableProps, props.dynamoTableProps);\n    let partitionKeyName = dynamoTableProps.partitionKey.name;\n\n    if (props.existingTableObj) {\n      partitionKeyName = getPartitionKeyNameFromTable(props.existingTableObj);\n    }\n\n    const resourceName = props.resourceName ?? partitionKeyName;\n\n    // Since we are only invoking this function with an existing Table or tableProps,\n    // (not a table interface), we know that the implementation will always return\n    // a Table object and we can force assignment to the dynamoTable property.\n    const buildDynamoDBTableResponse = defaults.buildDynamoDBTable(this, {\n      existingTableObj: props.existingTableObj,\n      dynamoTableProps: props.dynamoTableProps\n    });\n    this.dynamoTable = buildDynamoDBTableResponse.tableObject!;\n\n    // Setup the API Gateway\n    const globalRestApiResponse = defaults.GlobalRestApi(this, props.apiGatewayProps, props.logGroupProps);\n    this.apiGateway = globalRestApiResponse.api;\n    this.apiGatewayCloudWatchRole = globalRestApiResponse.role;\n    this.apiGatewayLogGroup = globalRestApiResponse.logGroup;\n\n    // Setup the API Gateway role\n    this.apiGatewayRole = new iam.Role(this, 'api-gateway-role', {\n      assumedBy: new iam.ServicePrincipal('apigateway.amazonaws.com')\n    });\n\n    // Setup the API Gateway Resource\n    const apiGatewayResource: api.Resource = this.apiGateway.root.addResource(\"{\" + resourceName + \"}\");\n\n    // Setup API Gateway Method\n    // Create\n    if (this.ImplementCreateOperation(props)) {\n      // ImplementCreateOperation has confirmed that createRequestTemplate exists)\n      const createRequestTemplate = props.createRequestTemplate!.replace(\"${Table}\", this.dynamoTable.tableName);\n      this.addActionToPolicy(\"dynamodb:PutItem\");\n      defaults.addProxyMethodToApiResource({\n        service: \"dynamodb\",\n        action: \"PutItem\",\n        apiGatewayRole: this.apiGatewayRole,\n        apiMethod: \"POST\",\n        apiResource: this.apiGateway.root,\n        requestTemplate: createRequestTemplate,\n        additionalRequestTemplates: props.additionalCreateRequestTemplates,\n        integrationResponses: props.createIntegrationResponses\n      });\n    }\n    // Read\n    if (this.ImplementReaOperation(props)) {\n      const readRequestTemplate = props.readRequestTemplate ??\n        `{ \\\n          \"TableName\": \"${this.dynamoTable.tableName}\", \\\n          \"KeyConditionExpression\": \"${partitionKeyName} = :v1\", \\\n          \"ExpressionAttributeValues\": { \\\n            \":v1\": { \\\n              \"S\": \"$input.params('${resourceName}')\" \\\n            } \\\n          } \\\n        }`;\n\n      this.addActionToPolicy(\"dynamodb:Query\");\n      defaults.addProxyMethodToApiResource({\n        service: \"dynamodb\",\n        action: \"Query\",\n        apiGatewayRole: this.apiGatewayRole,\n        apiMethod: \"GET\",\n        apiResource: apiGatewayResource,\n        requestTemplate: readRequestTemplate,\n        additionalRequestTemplates: props.additionalReadRequestTemplates,\n        integrationResponses: props.readIntegrationResponses\n      });\n    }\n    // Update\n    if (this.ImplementUpdateOperation(props)) {\n      // ImplementUpdateOperation confirmed the existence of updateRequestTemplate\n      const updateRequestTemplate = props.updateRequestTemplate!.replace(\"${Table}\", this.dynamoTable.tableName);\n      this.addActionToPolicy(\"dynamodb:UpdateItem\");\n      defaults.addProxyMethodToApiResource({\n        service: \"dynamodb\",\n        action: \"UpdateItem\",\n        apiGatewayRole: this.apiGatewayRole,\n        apiMethod: \"PUT\",\n        apiResource: apiGatewayResource,\n        requestTemplate: updateRequestTemplate,\n        additionalRequestTemplates: props.additionalUpdateRequestTemplates,\n        integrationResponses: props.updateIntegrationResponses\n      });\n    }\n    // Delete\n    if (this.ImplementDeleteOperation(props)) {\n      const deleteRequestTemplate = props.deleteRequestTemplate ??\n        `{ \\\n          \"TableName\": \"${this.dynamoTable.tableName}\", \\\n          \"Key\": { \\\n            \"${partitionKeyName}\": { \\\n              \"S\": \"$input.params('${resourceName}')\" \\\n              } \\\n            }, \\\n          \"ReturnValues\": \"ALL_OLD\" \\\n        }`;\n\n      this.addActionToPolicy(\"dynamodb:DeleteItem\");\n      defaults.addProxyMethodToApiResource({\n        service: \"dynamodb\",\n        action: \"DeleteItem\",\n        apiGatewayRole: this.apiGatewayRole,\n        apiMethod: \"DELETE\",\n        apiResource: apiGatewayResource,\n        requestTemplate: deleteRequestTemplate,\n        additionalRequestTemplates: props.additionalDeleteRequestTemplates,\n        integrationResponses: props.deleteIntegrationResponses\n      });\n    }\n  }\n\n  private CheckReadRequestProps(props: ApiGatewayToDynamoDBProps): boolean {\n    if ((props.readRequestTemplate || props.additionalReadRequestTemplates || props.readIntegrationResponses)\n        && props.allowReadOperation === false) {\n      return true;\n    }\n    return false;\n  }\n  private CheckUpdateRequestProps(props: ApiGatewayToDynamoDBProps): boolean {\n    if ((props.updateRequestTemplate || props.additionalUpdateRequestTemplates || props.updateIntegrationResponses)\n        && props.allowUpdateOperation !== true) {\n      return true;\n    }\n    return false;\n  }\n  private CheckDeleteRequestProps(props: ApiGatewayToDynamoDBProps): boolean {\n    if ((props.deleteRequestTemplate || props.additionalDeleteRequestTemplates || props.deleteIntegrationResponses)\n        && props.allowDeleteOperation !== true)  {\n      return true;\n    }\n    return false;\n  }\n\n  private CheckCreateRequestProps(props: ApiGatewayToDynamoDBProps): boolean {\n    if ((props.createRequestTemplate || props.additionalCreateRequestTemplates || props.createIntegrationResponses)\n        && props.allowCreateOperation !== true) {\n      return true;\n    }\n    return false;\n  }\n\n  private ImplementCreateOperation(props: ApiGatewayToDynamoDBProps): boolean {\n    if (props.allowCreateOperation && props.allowCreateOperation === true && props.createRequestTemplate) {\n      return true;\n    }\n    return false;\n  }\n\n  private ImplementReaOperation(props: ApiGatewayToDynamoDBProps): boolean {\n    if (props.allowReadOperation === undefined || props.allowReadOperation === true) {\n      return true;\n    }\n    return false;\n  }\n\n  private ImplementUpdateOperation(props: ApiGatewayToDynamoDBProps): boolean {\n    if (props.allowUpdateOperation && props.allowUpdateOperation === true && props.updateRequestTemplate) {\n      return true;\n    }\n    return false;\n  }\n\n  private ImplementDeleteOperation(props: ApiGatewayToDynamoDBProps): boolean {\n    if (props.allowDeleteOperation && props.allowDeleteOperation === true) {\n      return true;\n    }\n    return false;\n  }\n\n  private addActionToPolicy(action: string) {\n    this.apiGatewayRole.addToPolicy(new iam.PolicyStatement({\n      resources: [\n        this.dynamoTable.tableArn\n      ],\n      actions: [`${action}`]\n    }));\n  }\n}"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-solutions-constructs/aws-apigateway-dynamodb",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.47.0",
|
|
4
4
|
"description": "CDK Constructs for AWS API Gateway and Amazon DynamoDB integration.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -53,12 +53,12 @@
|
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@aws-solutions-constructs/core": "2.
|
|
56
|
+
"@aws-solutions-constructs/core": "2.47.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@types/jest": "^27.4.0",
|
|
60
60
|
"@types/node": "^10.3.0",
|
|
61
|
-
"aws-cdk-lib": "2.
|
|
61
|
+
"aws-cdk-lib": "2.111.0",
|
|
62
62
|
"constructs": "^10.0.0"
|
|
63
63
|
},
|
|
64
64
|
"jest": {
|
|
@@ -76,8 +76,8 @@
|
|
|
76
76
|
]
|
|
77
77
|
},
|
|
78
78
|
"peerDependencies": {
|
|
79
|
-
"@aws-solutions-constructs/core": "2.
|
|
80
|
-
"aws-cdk-lib": "^2.
|
|
79
|
+
"@aws-solutions-constructs/core": "2.47.0",
|
|
80
|
+
"aws-cdk-lib": "^2.111.0",
|
|
81
81
|
"constructs": "^10.0.0"
|
|
82
82
|
},
|
|
83
83
|
"keywords": [
|
|
@@ -4,27 +4,27 @@
|
|
|
4
4
|
"existingtableE51CCC93": {
|
|
5
5
|
"Type": "AWS::DynamoDB::Table",
|
|
6
6
|
"Properties": {
|
|
7
|
-
"
|
|
7
|
+
"AttributeDefinitions": [
|
|
8
8
|
{
|
|
9
9
|
"AttributeName": "PK",
|
|
10
|
-
"
|
|
10
|
+
"AttributeType": "S"
|
|
11
11
|
},
|
|
12
12
|
{
|
|
13
13
|
"AttributeName": "SK",
|
|
14
|
-
"
|
|
14
|
+
"AttributeType": "S"
|
|
15
15
|
}
|
|
16
16
|
],
|
|
17
|
-
"
|
|
17
|
+
"BillingMode": "PAY_PER_REQUEST",
|
|
18
|
+
"KeySchema": [
|
|
18
19
|
{
|
|
19
20
|
"AttributeName": "PK",
|
|
20
|
-
"
|
|
21
|
+
"KeyType": "HASH"
|
|
21
22
|
},
|
|
22
23
|
{
|
|
23
24
|
"AttributeName": "SK",
|
|
24
|
-
"
|
|
25
|
+
"KeyType": "RANGE"
|
|
25
26
|
}
|
|
26
27
|
],
|
|
27
|
-
"BillingMode": "PAY_PER_REQUEST",
|
|
28
28
|
"PointInTimeRecoverySpecification": {
|
|
29
29
|
"PointInTimeRecoveryEnabled": true
|
|
30
30
|
},
|
|
@@ -68,10 +68,10 @@
|
|
|
68
68
|
"testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiDeployment7F5497B67361a1e02c5799cae81447bf3ad5ef46": {
|
|
69
69
|
"Type": "AWS::ApiGateway::Deployment",
|
|
70
70
|
"Properties": {
|
|
71
|
+
"Description": "Automatically created by the RestApi construct",
|
|
71
72
|
"RestApiId": {
|
|
72
73
|
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE"
|
|
73
|
-
}
|
|
74
|
-
"Description": "Automatically created by the RestApi construct"
|
|
74
|
+
}
|
|
75
75
|
},
|
|
76
76
|
"DependsOn": [
|
|
77
77
|
"testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiidGETB657BB05",
|
|
@@ -91,9 +91,6 @@
|
|
|
91
91
|
"testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiDeploymentStageprodDD2DED0B": {
|
|
92
92
|
"Type": "AWS::ApiGateway::Stage",
|
|
93
93
|
"Properties": {
|
|
94
|
-
"RestApiId": {
|
|
95
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE"
|
|
96
|
-
},
|
|
97
94
|
"AccessLogSetting": {
|
|
98
95
|
"DestinationArn": {
|
|
99
96
|
"Fn::GetAtt": [
|
|
@@ -114,6 +111,9 @@
|
|
|
114
111
|
"ResourcePath": "/*"
|
|
115
112
|
}
|
|
116
113
|
],
|
|
114
|
+
"RestApiId": {
|
|
115
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE"
|
|
116
|
+
},
|
|
117
117
|
"StageName": "prod",
|
|
118
118
|
"TracingEnabled": true
|
|
119
119
|
}
|
|
@@ -136,14 +136,8 @@
|
|
|
136
136
|
"testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiidGETB657BB05": {
|
|
137
137
|
"Type": "AWS::ApiGateway::Method",
|
|
138
138
|
"Properties": {
|
|
139
|
-
"HttpMethod": "GET",
|
|
140
|
-
"ResourceId": {
|
|
141
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiid4EBF99AB"
|
|
142
|
-
},
|
|
143
|
-
"RestApiId": {
|
|
144
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE"
|
|
145
|
-
},
|
|
146
139
|
"AuthorizationType": "AWS_IAM",
|
|
140
|
+
"HttpMethod": "GET",
|
|
147
141
|
"Integration": {
|
|
148
142
|
"Credentials": {
|
|
149
143
|
"Fn::GetAtt": [
|
|
@@ -225,7 +219,13 @@
|
|
|
225
219
|
},
|
|
226
220
|
"StatusCode": "500"
|
|
227
221
|
}
|
|
228
|
-
]
|
|
222
|
+
],
|
|
223
|
+
"ResourceId": {
|
|
224
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiid4EBF99AB"
|
|
225
|
+
},
|
|
226
|
+
"RestApiId": {
|
|
227
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE"
|
|
228
|
+
}
|
|
229
229
|
}
|
|
230
230
|
},
|
|
231
231
|
"testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiUsagePlan4D14DF10": {
|
|
@@ -423,4 +423,4 @@
|
|
|
423
423
|
]
|
|
424
424
|
}
|
|
425
425
|
}
|
|
426
|
-
}
|
|
426
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
|
+
* with the License. A copy of the License is located at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
|
|
11
|
+
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
|
|
12
|
+
* and limitations under the License.
|
|
13
|
+
*/
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
// Imports
|
|
16
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
17
|
+
const lib_1 = require("../lib");
|
|
18
|
+
const core_1 = require("@aws-solutions-constructs/core");
|
|
19
|
+
const dynamodb = require("aws-cdk-lib/aws-dynamodb");
|
|
20
|
+
// Setup
|
|
21
|
+
const app = new aws_cdk_lib_1.App();
|
|
22
|
+
const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
|
|
23
|
+
stack.templateOptions.description = 'Integration Test for aws-apigateway-dynamodb';
|
|
24
|
+
const partitionKeyName = 'PK';
|
|
25
|
+
const sortKeyName = 'SK';
|
|
26
|
+
const resourceName = 'id';
|
|
27
|
+
const existingTableObj = new dynamodb.Table(stack, 'existing-table', {
|
|
28
|
+
partitionKey: {
|
|
29
|
+
name: partitionKeyName,
|
|
30
|
+
type: dynamodb.AttributeType.STRING,
|
|
31
|
+
},
|
|
32
|
+
sortKey: {
|
|
33
|
+
name: sortKeyName,
|
|
34
|
+
type: dynamodb.AttributeType.STRING
|
|
35
|
+
},
|
|
36
|
+
pointInTimeRecovery: true,
|
|
37
|
+
encryption: dynamodb.TableEncryption.AWS_MANAGED,
|
|
38
|
+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST
|
|
39
|
+
});
|
|
40
|
+
new lib_1.ApiGatewayToDynamoDB(stack, 'test-api-gateway-dynamodb-additional-request-templates-custom-resource-name', {
|
|
41
|
+
existingTableObj,
|
|
42
|
+
resourceName,
|
|
43
|
+
additionalReadRequestTemplates: {
|
|
44
|
+
'text/plain': `{ \
|
|
45
|
+
"TableName": "${existingTableObj.tableName}", \
|
|
46
|
+
"KeyConditionExpression": "${partitionKeyName} = :v2 AND ${sortKeyName} = :v1", \
|
|
47
|
+
"ExpressionAttributeValues": { \
|
|
48
|
+
":v1": { \
|
|
49
|
+
"S": "$input.params('${resourceName}')" \
|
|
50
|
+
}, \
|
|
51
|
+
":v2": { \
|
|
52
|
+
"S": "MY_VALUE" \
|
|
53
|
+
} \
|
|
54
|
+
} \
|
|
55
|
+
}`,
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
// Synth
|
|
59
|
+
app.synth();
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuYXBpZGRiLWFkZGl0aW9uYWwtcmVxdWVzdC10ZW1wbGF0ZXMtY3VzdG9tLXJlc291cmNlLW5hbWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnRlZy5hcGlkZGItYWRkaXRpb25hbC1yZXF1ZXN0LXRlbXBsYXRlcy1jdXN0b20tcmVzb3VyY2UtbmFtZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7O0FBRUgsVUFBVTtBQUNWLDZDQUF5QztBQUN6QyxnQ0FBOEM7QUFDOUMseURBQXdFO0FBQ3hFLHFEQUFxRDtBQUVyRCxRQUFRO0FBQ1IsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBRyxFQUFFLENBQUM7QUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxtQkFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLDhDQUE4QyxDQUFDO0FBRW5GLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO0FBQzlCLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQztBQUN6QixNQUFNLFlBQVksR0FBRyxJQUFJLENBQUM7QUFFMUIsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLGdCQUFnQixFQUFFO0lBQ25FLFlBQVksRUFBRTtRQUNaLElBQUksRUFBRSxnQkFBZ0I7UUFDdEIsSUFBSSxFQUFFLFFBQVEsQ0FBQyxhQUFhLENBQUMsTUFBTTtLQUNwQztJQUNELE9BQU8sRUFBRTtRQUNQLElBQUksRUFBRSxXQUFXO1FBQ2pCLElBQUksRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLE1BQU07S0FDcEM7SUFDRCxtQkFBbUIsRUFBRSxJQUFJO0lBQ3pCLFVBQVUsRUFBRSxRQUFRLENBQUMsZUFBZSxDQUFDLFdBQVc7SUFDaEQsV0FBVyxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsZUFBZTtDQUNsRCxDQUFDLENBQUM7QUFFSCxJQUFJLDBCQUFvQixDQUFDLEtBQUssRUFBRSw2RUFBNkUsRUFBRTtJQUM3RyxnQkFBZ0I7SUFDaEIsWUFBWTtJQUNaLDhCQUE4QixFQUFFO1FBQzlCLFlBQVksRUFBRTtzQkFDSSxnQkFBZ0IsQ0FBQyxTQUFTO21DQUNiLGdCQUFnQixjQUFjLFdBQVc7OztpQ0FHM0MsWUFBWTs7Ozs7O01BTXZDO0tBQ0g7Q0FDRixDQUFDLENBQUM7QUFFSCxRQUFRO0FBQ1IsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQXBpR2F0ZXdheVRvRHluYW1vREIgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcbmltcG9ydCAqIGFzIGR5bmFtb2RiIGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCBmb3IgYXdzLWFwaWdhdGV3YXktZHluYW1vZGInO1xuXG5jb25zdCBwYXJ0aXRpb25LZXlOYW1lID0gJ1BLJztcbmNvbnN0IHNvcnRLZXlOYW1lID0gJ1NLJztcbmNvbnN0IHJlc291cmNlTmFtZSA9ICdpZCc7XG5cbmNvbnN0IGV4aXN0aW5nVGFibGVPYmogPSBuZXcgZHluYW1vZGIuVGFibGUoc3RhY2ssICdleGlzdGluZy10YWJsZScsIHtcbiAgcGFydGl0aW9uS2V5OiB7XG4gICAgbmFtZTogcGFydGl0aW9uS2V5TmFtZSxcbiAgICB0eXBlOiBkeW5hbW9kYi5BdHRyaWJ1dGVUeXBlLlNUUklORyxcbiAgfSxcbiAgc29ydEtleToge1xuICAgIG5hbWU6IHNvcnRLZXlOYW1lLFxuICAgIHR5cGU6IGR5bmFtb2RiLkF0dHJpYnV0ZVR5cGUuU1RSSU5HXG4gIH0sXG4gIHBvaW50SW5UaW1lUmVjb3Zlcnk6IHRydWUsXG4gIGVuY3J5cHRpb246IGR5bmFtb2RiLlRhYmxlRW5jcnlwdGlvbi5BV1NfTUFOQUdFRCxcbiAgYmlsbGluZ01vZGU6IGR5bmFtb2RiLkJpbGxpbmdNb2RlLlBBWV9QRVJfUkVRVUVTVFxufSk7XG5cbm5ldyBBcGlHYXRld2F5VG9EeW5hbW9EQihzdGFjaywgJ3Rlc3QtYXBpLWdhdGV3YXktZHluYW1vZGItYWRkaXRpb25hbC1yZXF1ZXN0LXRlbXBsYXRlcy1jdXN0b20tcmVzb3VyY2UtbmFtZScsIHtcbiAgZXhpc3RpbmdUYWJsZU9iaixcbiAgcmVzb3VyY2VOYW1lLFxuICBhZGRpdGlvbmFsUmVhZFJlcXVlc3RUZW1wbGF0ZXM6IHtcbiAgICAndGV4dC9wbGFpbic6IGB7IFxcXG4gICAgICBcIlRhYmxlTmFtZVwiOiBcIiR7ZXhpc3RpbmdUYWJsZU9iai50YWJsZU5hbWV9XCIsIFxcXG4gICAgICBcIktleUNvbmRpdGlvbkV4cHJlc3Npb25cIjogXCIke3BhcnRpdGlvbktleU5hbWV9ID0gOnYyIEFORCAke3NvcnRLZXlOYW1lfSA9IDp2MVwiLCBcXFxuICAgICAgXCJFeHByZXNzaW9uQXR0cmlidXRlVmFsdWVzXCI6IHsgXFxcbiAgICAgICAgXCI6djFcIjogeyBcXFxuICAgICAgICAgIFwiU1wiOiBcIiRpbnB1dC5wYXJhbXMoJyR7cmVzb3VyY2VOYW1lfScpXCIgXFxcbiAgICAgICAgfSwgXFxcbiAgICAgICAgXCI6djJcIjogeyBcXFxuICAgICAgICAgIFwiU1wiOiBcIk1ZX1ZBTFVFXCIgXFxcbiAgICAgICAgfSBcXFxuICAgICAgfSBcXFxuICAgIH1gLFxuICB9XG59KTtcblxuLy8gU3ludGhcbmFwcC5zeW50aCgpOyJdfQ==
|
|
@@ -4,19 +4,19 @@
|
|
|
4
4
|
"existingtableE51CCC93": {
|
|
5
5
|
"Type": "AWS::DynamoDB::Table",
|
|
6
6
|
"Properties": {
|
|
7
|
-
"
|
|
7
|
+
"AttributeDefinitions": [
|
|
8
8
|
{
|
|
9
9
|
"AttributeName": "id",
|
|
10
|
-
"
|
|
10
|
+
"AttributeType": "S"
|
|
11
11
|
}
|
|
12
12
|
],
|
|
13
|
-
"
|
|
13
|
+
"BillingMode": "PAY_PER_REQUEST",
|
|
14
|
+
"KeySchema": [
|
|
14
15
|
{
|
|
15
16
|
"AttributeName": "id",
|
|
16
|
-
"
|
|
17
|
+
"KeyType": "HASH"
|
|
17
18
|
}
|
|
18
19
|
],
|
|
19
|
-
"BillingMode": "PAY_PER_REQUEST",
|
|
20
20
|
"PointInTimeRecoverySpecification": {
|
|
21
21
|
"PointInTimeRecoveryEnabled": true
|
|
22
22
|
},
|
|
@@ -60,10 +60,10 @@
|
|
|
60
60
|
"testapigatewaydynamodbadditionalrequesttemplatesRestApiDeployment0AE7C47741477f52c0bb6da128d2999e75c543fc": {
|
|
61
61
|
"Type": "AWS::ApiGateway::Deployment",
|
|
62
62
|
"Properties": {
|
|
63
|
+
"Description": "Automatically created by the RestApi construct",
|
|
63
64
|
"RestApiId": {
|
|
64
65
|
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C"
|
|
65
|
-
}
|
|
66
|
-
"Description": "Automatically created by the RestApi construct"
|
|
66
|
+
}
|
|
67
67
|
},
|
|
68
68
|
"DependsOn": [
|
|
69
69
|
"testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15",
|
|
@@ -83,9 +83,6 @@
|
|
|
83
83
|
"testapigatewaydynamodbadditionalrequesttemplatesRestApiDeploymentStageprod33ED5D23": {
|
|
84
84
|
"Type": "AWS::ApiGateway::Stage",
|
|
85
85
|
"Properties": {
|
|
86
|
-
"RestApiId": {
|
|
87
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C"
|
|
88
|
-
},
|
|
89
86
|
"AccessLogSetting": {
|
|
90
87
|
"DestinationArn": {
|
|
91
88
|
"Fn::GetAtt": [
|
|
@@ -106,6 +103,9 @@
|
|
|
106
103
|
"ResourcePath": "/*"
|
|
107
104
|
}
|
|
108
105
|
],
|
|
106
|
+
"RestApiId": {
|
|
107
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C"
|
|
108
|
+
},
|
|
109
109
|
"StageName": "prod",
|
|
110
110
|
"TracingEnabled": true
|
|
111
111
|
}
|
|
@@ -128,14 +128,8 @@
|
|
|
128
128
|
"testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15": {
|
|
129
129
|
"Type": "AWS::ApiGateway::Method",
|
|
130
130
|
"Properties": {
|
|
131
|
-
"HttpMethod": "GET",
|
|
132
|
-
"ResourceId": {
|
|
133
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90"
|
|
134
|
-
},
|
|
135
|
-
"RestApiId": {
|
|
136
|
-
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C"
|
|
137
|
-
},
|
|
138
131
|
"AuthorizationType": "AWS_IAM",
|
|
132
|
+
"HttpMethod": "GET",
|
|
139
133
|
"Integration": {
|
|
140
134
|
"Credentials": {
|
|
141
135
|
"Fn::GetAtt": [
|
|
@@ -217,7 +211,13 @@
|
|
|
217
211
|
},
|
|
218
212
|
"StatusCode": "500"
|
|
219
213
|
}
|
|
220
|
-
]
|
|
214
|
+
],
|
|
215
|
+
"ResourceId": {
|
|
216
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90"
|
|
217
|
+
},
|
|
218
|
+
"RestApiId": {
|
|
219
|
+
"Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C"
|
|
220
|
+
}
|
|
221
221
|
}
|
|
222
222
|
},
|
|
223
223
|
"testapigatewaydynamodbadditionalrequesttemplatesRestApiUsagePlan905D10C7": {
|
|
@@ -415,4 +415,4 @@
|
|
|
415
415
|
]
|
|
416
416
|
}
|
|
417
417
|
}
|
|
418
|
-
}
|
|
418
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
|
+
* with the License. A copy of the License is located at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
|
|
11
|
+
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
|
|
12
|
+
* and limitations under the License.
|
|
13
|
+
*/
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
// Imports
|
|
16
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
17
|
+
const lib_1 = require("../lib");
|
|
18
|
+
const core_1 = require("@aws-solutions-constructs/core");
|
|
19
|
+
const dynamodb = require("aws-cdk-lib/aws-dynamodb");
|
|
20
|
+
// Setup
|
|
21
|
+
const app = new aws_cdk_lib_1.App();
|
|
22
|
+
const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
|
|
23
|
+
stack.templateOptions.description = 'Integration Test for aws-apigateway-dynamodb';
|
|
24
|
+
const partitionKeyName = 'id';
|
|
25
|
+
const existingTableObj = new dynamodb.Table(stack, 'existing-table', {
|
|
26
|
+
partitionKey: {
|
|
27
|
+
name: partitionKeyName,
|
|
28
|
+
type: dynamodb.AttributeType.STRING,
|
|
29
|
+
},
|
|
30
|
+
pointInTimeRecovery: true,
|
|
31
|
+
encryption: dynamodb.TableEncryption.AWS_MANAGED,
|
|
32
|
+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST
|
|
33
|
+
});
|
|
34
|
+
new lib_1.ApiGatewayToDynamoDB(stack, 'test-api-gateway-dynamodb-additional-request-templates', {
|
|
35
|
+
existingTableObj,
|
|
36
|
+
additionalReadRequestTemplates: {
|
|
37
|
+
'text/plain': `{ \
|
|
38
|
+
"TableName": "${existingTableObj.tableName}", \
|
|
39
|
+
"KeyConditionExpression": "${partitionKeyName} = :v1", \
|
|
40
|
+
"ExpressionAttributeValues": { \
|
|
41
|
+
":v1": { \
|
|
42
|
+
"S": "$input.params('${partitionKeyName}')" \
|
|
43
|
+
} \
|
|
44
|
+
} \
|
|
45
|
+
}`
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
// Synth
|
|
49
|
+
app.synth();
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuYXBpZGRiLWFkZGl0aW9uYWwtcmVxdWVzdC10ZW1wbGF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnRlZy5hcGlkZGItYWRkaXRpb25hbC1yZXF1ZXN0LXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7O0FBRUgsVUFBVTtBQUNWLDZDQUF5QztBQUN6QyxnQ0FBOEM7QUFDOUMseURBQXdFO0FBQ3hFLHFEQUFxRDtBQUVyRCxRQUFRO0FBQ1IsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBRyxFQUFFLENBQUM7QUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxtQkFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLDhDQUE4QyxDQUFDO0FBRW5GLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO0FBRTlCLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsRUFBRTtJQUNuRSxZQUFZLEVBQUU7UUFDWixJQUFJLEVBQUUsZ0JBQWdCO1FBQ3RCLElBQUksRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLE1BQU07S0FDcEM7SUFDRCxtQkFBbUIsRUFBRSxJQUFJO0lBQ3pCLFVBQVUsRUFBRSxRQUFRLENBQUMsZUFBZSxDQUFDLFdBQVc7SUFDaEQsV0FBVyxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsZUFBZTtDQUNsRCxDQUFDLENBQUM7QUFFSCxJQUFJLDBCQUFvQixDQUFDLEtBQUssRUFBRSx3REFBd0QsRUFBRTtJQUN4RixnQkFBZ0I7SUFDaEIsOEJBQThCLEVBQUU7UUFDOUIsWUFBWSxFQUFFO3NCQUNJLGdCQUFnQixDQUFDLFNBQVM7bUNBQ2IsZ0JBQWdCOzs7aUNBR2xCLGdCQUFnQjs7O01BRzNDO0tBQ0g7Q0FDRixDQUFDLENBQUM7QUFFSCxRQUFRO0FBQ1IsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQXBpR2F0ZXdheVRvRHluYW1vREIgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcbmltcG9ydCAqIGFzIGR5bmFtb2RiIGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCBmb3IgYXdzLWFwaWdhdGV3YXktZHluYW1vZGInO1xuXG5jb25zdCBwYXJ0aXRpb25LZXlOYW1lID0gJ2lkJztcblxuY29uc3QgZXhpc3RpbmdUYWJsZU9iaiA9IG5ldyBkeW5hbW9kYi5UYWJsZShzdGFjaywgJ2V4aXN0aW5nLXRhYmxlJywge1xuICBwYXJ0aXRpb25LZXk6IHtcbiAgICBuYW1lOiBwYXJ0aXRpb25LZXlOYW1lLFxuICAgIHR5cGU6IGR5bmFtb2RiLkF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxuICB9LFxuICBwb2ludEluVGltZVJlY292ZXJ5OiB0cnVlLFxuICBlbmNyeXB0aW9uOiBkeW5hbW9kYi5UYWJsZUVuY3J5cHRpb24uQVdTX01BTkFHRUQsXG4gIGJpbGxpbmdNb2RlOiBkeW5hbW9kYi5CaWxsaW5nTW9kZS5QQVlfUEVSX1JFUVVFU1Rcbn0pO1xuXG5uZXcgQXBpR2F0ZXdheVRvRHluYW1vREIoc3RhY2ssICd0ZXN0LWFwaS1nYXRld2F5LWR5bmFtb2RiLWFkZGl0aW9uYWwtcmVxdWVzdC10ZW1wbGF0ZXMnLCB7XG4gIGV4aXN0aW5nVGFibGVPYmosXG4gIGFkZGl0aW9uYWxSZWFkUmVxdWVzdFRlbXBsYXRlczoge1xuICAgICd0ZXh0L3BsYWluJzogYHsgXFxcbiAgICAgIFwiVGFibGVOYW1lXCI6IFwiJHtleGlzdGluZ1RhYmxlT2JqLnRhYmxlTmFtZX1cIiwgXFxcbiAgICAgIFwiS2V5Q29uZGl0aW9uRXhwcmVzc2lvblwiOiBcIiR7cGFydGl0aW9uS2V5TmFtZX0gPSA6djFcIiwgXFxcbiAgICAgIFwiRXhwcmVzc2lvbkF0dHJpYnV0ZVZhbHVlc1wiOiB7IFxcXG4gICAgICAgIFwiOnYxXCI6IHsgXFxcbiAgICAgICAgICBcIlNcIjogXCIkaW5wdXQucGFyYW1zKCcke3BhcnRpdGlvbktleU5hbWV9JylcIiBcXFxuICAgICAgICB9IFxcXG4gICAgICB9IFxcXG4gICAgfWBcbiAgfVxufSk7XG5cbi8vIFN5bnRoXG5hcHAuc3ludGgoKTsiXX0=
|
|
@@ -4,19 +4,19 @@
|
|
|
4
4
|
"testapigatewaydynamodbDynamoTableEEE3F463": {
|
|
5
5
|
"Type": "AWS::DynamoDB::Table",
|
|
6
6
|
"Properties": {
|
|
7
|
-
"
|
|
7
|
+
"AttributeDefinitions": [
|
|
8
8
|
{
|
|
9
9
|
"AttributeName": "id",
|
|
10
|
-
"
|
|
10
|
+
"AttributeType": "S"
|
|
11
11
|
}
|
|
12
12
|
],
|
|
13
|
-
"
|
|
13
|
+
"BillingMode": "PAY_PER_REQUEST",
|
|
14
|
+
"KeySchema": [
|
|
14
15
|
{
|
|
15
16
|
"AttributeName": "id",
|
|
16
|
-
"
|
|
17
|
+
"KeyType": "HASH"
|
|
17
18
|
}
|
|
18
19
|
],
|
|
19
|
-
"BillingMode": "PAY_PER_REQUEST",
|
|
20
20
|
"PointInTimeRecoverySpecification": {
|
|
21
21
|
"PointInTimeRecoveryEnabled": true
|
|
22
22
|
},
|
|
@@ -60,10 +60,10 @@
|
|
|
60
60
|
"testapigatewaydynamodbRestApiDeployment1898674B00abb8cad507ed5309ac584f2dddf379": {
|
|
61
61
|
"Type": "AWS::ApiGateway::Deployment",
|
|
62
62
|
"Properties": {
|
|
63
|
+
"Description": "Automatically created by the RestApi construct",
|
|
63
64
|
"RestApiId": {
|
|
64
65
|
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
65
|
-
}
|
|
66
|
-
"Description": "Automatically created by the RestApi construct"
|
|
66
|
+
}
|
|
67
67
|
},
|
|
68
68
|
"DependsOn": [
|
|
69
69
|
"testapigatewaydynamodbRestApiidDELETE6FC8A9F3",
|
|
@@ -86,9 +86,6 @@
|
|
|
86
86
|
"testapigatewaydynamodbRestApiDeploymentStageprod2855C2C3": {
|
|
87
87
|
"Type": "AWS::ApiGateway::Stage",
|
|
88
88
|
"Properties": {
|
|
89
|
-
"RestApiId": {
|
|
90
|
-
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
91
|
-
},
|
|
92
89
|
"AccessLogSetting": {
|
|
93
90
|
"DestinationArn": {
|
|
94
91
|
"Fn::GetAtt": [
|
|
@@ -109,6 +106,9 @@
|
|
|
109
106
|
"ResourcePath": "/*"
|
|
110
107
|
}
|
|
111
108
|
],
|
|
109
|
+
"RestApiId": {
|
|
110
|
+
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
111
|
+
},
|
|
112
112
|
"StageName": "prod",
|
|
113
113
|
"TracingEnabled": true
|
|
114
114
|
}
|
|
@@ -131,14 +131,8 @@
|
|
|
131
131
|
"testapigatewaydynamodbRestApiidGET6196F638": {
|
|
132
132
|
"Type": "AWS::ApiGateway::Method",
|
|
133
133
|
"Properties": {
|
|
134
|
-
"HttpMethod": "GET",
|
|
135
|
-
"ResourceId": {
|
|
136
|
-
"Ref": "testapigatewaydynamodbRestApiid78018D34"
|
|
137
|
-
},
|
|
138
|
-
"RestApiId": {
|
|
139
|
-
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
140
|
-
},
|
|
141
134
|
"AuthorizationType": "AWS_IAM",
|
|
135
|
+
"HttpMethod": "GET",
|
|
142
136
|
"Integration": {
|
|
143
137
|
"Credentials": {
|
|
144
138
|
"Fn::GetAtt": [
|
|
@@ -208,20 +202,20 @@
|
|
|
208
202
|
},
|
|
209
203
|
"StatusCode": "500"
|
|
210
204
|
}
|
|
211
|
-
]
|
|
212
|
-
}
|
|
213
|
-
},
|
|
214
|
-
"testapigatewaydynamodbRestApiidPUT1F965B23": {
|
|
215
|
-
"Type": "AWS::ApiGateway::Method",
|
|
216
|
-
"Properties": {
|
|
217
|
-
"HttpMethod": "PUT",
|
|
205
|
+
],
|
|
218
206
|
"ResourceId": {
|
|
219
207
|
"Ref": "testapigatewaydynamodbRestApiid78018D34"
|
|
220
208
|
},
|
|
221
209
|
"RestApiId": {
|
|
222
210
|
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
223
|
-
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
},
|
|
214
|
+
"testapigatewaydynamodbRestApiidPUT1F965B23": {
|
|
215
|
+
"Type": "AWS::ApiGateway::Method",
|
|
216
|
+
"Properties": {
|
|
224
217
|
"AuthorizationType": "AWS_IAM",
|
|
218
|
+
"HttpMethod": "PUT",
|
|
225
219
|
"Integration": {
|
|
226
220
|
"Credentials": {
|
|
227
221
|
"Fn::GetAtt": [
|
|
@@ -291,20 +285,20 @@
|
|
|
291
285
|
},
|
|
292
286
|
"StatusCode": "500"
|
|
293
287
|
}
|
|
294
|
-
]
|
|
295
|
-
}
|
|
296
|
-
},
|
|
297
|
-
"testapigatewaydynamodbRestApiidDELETE6FC8A9F3": {
|
|
298
|
-
"Type": "AWS::ApiGateway::Method",
|
|
299
|
-
"Properties": {
|
|
300
|
-
"HttpMethod": "DELETE",
|
|
288
|
+
],
|
|
301
289
|
"ResourceId": {
|
|
302
290
|
"Ref": "testapigatewaydynamodbRestApiid78018D34"
|
|
303
291
|
},
|
|
304
292
|
"RestApiId": {
|
|
305
293
|
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
306
|
-
}
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
},
|
|
297
|
+
"testapigatewaydynamodbRestApiidDELETE6FC8A9F3": {
|
|
298
|
+
"Type": "AWS::ApiGateway::Method",
|
|
299
|
+
"Properties": {
|
|
307
300
|
"AuthorizationType": "AWS_IAM",
|
|
301
|
+
"HttpMethod": "DELETE",
|
|
308
302
|
"Integration": {
|
|
309
303
|
"Credentials": {
|
|
310
304
|
"Fn::GetAtt": [
|
|
@@ -374,23 +368,20 @@
|
|
|
374
368
|
},
|
|
375
369
|
"StatusCode": "500"
|
|
376
370
|
}
|
|
377
|
-
]
|
|
371
|
+
],
|
|
372
|
+
"ResourceId": {
|
|
373
|
+
"Ref": "testapigatewaydynamodbRestApiid78018D34"
|
|
374
|
+
},
|
|
375
|
+
"RestApiId": {
|
|
376
|
+
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
377
|
+
}
|
|
378
378
|
}
|
|
379
379
|
},
|
|
380
380
|
"testapigatewaydynamodbRestApiPOSTE99BD0BD": {
|
|
381
381
|
"Type": "AWS::ApiGateway::Method",
|
|
382
382
|
"Properties": {
|
|
383
|
-
"HttpMethod": "POST",
|
|
384
|
-
"ResourceId": {
|
|
385
|
-
"Fn::GetAtt": [
|
|
386
|
-
"testapigatewaydynamodbRestApi80489300",
|
|
387
|
-
"RootResourceId"
|
|
388
|
-
]
|
|
389
|
-
},
|
|
390
|
-
"RestApiId": {
|
|
391
|
-
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
392
|
-
},
|
|
393
383
|
"AuthorizationType": "AWS_IAM",
|
|
384
|
+
"HttpMethod": "POST",
|
|
394
385
|
"Integration": {
|
|
395
386
|
"Credentials": {
|
|
396
387
|
"Fn::GetAtt": [
|
|
@@ -460,7 +451,16 @@
|
|
|
460
451
|
},
|
|
461
452
|
"StatusCode": "500"
|
|
462
453
|
}
|
|
463
|
-
]
|
|
454
|
+
],
|
|
455
|
+
"ResourceId": {
|
|
456
|
+
"Fn::GetAtt": [
|
|
457
|
+
"testapigatewaydynamodbRestApi80489300",
|
|
458
|
+
"RootResourceId"
|
|
459
|
+
]
|
|
460
|
+
},
|
|
461
|
+
"RestApiId": {
|
|
462
|
+
"Ref": "testapigatewaydynamodbRestApi80489300"
|
|
463
|
+
}
|
|
464
464
|
}
|
|
465
465
|
},
|
|
466
466
|
"testapigatewaydynamodbRestApiUsagePlan244F06C8": {
|
|
@@ -688,4 +688,4 @@
|
|
|
688
688
|
]
|
|
689
689
|
}
|
|
690
690
|
}
|
|
691
|
-
}
|
|
691
|
+
}
|