fix: Update e2e test naming

Author: stocaaro

packages/integration-tests/src/test-e2e/deployment/data_access_from_function_project.deployment.test.ts

@@ -0,0 +1,4 @@
+import { defineDeploymentTest } from './deployment.test.template.js';
+import { DataAccessFromFunctionTestProjectCreator } from '../../test-project-setup/data_access_from_function_project.js';
+
+defineDeploymentTest(new DataAccessFromFunctionTestProjectCreator());

packages/integration-tests/src/test-e2e/deployment/data_and_function_project.deployment.test.ts

@@ -0,0 +1,4 @@
+import { defineSandboxTest } from './sandbox.test.template.js';
+import { DataAccessFromFunctionTestProjectCreator } from '../../test-project-setup/data_access_from_function_project.js';
+
+defineSandboxTest(new DataAccessFromFunctionTestProjectCreator());

packages/integration-tests/src/test-e2e/sandbox/data_access_from_function_project.sandbox.test.ts

@@ -37,8 +37,10 @@ if (process.versions.node) {
 /**
  * Creates the data and function test project.
  */
-export class DataAndFunctionTestProjectCreator implements TestProjectCreator {
-  readonly name = 'data-and-function';
+export class DataAccessFromFunctionTestProjectCreator
+  implements TestProjectCreator
+{
+  readonly name = 'data-access-from-function';
 
   /**
    * Creates project creator.
@@ -63,7 +65,7 @@ export class DataAndFunctionTestProjectCreator implements TestProjectCreator {
     const { projectName, projectRoot, projectAmplifyDir } =
       await createEmptyAmplifyProject(this.name, e2eProjectDir);
 
-    const project = new DataAndFunctionTestProject(
+    const project = new DataAccessFromFunctionTestProject(
       projectName,
       projectRoot,
       projectAmplifyDir,
@@ -87,8 +89,9 @@ export class DataAndFunctionTestProjectCreator implements TestProjectCreator {
 /**
  * The data and function test project.
  */
-class DataAndFunctionTestProject extends TestProjectBase {
-  readonly sourceProjectDirPath = '../../src/test-projects/data-and-function';
+class DataAccessFromFunctionTestProject extends TestProjectBase {
+  readonly sourceProjectDirPath =
+    '../../src/test-projects/data_access_from_function';
 
   readonly sourceProjectAmplifyDirSuffix = `${this.sourceProjectDirPath}/amplify`;
 

packages/integration-tests/src/test-e2e/sandbox/data_and_function_project.sandbox.test.ts

@@ -1,6 +1,6 @@
 import { defineBackend } from '@aws-amplify/backend';
 import { data } from './data/resource.js';
 import { todoCount } from './functions/todo-count/resource.js';
-import { noopImport } from './functions/noop-import/resource.js';
+import { customerS3Import } from './functions/customer-s3-import/resource.js';
 
-const backend = defineBackend({ data, todoCount, noopImport });
+const backend = defineBackend({ data, todoCount, customerS3Import });

packages/integration-tests/src/test-project-setup/data_and_function_project.ts renamed to packages/integration-tests/src/test-project-setup/data_access_from_function_project.ts

@@ -1,6 +1,6 @@
 import { a, ClientSchema, defineData } from '@aws-amplify/backend';
 import { todoCount } from '../functions/todo-count/resource.js';
-import { noopImport } from '../functions/noop-import/resource.js';
+import { customerS3Import } from '../functions/customer-s3-import/resource.js';
 
 const schema = a
   .schema({
@@ -20,12 +20,12 @@ const schema = a
       .query()
       .arguments({})
       .returns(a.string())
-      .handler(a.handler.function(noopImport))
+      .handler(a.handler.function(customerS3Import))
       .authorization((allow) => [allow.publicApiKey()]),
   })
   .authorization((allow) => [
     allow.resource(todoCount),
-    allow.resource(noopImport),
+    allow.resource(customerS3Import),
   ]);
 
 export type Schema = ClientSchema<typeof schema>;

packages/integration-tests/src/test-projects/data-and-function/amplify/backend.ts renamed to packages/integration-tests/src/test-projects/data_access_from_function/amplify/backend.ts

@@ -4,7 +4,7 @@ import { generateClient } from 'aws-amplify/data';
 import type { Schema } from '../../data/resource.js';
 import { getAmplifyDataClientConfig } from '@aws-amplify/backend/function/runtime';
 // @ts-ignore
-import { env } from '$amplify/env/noop-import.js';
+import { env } from '$amplify/env/customer-s3-import.js';
 import { S3Client } from '@aws-sdk/client-s3';
 
 const { resourceConfig, libraryOptions } = await getAmplifyDataClientConfig(

packages/integration-tests/src/test-projects/data-and-function/amplify/data/resource.ts renamed to packages/integration-tests/src/test-projects/data_access_from_function/amplify/data/resource.ts

@@ -1,7 +1,7 @@
 import { defineFunction } from '@aws-amplify/backend';
 
-export const noopImport = defineFunction({
-  name: 'noop-import',
+export const customerS3Import = defineFunction({
+  name: 'customer-s3-import',
   entry: './handler.ts',
   timeoutSeconds: 30,
 });