feat: bump data dependencies to launch RDS feature (#13409)

alharris-at · web-flow · commit 7fbf29f56eb7 · 2023-11-15T08:33:39.000-08:00
* feat: bump data dependencies to launch RDS feature

* fix: update import path and name for DataSourceType

* chore: bump to latest tag release

* feat: force cli-npm version bump

* feat: bump api dependency versions

* fix: update mock tests

* chore: add default provision strategy config to correspond w/ test change made in api category repo
diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -38,7 +38,7 @@
     "folder-hash": "^4.0.2",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.3",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",
diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
@@ -31,7 +31,7 @@
     "@aws-amplify/amplify-cli-logger": "1.3.8",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/graphql-transformer-interfaces": "^3.2.2",
+    "@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
     "@aws-sdk/util-arn-parser": "^3.310.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "ajv": "^6.12.6",
diff --git a/packages/amplify-cli-npm/index.ts b/packages/amplify-cli-npm/index.ts
@@ -16,4 +16,4 @@ export const install = async (): Promise<void> => {
   return binary.install();
 };
 
-// force version bump to 12.8.0
+// force version bump to 12.9.0
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@aws-amplify/amplify-app": "5.0.25",
     "@aws-amplify/amplify-category-analytics": "5.0.25",
-    "@aws-amplify/amplify-category-api": "^5.7.8",
+    "@aws-amplify/amplify-category-api": "^5.8.0",
     "@aws-amplify/amplify-category-auth": "3.7.4",
     "@aws-amplify/amplify-category-custom": "3.1.13",
     "@aws-amplify/amplify-category-function": "5.6.4",
@@ -87,7 +87,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",
     "graphql": "^15.5.0",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "gunzip-maybe": "^1.4.2",
     "hidefile": "^3.0.0",
     "ini": "^1.3.5",
diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
@@ -26,7 +26,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-api": "^5.7.8",
+    "@aws-amplify/amplify-category-api": "^5.8.0",
     "@aws-amplify/amplify-cli-core": "4.2.13",
     "@aws-amplify/amplify-environment-parameters": "1.9.4",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.2.13",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
-    "graphql-transformer-core": "^8.1.13"
+    "graphql-transformer-core": "^8.2.0"
   },
   "devDependencies": {
     "@types/inquirer": "^6.5.0",
diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
@@ -33,7 +33,7 @@
     "dotenv": "^8.2.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "ini": "^1.3.5",
     "jest-circus": "^27.0.0",
     "jest-environment-node": "^26.6.2",
diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -29,7 +29,7 @@
     "@aws-amplify/amplify-cli-core": "4.2.13",
     "@aws-amplify/amplify-e2e-core": "5.4.4",
     "@aws-amplify/amplify-opensearch-simulator": "1.7.4",
-    "@aws-amplify/graphql-transformer-core": "^2.2.4",
+    "@aws-amplify/graphql-transformer-core": "^2.3.0",
     "@aws-sdk/client-appsync": "^3.303.0",
     "@aws-sdk/client-dynamodb": "^3.303.0",
     "@aws-sdk/client-s3": "^3.303.0",
@@ -53,7 +53,7 @@
     "get-port": "^5.1.1",
     "glob": "^8.0.3",
     "graphql-tag": "^2.10.1",
-    "graphql-transformer-core": "8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "isomorphic-fetch": "^3.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.24.0",
diff --git a/packages/amplify-migration-tests/package.json b/packages/amplify-migration-tests/package.json
@@ -35,7 +35,7 @@
     "aws-cdk-lib": "~2.80.0",
     "constructs": "^10.0.5",
     "fs-extra": "^8.1.0",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "lodash": "^4.17.21",
     "semver": "^7.5.4",
     "strip-ansi": "^6.0.0",
diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
@@ -28,7 +28,7 @@
     "@aws-amplify/amplify-cli-core": "4.2.13",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
@@ -35,8 +35,8 @@
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/amplify-util-import": "2.8.3",
     "@aws-amplify/cli-extensibility-helper": "3.0.23",
-    "@aws-amplify/graphql-transformer-core": "^2.2.4",
-    "@aws-amplify/graphql-transformer-interfaces": "^3.2.2",
+    "@aws-amplify/graphql-transformer-core": "^2.3.0",
+    "@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
     "amplify-codegen": "^4.7.2",
     "archiver": "^5.3.0",
     "aws-cdk-lib": "~2.80.0",
@@ -53,7 +53,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",
     "graphql": "^15.5.0",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.0",
     "ignore": "^5.2.0",
     "ini": "^1.3.5",
     "inquirer": "^7.3.3",
@@ -71,7 +71,7 @@
     "xstate": "^4.14.0"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-interfaces": "^3.2.2",
+    "@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
     "@types/columnify": "^1.5.0",
     "@types/deep-diff": "^1.0.0",
     "@types/folder-hash": "^4.0.1",
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
@@ -55,20 +55,20 @@
   },
   "devDependencies": {
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
-    "@aws-amplify/graphql-auth-transformer": "^3.1.10",
-    "@aws-amplify/graphql-default-value-transformer": "^2.1.8",
-    "@aws-amplify/graphql-function-transformer": "^2.1.7",
-    "@aws-amplify/graphql-http-transformer": "^2.1.7",
-    "@aws-amplify/graphql-index-transformer": "^2.1.8",
-    "@aws-amplify/graphql-maps-to-transformer": "^3.2.5",
-    "@aws-amplify/graphql-model-transformer": "^2.2.4",
-    "@aws-amplify/graphql-predictions-transformer": "^2.1.7",
-    "@aws-amplify/graphql-relational-transformer": "^2.1.8",
-    "@aws-amplify/graphql-searchable-transformer": "^2.2.4",
+    "@aws-amplify/graphql-auth-transformer": "^3.2.0",
+    "@aws-amplify/graphql-default-value-transformer": "^2.1.9",
+    "@aws-amplify/graphql-function-transformer": "^2.1.8",
+    "@aws-amplify/graphql-http-transformer": "^2.1.8",
+    "@aws-amplify/graphql-index-transformer": "^2.2.0",
+    "@aws-amplify/graphql-maps-to-transformer": "^3.3.0",
+    "@aws-amplify/graphql-model-transformer": "^2.3.0",
+    "@aws-amplify/graphql-predictions-transformer": "^2.1.8",
+    "@aws-amplify/graphql-relational-transformer": "^2.2.0",
+    "@aws-amplify/graphql-searchable-transformer": "^2.3.0",
     "@aws-amplify/graphql-transformer": "^1.1.0",
-    "@aws-amplify/graphql-transformer-core": "^2.2.4",
-    "@aws-amplify/graphql-transformer-interfaces": "^3.2.2",
-    "@aws-amplify/graphql-transformer-migrator": "^2.2.8",
+    "@aws-amplify/graphql-transformer-core": "^2.3.0",
+    "@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
+    "@aws-amplify/graphql-transformer-migrator": "^2.2.9",
     "@types/detect-port": "^1.3.0",
     "@types/jest": "^29.0.0",
     "@types/lodash": "^4.14.149",
@@ -83,14 +83,14 @@
     "axios": "^0.26.0",
     "constructs": "^10.0.5",
     "graphql": "^15.5.0",
-    "graphql-auth-transformer": "^7.2.67",
-    "graphql-connection-transformer": "^5.2.66",
-    "graphql-dynamodb-transformer": "^7.2.66",
-    "graphql-function-transformer": "^3.3.57",
-    "graphql-key-transformer": "^3.2.66",
+    "graphql-auth-transformer": "^7.2.68",
+    "graphql-connection-transformer": "^5.2.67",
+    "graphql-dynamodb-transformer": "^7.2.67",
+    "graphql-function-transformer": "^3.3.58",
+    "graphql-key-transformer": "^3.2.67",
     "graphql-tag": "^2.10.1",
-    "graphql-transformer-core": "^8.1.13",
-    "graphql-versioned-transformer": "^5.2.66",
+    "graphql-transformer-core": "^8.2.0",
+    "graphql-versioned-transformer": "^5.2.67",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^29.0.0",
     "jsonwebtoken": "^9.0.0",
diff --git a/packages/amplify-util-mock/src/__e2e__/model-with-maps-to.e2e.test.ts b/packages/amplify-util-mock/src/__e2e__/model-with-maps-to.e2e.test.ts
@@ -1,3 +1,4 @@
+import { DynamoDBProvisionStrategy } from '@aws-amplify/graphql-transformer-interfaces';
 import { transformAndSynth, defaultTransformParams } from '../__e2e_v2__/test-synthesizer';
 import { GraphQLClient } from './utils/graphql-client';
 import { deploy, launchDDBLocal, logDebug, terminateDDB } from './utils/index';
@@ -24,6 +25,15 @@ beforeAll(async () => {
         ...defaultTransformParams.transformParameters,
         useSubUsernameForDefaultIdentityClaim: false,
       },
+      modelToDatasourceMap: new Map(
+        Object.entries({
+          Todo: {
+            dbType: 'DDB',
+            provisionDB: true,
+            provisionStrategy: DynamoDBProvisionStrategy.DEFAULT,
+          },
+        }),
+      ),
     });
 
     let ddbClient;
diff --git a/packages/amplify-util-mock/src/__e2e_v2__/test-synthesizer/transform.ts b/packages/amplify-util-mock/src/__e2e_v2__/test-synthesizer/transform.ts
@@ -18,6 +18,8 @@ export const defaultTransformParams: Pick<ExecuteTransformConfig, 'transformersF
     respectPrimaryKeyAttributesOnConnectionField: true,
     enableSearchNodeToNodeEncryption: false,
     enableTransformerCfnOutputs: true,
+    allowDestructiveGraphqlSchemaUpdates: false,
+    replaceTableUponGsiUpdate: false,
   },
 };
 
diff --git a/packages/amplify-util-mock/src/__tests__/v2-test-synthesizer/test-transform.ts b/packages/amplify-util-mock/src/__tests__/v2-test-synthesizer/test-transform.ts
@@ -1,12 +1,11 @@
-import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLogLevel } from '@aws-amplify/graphql-transformer-interfaces';
-import type { SynthParameters, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
 import {
-  DatasourceType,
-  GraphQLTransform,
-  RDSConnectionSecrets,
-  ResolverConfig,
-  UserDefinedSlot,
-} from '@aws-amplify/graphql-transformer-core';
+  AppSyncAuthConfiguration,
+  TransformerPluginProvider,
+  TransformerLogLevel,
+  DataSourceType,
+} from '@aws-amplify/graphql-transformer-interfaces';
+import type { SynthParameters, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import { GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
 import { TransformManager, DeploymentResources } from '../../__e2e_v2__/test-synthesizer';
 
 export type TestTransformParameters = {
@@ -17,7 +16,7 @@ export type TestTransformParameters = {
   authConfig?: AppSyncAuthConfiguration;
   userDefinedSlots?: Record<string, UserDefinedSlot[]>;
   stackMapping?: Record<string, string>;
-  modelToDatasourceMap?: Map<string, DatasourceType>;
+  modelToDatasourceMap?: Map<string, DataSourceType>;
   datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
   synthParameters?: Partial<SynthParameters>;
 };
diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-api": "^5.7.8",
+    "@aws-amplify/amplify-category-api": "^5.8.0",
     "@aws-amplify/amplify-cli-core": "4.2.13",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/codegen-ui": "2.14.2",
diff --git a/yarn.lock b/yarn.lock
