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

Amplify util mock/mock supports override #12940

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Amplify util mock/mock supports override #12940

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
3978837
fix(amplify-util-mock): add support override.ts
aoi Jul 13, 2023
9183671
fix(amplify-util-mock): update overrideConfig
aoi Jul 13, 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
33 changes: 28 additions & 5 deletions packages/amplify-util-mock/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@ import * as fs from 'fs-extra';
import * as dynamoEmulator from 'amplify-dynamodb-simulator';
import { AmplifyAppSyncSimulator, AmplifyAppSyncSimulatorConfig } from '@aws-amplify/amplify-appsync-simulator';
import * as opensearchEmulator from '@aws-amplify/amplify-opensearch-simulator';
import { $TSContext, $TSAny, AmplifyFault, AMPLIFY_SUPPORT_DOCS, isWindowsPlatform, AmplifyError } from '@aws-amplify/amplify-cli-core';
import {
$TSContext,
$TSAny,
AmplifyFault,
AMPLIFY_SUPPORT_DOCS,
isWindowsPlatform,
AmplifyError,
buildOverrideDir,
pathManager,
} from '@aws-amplify/amplify-cli-core';
import { add, generate, isCodegenConfigured, switchToSDLSchema } from 'amplify-codegen';
import * as path from 'path';
import * as chokidar from 'chokidar';
Expand Down Expand Up @@ -76,7 +85,21 @@ export class APITest {
await this.appSyncSimulator.start();
await this.resolverOverrideManager.start();
await this.watch(context);
const appSyncConfig: AmplifyAppSyncSimulatorConfig = await this.runTransformer(context, this.apiParameters);

// Build override.ts
const backendDir = pathManager.getBackendDirPath();
const overrideDir = await this.getAPIBackendDirectory(context);
const isOverride = await buildOverrideDir(backendDir, overrideDir).catch((error) => {
throw new AmplifyError('InvalidOverrideError', {
message: error.message,
link: 'https://docs.amplify.aws/cli/graphql/override/',
});
});
const overrideConfig = {
overrideFlag: isOverride,
};

const appSyncConfig: AmplifyAppSyncSimulatorConfig = await this.runTransformer(context, this.apiParameters, overrideConfig);

// If any of the model types are searchable, start opensearch local instance
if (appSyncConfig?.tables?.some((table: $TSAny) => table?.isSearchable) && !isWindowsPlatform()) {
Expand Down Expand Up @@ -140,9 +163,9 @@ export class APITest {
}
}

private async runTransformer(context, parameters = {}) {
const { transformerOutput } = await runTransformer(context);
let config: any = processAppSyncResources(transformerOutput, parameters);
private async runTransformer(context, cfnParameters = {}, overrideConfig = {}) {
const { transformerOutput } = await runTransformer(context, overrideConfig);
let config: any = processAppSyncResources(transformerOutput, cfnParameters);
config = await this.ensureDDBTables(config);
config = this.configureDDBDataSource(config);
this.transformerResult = await this.configureLambdaDataSource(context, config);
Expand Down
3 changes: 2 additions & 1 deletion packages/amplify-util-mock/src/api/run-graphql-transformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
export async function runTransformer(context: any) {
export async function runTransformer(context: any, overrideConfig = {}) {
const transformerOutput = await context.amplify.executeProviderUtils(context, 'awscloudformation', 'compileSchema', {
noConfig: true,
forceCompile: true,
dryRun: true,
disableResolverOverrides: true,
disableFunctionOverrides: true,
disablePipelineFunctionOverrides: true,
overrideConfig,
});
return { transformerOutput };
}