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

chore: bump data package versions #13453

Merged
merged 2 commits into from
Dec 6, 2023
Merged

chore: bump data package versions #13453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0749e
chore: bump data package versions
phani-srikar Dec 6, 2023
4dc6c85
Update mock tests with refactored types
palpatim Dec 6, 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
2 changes: 1 addition & 1 deletion packages/amplify-category-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"globby": "^11.0.3",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"inquirer": "^7.3.3",
"inquirer-datepicker": "^2.0.0",
"jstreemap": "^1.28.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.2",
"@aws-sdk/util-arn-parser": "^3.310.0",
"@yarnpkg/lockfile": "^1.1.0",
"ajv": "^6.12.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0",
"@aws-amplify/amplify-category-api": "^5.9.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",
Expand Down Expand Up @@ -87,7 +87,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"gunzip-maybe": "^1.4.2",
"hidefile": "^3.0.0",
"ini": "^1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-container-hosting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"extract-api": "ts-node ../../scripts/extract-api.ts"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.8.0",
"@aws-amplify/amplify-category-api": "^5.9.0",
"@aws-amplify/amplify-cli-core": "4.2.13",
"@aws-amplify/amplify-environment-parameters": "1.9.4",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-dotnet-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0"
"graphql-transformer-core": "^8.2.3"
},
"devDependencies": {
"@types/inquirer": "^6.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dotenv": "^8.2.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"ini": "^1.3.5",
"jest-circus": "^27.0.0",
"jest-environment-node": "^26.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0",
"@aws-amplify/graphql-transformer-core": "^2.4.0",
"@aws-sdk/client-appsync": "^3.303.0",
"@aws-sdk/client-dynamodb": "^3.303.0",
"@aws-sdk/client-s3": "^3.303.0",
Expand All @@ -53,7 +53,7 @@
"get-port": "^5.1.1",
"glob": "^8.0.3",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"moment": "^2.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-migration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"aws-cdk-lib": "~2.80.0",
"constructs": "^10.0.5",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"lodash": "^4.17.21",
"semver": "^7.5.4",
"strip-ansi": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-nodejs-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0",
"graphql-transformer-core": "^8.2.3",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/amplify-provider-awscloudformation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
"@aws-amplify/graphql-transformer-core": "^2.4.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.2",
"amplify-codegen": "^4.7.2",
"archiver": "^5.3.0",
"aws-cdk-lib": "~2.80.0",
Expand All @@ -53,7 +53,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.2.0",
"graphql-transformer-core": "^8.2.3",
"ignore": "^5.2.0",
"ini": "^1.3.5",
"inquirer": "^7.3.3",
Expand All @@ -71,7 +71,7 @@
"xstate": "^4.14.0"
},
"devDependencies": {
"@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.2",
"@types/columnify": "^1.5.0",
"@types/deep-diff": "^1.0.0",
"@types/folder-hash": "^4.0.1",
Expand Down
40 changes: 20 additions & 20 deletions packages/amplify-util-mock/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@
},
"devDependencies": {
"@aws-amplify/amplify-function-plugin-interface": "1.12.1",
"@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-auth-transformer": "^3.3.0",
"@aws-amplify/graphql-default-value-transformer": "^2.2.0",
"@aws-amplify/graphql-function-transformer": "^2.1.12",
"@aws-amplify/graphql-http-transformer": "^2.1.12",
"@aws-amplify/graphql-index-transformer": "^2.3.0",
"@aws-amplify/graphql-maps-to-transformer": "^3.4.0",
"@aws-amplify/graphql-model-transformer": "^2.4.0",
"@aws-amplify/graphql-predictions-transformer": "^2.1.12",
"@aws-amplify/graphql-relational-transformer": "^2.3.0",
"@aws-amplify/graphql-searchable-transformer": "^2.4.0",
"@aws-amplify/graphql-transformer": "^1.1.0",
"@aws-amplify/graphql-transformer-core": "^2.3.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.0",
"@aws-amplify/graphql-transformer-migrator": "^2.2.9",
"@aws-amplify/graphql-transformer-core": "^2.4.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.3.2",
"@aws-amplify/graphql-transformer-migrator": "^2.2.13",
"@types/detect-port": "^1.3.0",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.149",
Expand All @@ -84,14 +84,14 @@
"axios": "^1.6.2",
"constructs": "^10.0.5",
"graphql": "^15.5.0",
"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-auth-transformer": "^7.2.71",
"graphql-connection-transformer": "^5.2.70",
"graphql-dynamodb-transformer": "^7.2.70",
"graphql-function-transformer": "^3.3.61",
"graphql-key-transformer": "^3.2.70",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.2.0",
"graphql-versioned-transformer": "^5.2.67",
"graphql-transformer-core": "^8.2.3",
"graphql-versioned-transformer": "^5.2.70",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.0.0",
"jsonwebtoken": "^9.0.0",
Expand Down
10 changes: 0 additions & 10 deletions packages/amplify-util-mock/src/__e2e__/model-with-maps-to.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
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';
Expand All @@ -25,15 +24,6 @@ beforeAll(async () => {
...defaultTransformParams.transformParameters,
useSubUsernameForDefaultIdentityClaim: false,
},
modelToDatasourceMap: new Map(
Object.entries({
Todo: {
dbType: 'DDB',
provisionDB: true,
provisionStrategy: DynamoDBProvisionStrategy.DEFAULT,
},
}),
),
});

let ddbClient;
Expand Down
8 changes: 6 additions & 2 deletions packages/amplify-util-mock/src/__e2e_v2__/test-synthesizer/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { AppSyncAuthConfiguration } from '@aws-amplify/graphql-transformer-interfaces';
import { DDB_DEFAULT_DATASOURCE_STRATEGY, constructDataSourceStrategies } from '@aws-amplify/graphql-transformer-core';
import { AppSyncAuthConfiguration, ModelDataSourceStrategy } from '@aws-amplify/graphql-transformer-interfaces';
import { ExecuteTransformConfig, executeTransform } from '@aws-amplify/graphql-transformer';
import { DeploymentResources } from './deployment-resources';
import { TransformManager } from './transform-manager';
Expand Down Expand Up @@ -35,7 +36,9 @@ const hasUserPoolAuth = (authConfig?: AppSyncAuthConfiguration): boolean =>
getAuthenticationTypesForAuthConfig(authConfig).some((authType) => authType === 'AMAZON_COGNITO_USER_POOLS');

export const transformAndSynth = (
options: Omit<ExecuteTransformConfig, 'scope' | 'nestedStackProvider' | 'assetProvider' | 'synthParameters'>,
options: Omit<ExecuteTransformConfig, 'scope' | 'nestedStackProvider' | 'assetProvider' | 'synthParameters' | 'dataSourceStrategies'> & {
dataSourceStrategies?: Record<string, ModelDataSourceStrategy>;
},
): DeploymentResources => {
const transformManager = new TransformManager();
executeTransform({
Expand All @@ -44,6 +47,7 @@ export const transformAndSynth = (
nestedStackProvider: transformManager.getNestedStackProvider(),
assetProvider: transformManager.getAssetProvider(),
synthParameters: transformManager.getSynthParameters(hasIamAuth(options.authConfig), hasUserPoolAuth(options.authConfig)),
dataSourceStrategies: options.dataSourceStrategies ?? constructDataSourceStrategies(options.schema, DDB_DEFAULT_DATASOURCE_STRATEGY),
});
return transformManager.generateDeploymentResources();
};
58 changes: 33 additions & 25 deletions packages/amplify-util-mock/src/__tests__/v2-test-synthesizer/test-transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
import {
AppSyncAuthConfiguration,
TransformerPluginProvider,
TransformerLogLevel,
DataSourceType,
import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLogLevel } from '@aws-amplify/graphql-transformer-interfaces';
import type {
ModelDataSourceStrategy,
RDSLayerMappingProvider,
SqlDirectiveDataSourceStrategy,
SynthParameters,
TransformParameters,
} 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 {
DDB_DEFAULT_DATASOURCE_STRATEGY,
GraphQLTransform,
ResolverConfig,
UserDefinedSlot,
constructDataSourceStrategies,
} from '@aws-amplify/graphql-transformer-core';
import { TransformManager, DeploymentResources } from '../../__e2e_v2__/test-synthesizer';

export type TestTransformParameters = {
transformers: TransformerPluginProvider[];
schema: string;
transformParameters?: Partial<TransformParameters>;
resolverConfig?: ResolverConfig;
export type TestTransformParameters = RDSLayerMappingProvider & {
authConfig?: AppSyncAuthConfiguration;
userDefinedSlots?: Record<string, UserDefinedSlot[]>;
// Making this optional so test code can simply use a default DDB strategy for each model in the schema.
dataSourceStrategies?: Record<string, ModelDataSourceStrategy>;
resolverConfig?: ResolverConfig;
schema: string;
sqlDirectiveDataSourceStrategies?: SqlDirectiveDataSourceStrategy[];
stackMapping?: Record<string, string>;
modelToDatasourceMap?: Map<string, DataSourceType>;
datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
synthParameters?: Partial<SynthParameters>;
transformers: TransformerPluginProvider[];
transformParameters?: Partial<TransformParameters>;
userDefinedSlots?: Record<string, UserDefinedSlot[]>;
};

/**
Expand All @@ -27,16 +35,17 @@ export type TestTransformParameters = {
*/
export const testTransform = (params: TestTransformParameters): DeploymentResources & { logs: any[] } => {
const {
schema,
modelToDatasourceMap,
datasourceSecretParameterLocations,
transformers,
authConfig,
dataSourceStrategies,
resolverConfig,
userDefinedSlots,
schema,
rdsLayerMapping,
sqlDirectiveDataSourceStrategies,
stackMapping,
transformParameters,
synthParameters: overrideSynthParameters,
transformers,
transformParameters,
userDefinedSlots,
} = params;

const transform = new GraphQLTransform({
Expand Down Expand Up @@ -66,10 +75,9 @@ export const testTransform = (params: TestTransformParameters): DeploymentResour
...overrideSynthParameters,
},
schema,
datasourceConfig: {
modelToDatasourceMap,
datasourceSecretParameterLocations,
},
rdsLayerMapping,
dataSourceStrategies: dataSourceStrategies ?? constructDataSourceStrategies(schema, DDB_DEFAULT_DATASOURCE_STRATEGY),
sqlDirectiveDataSourceStrategies,
});

const logs: any[] = [];
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-util-uibuilder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.8.0",
"@aws-amplify/amplify-category-api": "^5.9.0",
"@aws-amplify/amplify-cli-core": "4.2.13",
"@aws-amplify/amplify-prompts": "2.8.6",
"@aws-amplify/codegen-ui": "2.14.2",
Expand Down
Loading