Skip to content

feat(toolkit-lib): add support for AWS::DynamoDB::GlobalTable and AWS::Lambda::Url Arn attributes #911

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(toolkit-lib): add support for AWS::DynamoDB::GlobalTable and AWS::Lambda::Url Arn attributes #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/@aws-cdk/toolkit-lib/lib/api/cloudformation/evaluate-cloudformation-template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,14 @@ const RESOURCE_TYPE_ATTRIBUTES_FORMATS: {
'AWS::IAM::Group': { Arn: iamArnFmt },
'AWS::S3::Bucket': { Arn: s3ArnFmt },
'AWS::Lambda::Function': { Arn: stdColonResourceArnFmt },
"AWS::Lambda::Url": { Arn: stdSlashResourceArnFmt },
'AWS::Events::EventBus': {
Arn: stdSlashResourceArnFmt,
// the name attribute of the EventBus is the same as the Ref
Name: (parts) => parts.resourceName,
},
'AWS::DynamoDB::Table': { Arn: stdSlashResourceArnFmt },
"AWS::DynamoDB::GlobalTable": { Arn: stdSlashResourceArnFmt },
'AWS::AppSync::GraphQLApi': { ApiId: appsyncGraphQlApiApiIdFmt },
'AWS::AppSync::FunctionConfiguration': {
FunctionId: appsyncGraphQlFunctionIDFmt,
Expand Down
151 changes: 151 additions & 0 deletions packages/@aws-cdk/toolkit-lib/test/api/hotswap/state-machine-hotswap-deployments.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,157 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
});
});

test('knows how to handle attributes of the AWS::DynamoDB::GlobalTable resource', async () => {
// GIVEN
setup.setCurrentCfnStackTemplate({
Resources: {
GlobalTable: {
Type: 'AWS::DynamoDB::GlobalTable',
Properties: {
KeySchema: [
{
AttributeName: 'name',
KeyType: 'HASH',
},
],
AttributeDefinitions: [
{
AttributeName: 'name',
AttributeType: 'S',
},
],
BillingMode: 'PAY_PER_REQUEST',
Replicas: [
{
Region: 'us-east-1',
},
],
},
},
Machine: {
Type: 'AWS::StepFunctions::StateMachine',
Properties: {
DefinitionString: '{}',
StateMachineName: 'my-machine',
},
},
},
});
setup.pushStackResourceSummaries(setup.stackSummaryOf('GlobalTable', 'AWS::DynamoDB::GlobalTable', 'my-global-table'));
const cdkStackArtifact = setup.cdkStackArtifactOf({
template: {
Resources: {
GlobalTable: {
Type: 'AWS::DynamoDB::GlobalTable',
Properties: {
KeySchema: [
{
AttributeName: 'name',
KeyType: 'HASH',
},
],
AttributeDefinitions: [
{
AttributeName: 'name',
AttributeType: 'S',
},
],
BillingMode: 'PAY_PER_REQUEST',
Replicas: [
{
Region: 'us-east-1',
},
],
},
},
Machine: {
Type: 'AWS::StepFunctions::StateMachine',
Properties: {
DefinitionString: {
'Fn::Join': [
'',
['{"TableName":"', { Ref: 'GlobalTable' }, '","TableArn":"', { 'Fn::GetAtt': ['GlobalTable', 'Arn'] }, '"}'],
],
},
StateMachineName: 'my-machine',
},
},
},
},
});

// THEN
const result = await hotswapMockSdkProvider.tryHotswapDeployment(hotswapMode, cdkStackArtifact);

expect(result).not.toBeUndefined();
expect(mockStepFunctionsClient).toHaveReceivedCommandWith(UpdateStateMachineCommand, {
stateMachineArn: 'arn:swa:states:here:123456789012:stateMachine:my-machine',
definition: JSON.stringify({
TableName: 'my-global-table',
TableArn: 'arn:swa:dynamodb:here:123456789012:globaltable/my-global-table',
}),
});
});

test('knows how to handle attributes of the AWS::Lambda::Url resource', async () => {
// GIVEN
setup.setCurrentCfnStackTemplate({
Resources: {
LambdaUrl: {
Type: 'AWS::Lambda::Url',
Properties: {
TargetFunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:my-function',
AuthType: 'NONE',
},
},
Machine: {
Type: 'AWS::StepFunctions::StateMachine',
Properties: {
DefinitionString: '{}',
StateMachineName: 'my-machine',
},
},
},
});
setup.pushStackResourceSummaries(setup.stackSummaryOf('LambdaUrl', 'AWS::Lambda::Url', 'my-lambda-url'));
const cdkStackArtifact = setup.cdkStackArtifactOf({
template: {
Resources: {
LambdaUrl: {
Type: 'AWS::Lambda::Url',
Properties: {
TargetFunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:my-function',
AuthType: 'NONE',
},
},
Machine: {
Type: 'AWS::StepFunctions::StateMachine',
Properties: {
DefinitionString: {
'Fn::Join': [
'',
['{"UrlArn":"', { 'Fn::GetAtt': ['LambdaUrl', 'Arn'] }, '"}'],
],
},
StateMachineName: 'my-machine',
},
},
},
},
});

// THEN
const result = await hotswapMockSdkProvider.tryHotswapDeployment(hotswapMode, cdkStackArtifact);

expect(result).not.toBeUndefined();
expect(mockStepFunctionsClient).toHaveReceivedCommandWith(UpdateStateMachineCommand, {
stateMachineArn: 'arn:swa:states:here:123456789012:stateMachine:my-machine',
definition: JSON.stringify({
UrlArn: 'arn:swa:lambda:here:123456789012:url/my-lambda-url',
}),
});
});

test('knows how to handle attributes of the AWS::KMS::Key resource', async () => {
// GIVEN
setup.setCurrentCfnStackTemplate({
Expand Down
Loading