Updates from PR comments

Author: stocaaro

package-lock.json

@@ -2,10 +2,7 @@ import { beforeEach, describe, it, mock } from 'node:test';
 import assert from 'assert';
 import { NoSuchKey, S3, S3ServiceException } from '@aws-sdk/client-s3';
 
-import {
-  getAmplifyClientsConfiguration,
-  getAmplifyClientsConfigurationRetriever,
-} from './get_amplify_clients_configuration.js';
+import { getAmplifyClientsConfiguration } from './get_amplify_clients_configuration.js';
 
 const validEnv = {
   AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME:
@@ -53,8 +50,7 @@ void describe('getAmplifyClientsConfiguration', () => {
     mock.method(mockS3Client, 'send', s3ClientSendMock);
 
     await assert.rejects(
-      async () =>
-        await getAmplifyClientsConfigurationRetriever(validEnv, mockS3Client),
+      async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
       new Error(
         'Error retrieving the schema from S3. Please confirm that your project has a `defineData` included in the `defineBackend` definition.'
       )
@@ -73,8 +69,7 @@ void describe('getAmplifyClientsConfiguration', () => {
     mock.method(mockS3Client, 'send', s3ClientSendMock);
 
     await assert.rejects(
-      async () =>
-        await getAmplifyClientsConfigurationRetriever(validEnv, mockS3Client),
+      async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
       new Error(
         'Error retrieving the schema from S3. You may need to grant this function authorization on the schema. TEST_ERROR: TEST_MESSAGE.'
       )
@@ -88,8 +83,7 @@ void describe('getAmplifyClientsConfiguration', () => {
     mock.method(mockS3Client, 'send', s3ClientSendMock);
 
     await assert.rejects(
-      async () =>
-        await getAmplifyClientsConfigurationRetriever(validEnv, mockS3Client),
+      async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
       new Error('Test Error')
     );
   });
@@ -105,7 +99,7 @@ void describe('getAmplifyClientsConfiguration', () => {
     mock.method(mockS3Client, 'send', s3ClientSendMock);
 
     const { resourceConfig, libraryOptions } =
-      await getAmplifyClientsConfigurationRetriever(validEnv, mockS3Client);
+      await getAmplifyClientsConfiguration(validEnv, mockS3Client);
 
     assert.deepEqual(
       await libraryOptions.Auth.credentialsProvider.getCredentialsAndIdentityId?.(),

packages/backend-function/runtime/package.json

@@ -103,22 +103,13 @@ type DataClientReturn<T> = T extends DataClientEnv
  * @returns An object containing the `resourceConfig` and `libraryOptions`
  */
 export const getAmplifyClientsConfiguration = async <T>(
-  env: T
-): Promise<DataClientReturn<T>> => {
-  const s3Client = new S3Client();
-  return getAmplifyClientsConfigurationRetriever(env, s3Client);
-};
-
-/**
- * The implementation of `getAmplifyClientsConfiguration` that allows you to pass in an S3 client for testing purposes
- * @param env - The environment variables for the data client
- * @param s3Client - The S3 client to use for retrieving the schema
- * @returns An object containing the `resourceConfig` and `libraryOptions`
- */
-export const getAmplifyClientsConfigurationRetriever = async <T>(
   env: T,
-  s3Client: S3Client
+  s3Client?: S3Client
 ): Promise<DataClientReturn<T>> => {
+  if (!s3Client) {
+    s3Client = new S3Client();
+  }
+
   if (!isDataClientEnv(env)) {
     return { resourceConfig: {}, libraryOptions: {} } as DataClientReturn<T>;
   }