From 057bc647c51f91dff40cb4431787a36d215d60a2 Mon Sep 17 00:00:00 2001 From: phani-srikar Date: Fri, 3 May 2024 11:27:46 -0700 Subject: [PATCH] chore: minor nits --- .codebuild/e2e_workflow.yml | 3 +-- .codebuild/e2e_workflow_base.yml | 3 +-- .codebuild/run_gen2_e2e_test.yml | 3 +-- .../graphql-generator-gen2/handlers/mutation.ts | 2 +- .../graphql-generator-gen2/handlers/query.ts | 2 +- .../src/gen2-codegen-tests-base/commands.ts | 16 ++++++++-------- .../src/gen2-codegen-tests-base/index.ts | 2 +- .../test-graphql-client-codegen.ts | 2 +- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml index 75e6f325..cf40ec34 100644 --- a/.codebuild/e2e_workflow.yml +++ b/.codebuild/e2e_workflow.yml @@ -85,7 +85,6 @@ batch: variables: TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts CLI_REGION: us-west-2 - debug-session: true depend-on: - publish_to_local_registry - identifier: w_graphql_generator_gen2 @@ -96,7 +95,7 @@ batch: type: WINDOWS_SERVER_2019_CONTAINER variables: TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts - CLI_REGION: us-west-2 + CLI_REGION: us-east-1 depend-on: - publish_to_local_registry - build_windows diff --git a/.codebuild/e2e_workflow_base.yml b/.codebuild/e2e_workflow_base.yml index 6cb86c16..c82c3a7f 100644 --- a/.codebuild/e2e_workflow_base.yml +++ b/.codebuild/e2e_workflow_base.yml @@ -85,7 +85,6 @@ batch: variables: TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts CLI_REGION: us-west-2 - debug-session: true depend-on: - publish_to_local_registry - identifier: w_graphql_generator_gen2 @@ -96,7 +95,7 @@ batch: type: WINDOWS_SERVER_2019_CONTAINER variables: TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts - CLI_REGION: us-west-2 + CLI_REGION: us-east-1 depend-on: - publish_to_local_registry - build_windows diff --git a/.codebuild/run_gen2_e2e_test.yml b/.codebuild/run_gen2_e2e_test.yml index 71756ca7..604d00bc 100644 --- a/.codebuild/run_gen2_e2e_test.yml +++ b/.codebuild/run_gen2_e2e_test.yml @@ -10,7 +10,6 @@ phases: build: commands: - source ./shared-scripts.sh && _setupGen2E2ETestsLinux - - codebuild-breakpoint - source ./shared-scripts.sh && _runGen2E2ETestsLinux post_build: commands: @@ -21,4 +20,4 @@ phases: artifacts: files: - '**/*' - base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports \ No newline at end of file + base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/mutation.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/mutation.ts index 037befd6..e4f707b8 100644 --- a/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/mutation.ts +++ b/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/mutation.ts @@ -8,4 +8,4 @@ export const handler: Schema["echoMutation"]["functionHandler"] = async (event, createdAt: performance.now().toString(), updatedAt: performance.now().toString(), }; -}; \ No newline at end of file +}; diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/query.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/query.ts index 7b0a7a08..f7eda1ac 100644 --- a/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/query.ts +++ b/packages/amplify-codegen-e2e-tests/src/__tests__/backends/graphql-generator-gen2/handlers/query.ts @@ -6,4 +6,4 @@ export const handler: Schema["echoQuery"]["functionHandler"] = async (event, con content: `Echoing content: ${event.arguments.content}`, executionDuration: performance.now() - start }; -}; \ No newline at end of file +}; diff --git a/packages/amplify-codegen-e2e-tests/src/gen2-codegen-tests-base/commands.ts b/packages/amplify-codegen-e2e-tests/src/gen2-codegen-tests-base/commands.ts index 9c1bd374..30351502 100644 --- a/packages/amplify-codegen-e2e-tests/src/gen2-codegen-tests-base/commands.ts +++ b/packages/amplify-codegen-e2e-tests/src/gen2-codegen-tests-base/commands.ts @@ -29,7 +29,7 @@ type CodegenPackage = 'GraphqlGenerator' | 'TypeGen'; const codegenPackageDirectoryMap: Record = { GraphqlGenerator: path.join(__dirname, '..', '..', '..', 'graphql-generator'), TypeGen: path.join(__dirname, '..', '..', '..', 'graphql-types-generator'), -} +}; /** * Copy the backend data snapshot into the generated app location. @@ -81,7 +81,7 @@ const overrideWithLocalCodegenPackages = (cwd: string): void => { '@aws-amplify/graphql-types-generator': codegenPackageDirectoryMap['TypeGen'], }; writeFileSync(path.join(cwd, 'package.json'), JSON.stringify(packageJsonObj)); -} +}; export const sandboxDeploy = async (cwd: string, props: Gen2DeployProps = {}): Promise => { const noOutputTimeout = props?.timeoutMs ?? 10 * 60 * 1000; @@ -106,7 +106,7 @@ export const sandboxDeploy = async (cwd: string, props: Gen2DeployProps = {}): P .wait('Would you like to delete all the resources in your sandbox environment') .sendLine('N') .runAsync(); -} +}; export const deleteSandbox = async (cwd: string): Promise => { await @@ -114,7 +114,7 @@ export const deleteSandbox = async (cwd: string): Promise => { .wait('Are you sure you want to delete all the resources in your sandbox environment') .sendLine('Y') .runAsync(); -} +}; /** * Commands for ampx generate @@ -149,7 +149,7 @@ const getClientCodegenParams = (props: ClientCodegenConfig): string[] => { default: return params; } -} +}; export const generateGraphqlClientCode = async (cwd: string, props: ClientCodegenConfig): Promise => { await @@ -158,7 +158,7 @@ export const generateGraphqlClientCode = async (cwd: string, props: ClientCodege ['ampx', 'generate', 'graphql-client-code', ...getClientCodegenParams(props)], { cwd, stripColors: true }, ).runAsync(); -} +}; export const generateForms = async (cwd: string, props: any = {}): Promise => { await @@ -167,7 +167,7 @@ export const generateForms = async (cwd: string, props: any = {}): Promise ['ampx', 'generate', 'forms'], { cwd, stripColors: true }, ).runAsync(); -} +}; export const generateOutputs = async (cwd: string, props: any = {}): Promise => { await @@ -176,4 +176,4 @@ export const generateOutputs = async (cwd: string, props: any = {}): Promise