Skip to content
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

Jump to bottom

feat: flip to use AmplifyTable deploy strategy for data #654

Merged
merged 8 commits into from
Nov 15, 2023
Merged

feat: flip to use AmplifyTable deploy strategy for data #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1e15eb
chore: bump to latest data cdk construct, and explicitly set deploy s…
alharris-at Nov 15, 2023
0315a47
feat: flip to use AmplifyTable deploy strategy for data
alharris-at Nov 15, 2023
8e42bff
chore: add changeset
alharris-at Nov 15, 2023
4621d00
Merge branch 'main' into use-amplify-table
alharris-at Nov 15, 2023
b2bf0c8
Merge remote-tracking branch 'origin/main' into use-amplify-table
alharris-at Nov 15, 2023
661b4ab
chore: refresh snapshots and files
alharris-at Nov 15, 2023
6c87ae3
Merge remote-tracking branch 'origin/main' into use-amplify-table
alharris-at Nov 15, 2023
c28969e
chore: add integration test to verify iterative deploys can succeed
alharris-at Nov 15, 2023
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
5 changes: 5 additions & 0 deletions .changeset/metal-sheep-kneel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-data': minor
---

Update deployment strategy to use amplify tables, and allow drop/replace semantics for sandbox tables
8 changes: 4 additions & 4 deletions packages/backend-data/src/convert_schema.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void describe('convertSchemaToCDK', () => {
assert.deepEqual(convertedDefinition.dataSourceStrategies, {
Todo: {
dbType: 'DYNAMODB',
provisionStrategy: 'DEFAULT',
provisionStrategy: 'AMPLIFY_TABLE',
},
});
});
Expand All @@ -48,7 +48,7 @@ void describe('convertSchemaToCDK', () => {
assert.deepEqual(convertedDefinition.dataSourceStrategies, {
Todo: {
dbType: 'DYNAMODB',
provisionStrategy: 'DEFAULT',
provisionStrategy: 'AMPLIFY_TABLE',
},
});
});
Expand All @@ -66,11 +66,11 @@ void describe('convertSchemaToCDK', () => {
assert.deepEqual(convertedDefinition.dataSourceStrategies, {
Todo: {
dbType: 'DYNAMODB',
provisionStrategy: 'DEFAULT',
provisionStrategy: 'AMPLIFY_TABLE',
},
Blog: {
dbType: 'DYNAMODB',
provisionStrategy: 'DEFAULT',
provisionStrategy: 'AMPLIFY_TABLE',
},
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/backend-data/src/convert_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const convertSchemaToCDK = (
schema: DataSchema
): IAmplifyDataDefinition => {
const dbType = 'DYNAMODB';
const provisionStrategy = 'DEFAULT';
const provisionStrategy = 'AMPLIFY_TABLE';

if (isModelSchema(schema)) {
/**
Expand Down
2 changes: 1 addition & 1 deletion ...th-data/expected-cdk-out/amplify-testAppId-testBranchName-branch-7d6f6c854a.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/b45fba916ea00e4066fd3ca9aaa82086097a91664fbaf613680b47e6b741673a.json"
"/1730e1e66f151a5d15fc5696f6de4b5e4d7649a12dc06b6ff7f3b735946b165b.json"
]
]
}
Expand Down
45 changes: 43 additions & 2 deletions ...d-cdk-out/amplifytestAppIdtestBranchNamebranch7d6f6c854adataE67321C2.nested.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ApiId"
]
},
"Expires": 1702671883
"Expires": 1702675657
}
},
"amplifyDataGraphQLAPINONEDS684BF699": {
Expand All @@ -64,6 +64,41 @@
"Type": "NONE"
}
},
"amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"Parameters": {
"referencetoamplifytestAppIdtestBranchNamebranch7d6f6c854adataamplifyDataGraphQLAPI8E80FACEApiId": {
"Fn::GetAtt": [
"amplifyDataGraphQLAPI42A6FA33",
"ApiId"
]
}
},
"TemplateURL": {
"Fn::Join": [
"",
[
"https://s3.",
{
"Ref": "AWS::Region"
},
".",
{
"Ref": "AWS::URLSuffix"
},
"/",
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/35e06ca29c28793a345d0a1e4ed0a16bf7bad8a644c30c06a02b4218f7be6aa6.json"
]
]
}
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"amplifyDataTodoNestedStackTodoNestedStackResource551CEA56": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
Expand All @@ -83,6 +118,12 @@
"DynamoDBEnableServerSideEncryption": {
"Ref": "DynamoDBEnableServerSideEncryption"
},
"referencetoamplifytestAppIdtestBranchNamebranch7d6f6c854adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8C0952BCOutputsamplifytestAppIdtestBranchNamebranch7d6f6c854adataamplifyDataAmplifyTableManagerTableD81D951E": {
"Fn::GetAtt": [
"amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
"Outputs.amplifytestAppIdtestBranchNamebranch7d6f6c854adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventE4FBF539Arn"
]
},
"referencetoamplifytestAppIdtestBranchNamebranch7d6f6c854adataamplifyDataGraphQLAPI8E80FACEApiId": {
"Fn::GetAtt": [
"amplifyDataGraphQLAPI42A6FA33",
Expand Down Expand Up @@ -121,7 +162,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/ee42b8a4399f9441d96d64d8a6914641cd6882338283da6ec16b07cd40ce4a2a.json"
"/7feef61ce2e7746b3d7700aa837fa419f347b204061c8e32f444e10623738309.json"
]
]
}
Expand Down
Loading
Loading