Skip to content

Commit 5c1e199

Browse files
author
Dane Pilcher
committed
Merge branch 'main' into run-e2e-beta-sql-layer
2 parents 4d0f790 + 64da17f commit 5c1e199

19 files changed

Lines changed: 3390 additions & 2204 deletions

File tree

dependency_licenses.txt

Lines changed: 170 additions & 46 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
"@aws-amplify/data-construct/@aws-sdk/middleware-logger",
152152
"@aws-amplify/data-construct/@aws-sdk/middleware-recursion-detection",
153153
"@aws-amplify/data-construct/@aws-sdk/middleware-user-agent",
154+
"@aws-amplify/data-construct/@aws-sdk/nested-clients",
154155
"@aws-amplify/data-construct/@aws-sdk/region-config-resolver",
155156
"@aws-amplify/data-construct/@aws-sdk/token-providers",
156157
"@aws-amplify/data-construct/@aws-sdk/types",
@@ -202,6 +203,7 @@
202203
"@aws-amplify/data-construct/@smithy/util-stream",
203204
"@aws-amplify/data-construct/@smithy/util-uri-escape",
204205
"@aws-amplify/data-construct/@smithy/util-utf8",
206+
"@aws-amplify/data-construct/@types/uuid",
205207
"@aws-amplify/data-construct/bowser",
206208
"@aws-amplify/data-construct/charenc",
207209
"@aws-amplify/data-construct/ci-info",
@@ -275,6 +277,7 @@
275277
"@aws-amplify/graphql-api-construct/@aws-sdk/middleware-logger",
276278
"@aws-amplify/graphql-api-construct/@aws-sdk/middleware-recursion-detection",
277279
"@aws-amplify/graphql-api-construct/@aws-sdk/middleware-user-agent",
280+
"@aws-amplify/graphql-api-construct/@aws-sdk/nested-clients",
278281
"@aws-amplify/graphql-api-construct/@aws-sdk/region-config-resolver",
279282
"@aws-amplify/graphql-api-construct/@aws-sdk/token-providers",
280283
"@aws-amplify/graphql-api-construct/@aws-sdk/types",
@@ -326,6 +329,7 @@
326329
"@aws-amplify/graphql-api-construct/@smithy/util-stream",
327330
"@aws-amplify/graphql-api-construct/@smithy/util-uri-escape",
328331
"@aws-amplify/graphql-api-construct/@smithy/util-utf8",
332+
"@aws-amplify/graphql-api-construct/@types/uuid",
329333
"@aws-amplify/graphql-api-construct/bowser",
330334
"@aws-amplify/graphql-api-construct/charenc",
331335
"@aws-amplify/graphql-api-construct/ci-info",

packages/amplify-data-construct/.jsii

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,19 @@
10741074
}
10751075
}
10761076
},
1077+
"aws-cdk-lib.aws_cognito_identitypool": {
1078+
"targets": {
1079+
"dotnet": {
1080+
"namespace": "Amazon.CDK.AWS.Cognito.Identitypool"
1081+
},
1082+
"java": {
1083+
"package": "software.amazon.awscdk.services.cognito.identitypool"
1084+
},
1085+
"python": {
1086+
"module": "aws_cdk.aws_cognito_identitypool"
1087+
}
1088+
}
1089+
},
10771090
"aws-cdk-lib.aws_comprehend": {
10781091
"targets": {
10791092
"dotnet": {
@@ -1750,6 +1763,19 @@
17501763
}
17511764
}
17521765
},
1766+
"aws-cdk-lib.aws_gameliftstreams": {
1767+
"targets": {
1768+
"dotnet": {
1769+
"package": "Amazon.CDK.AWS.GameLiftStreams"
1770+
},
1771+
"java": {
1772+
"package": "software.amazon.awscdk.services.gameliftstreams"
1773+
},
1774+
"python": {
1775+
"module": "aws_cdk.aws_gameliftstreams"
1776+
}
1777+
}
1778+
},
17531779
"aws-cdk-lib.aws_globalaccelerator": {
17541780
"targets": {
17551781
"dotnet": {
@@ -3375,6 +3401,19 @@
33753401
}
33763402
}
33773403
},
3404+
"aws-cdk-lib.aws_scheduler_targets": {
3405+
"targets": {
3406+
"dotnet": {
3407+
"namespace": "Amazon.CDK.AWS.Scheduler.Targets"
3408+
},
3409+
"java": {
3410+
"package": "software.amazon.awscdk.services.scheduler.targets"
3411+
},
3412+
"python": {
3413+
"module": "aws_cdk.aws_scheduler_targets"
3414+
}
3415+
}
3416+
},
33783417
"aws-cdk-lib.aws_sdb": {
33793418
"targets": {
33803419
"dotnet": {
@@ -4032,7 +4071,7 @@
40324071
"stability": "stable"
40334072
},
40344073
"homepage": "https://github.com/aws-amplify/amplify-category-api.git",
4035-
"jsiiVersion": "5.6.4 (build a446c6c)",
4074+
"jsiiVersion": "5.8.3 (build 6fd3bf6)",
40364075
"keywords": [
40374076
"awscdk",
40384077
"aws-cdk",
@@ -4068,5 +4107,5 @@
40684107
},
40694108
"types": {},
40704109
"version": "1.15.1",
4071-
"fingerprint": "BO++ddQvxlLStVXjBx2F5lIsyJj0I9yQhswbSX/gCd8="
4110+
"fingerprint": "g5Gl1T6L9aWTeIIJDXX9W4nRL9FAU/9CcbfY/Y9HtZQ="
40724111
}

packages/amplify-data-construct/API.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import { MutationFunctionSlot } from '@aws-amplify/graphql-api-construct';
4343
import { OIDCAuthorizationConfig } from '@aws-amplify/graphql-api-construct';
4444
import { OptimisticConflictResolutionStrategy } from '@aws-amplify/graphql-api-construct';
4545
import { PartialTranslationBehavior } from '@aws-amplify/graphql-api-construct';
46+
import { PointInTimeRecoverySpecification } from '@aws-amplify/graphql-api-construct';
4647
import { ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-api-construct';
4748
import { ProvisionedThroughput } from '@aws-amplify/graphql-api-construct';
4849
import { QueryFunctionSlot } from '@aws-amplify/graphql-api-construct';
@@ -143,6 +144,8 @@ export { OptimisticConflictResolutionStrategy }
143144

144145
export { PartialTranslationBehavior }
145146

147+
export { PointInTimeRecoverySpecification }
148+
146149
export { ProvisionedConcurrencyConfig }
147150

148151
export { ProvisionedThroughput }

packages/amplify-data-construct/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"@aws-sdk/middleware-logger",
7878
"@aws-sdk/middleware-recursion-detection",
7979
"@aws-sdk/middleware-user-agent",
80+
"@aws-sdk/nested-clients",
8081
"@aws-sdk/region-config-resolver",
8182
"@aws-sdk/token-providers",
8283
"@aws-sdk/types",
@@ -128,6 +129,7 @@
128129
"@smithy/util-stream",
129130
"@smithy/util-uri-escape",
130131
"@smithy/util-utf8",
132+
"@types/uuid",
131133
"bowser",
132134
"charenc",
133135
"ci-info",
@@ -204,6 +206,7 @@
204206
"@aws-sdk/middleware-logger": "3.609.0",
205207
"@aws-sdk/middleware-recursion-detection": "3.620.0",
206208
"@aws-sdk/middleware-user-agent": "3.637.0",
209+
"@aws-sdk/nested-clients": "^3.777.0",
207210
"@aws-sdk/region-config-resolver": "3.614.0",
208211
"@aws-sdk/token-providers": "3.614.0",
209212
"@aws-sdk/types": "3.609.0",
@@ -255,6 +258,7 @@
255258
"@smithy/util-stream": "^3.1.3",
256259
"@smithy/util-uri-escape": "^3.0.0",
257260
"@smithy/util-utf8": "^3.0.0",
261+
"@types/uuid": "^9.0.8",
258262
"bowser": "^2.11.0",
259263
"charenc": "^0.0.2",
260264
"ci-info": "^3.2.0",

packages/amplify-data-construct/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
OIDCAuthorizationConfig,
3939
OptimisticConflictResolutionStrategy,
4040
PartialTranslationBehavior,
41+
PointInTimeRecoverySpecification,
4142
ProvisionedConcurrencyConfig,
4243
ProvisionedThroughput,
4344
QueryFunctionSlot,
@@ -101,6 +102,7 @@ export {
101102
OIDCAuthorizationConfig,
102103
OptimisticConflictResolutionStrategy,
103104
PartialTranslationBehavior,
105+
PointInTimeRecoverySpecification,
104106
ProvisionedConcurrencyConfig,
105107
ProvisionedThroughput,
106108
QueryFunctionSlot,

0 commit comments

Comments
 (0)