Skip to content

Commit 517f304

Browse files
committed
Add internal prefix to the runtime config function
1 parent 798683d commit 517f304

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

packages/backend-function/src/function_data_config_generator.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void describe('FunctionDataConfigGenerator', () => {
1414
'testFunction'
1515
);
1616
const configExport =
17-
'export const { libraryOptions, resourceConfig } = await getAmplifyClientsConfiguration(env);';
17+
'export const { libraryOptions, resourceConfig } = await internalGetAmplifyClientConfiguration(env);';
1818

1919
functionDataConfigGenerator.generateDataConfigShim();
2020

packages/backend-function/src/function_data_config_generator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import path from 'path';
44
const lambdaDataConfigTemplate = (
55
functionName: string
66
) => `// This file is auto-generated by Amplify. Edits will be overwritten.
7-
import { getAmplifyClientsConfiguration } from "@aws-amplify/backend-function/runtime";
7+
import { internalGetAmplifyClientConfiguration } from "@aws-amplify/backend-function/runtime";
88
import { env } from "../env/${functionName}";
9-
export const { libraryOptions, resourceConfig } = await getAmplifyClientsConfiguration(env);
9+
export const { libraryOptions, resourceConfig } = await internalGetAmplifyClientConfiguration(env);
1010
`;
1111

1212
/**

packages/backend-function/src/runtime/get_amplify_clients_configuration.test.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { beforeEach, describe, it, mock } from 'node:test';
22
import assert from 'assert';
33
import { NoSuchKey, S3, S3ServiceException } from '@aws-sdk/client-s3';
44

5-
import { getAmplifyClientsConfiguration } from './get_amplify_clients_configuration.js';
5+
import { internalGetAmplifyClientConfiguration } from './get_amplify_clients_configuration.js';
66

77
const validEnv = {
88
AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME:
@@ -18,7 +18,7 @@ const validEnv = {
1818

1919
let mockS3Client: S3;
2020

21-
void describe('getAmplifyClientsConfiguration', () => {
21+
void describe('internalGetAmplifyClientConfiguration', () => {
2222
beforeEach(() => {
2323
mockS3Client = new S3();
2424
});
@@ -27,7 +27,7 @@ void describe('getAmplifyClientsConfiguration', () => {
2727
void it(`returns empty config objects when ${envFieldToExclude} is not included`, async () => {
2828
const env = { ...validEnv } as Record<string, string>;
2929
delete env[envFieldToExclude];
30-
assert.deepEqual(await getAmplifyClientsConfiguration(env), {
30+
assert.deepEqual(await internalGetAmplifyClientConfiguration(env), {
3131
resourceConfig: {},
3232
libraryOptions: {},
3333
});
@@ -36,7 +36,7 @@ void describe('getAmplifyClientsConfiguration', () => {
3636
void it(`returns empty config objects when ${envFieldToExclude} is not a string`, async () => {
3737
const env = { ...validEnv } as Record<string, unknown>;
3838
env[envFieldToExclude] = 123;
39-
assert.deepEqual(await getAmplifyClientsConfiguration(env), {
39+
assert.deepEqual(await internalGetAmplifyClientConfiguration(env), {
4040
resourceConfig: {},
4141
libraryOptions: {},
4242
});
@@ -50,7 +50,8 @@ void describe('getAmplifyClientsConfiguration', () => {
5050
mock.method(mockS3Client, 'send', s3ClientSendMock);
5151

5252
await assert.rejects(
53-
async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
53+
async () =>
54+
await internalGetAmplifyClientConfiguration(validEnv, mockS3Client),
5455
new Error(
5556
'Error retrieving the schema from S3. Please confirm that your project has a `defineData` included in the `defineBackend` definition.'
5657
)
@@ -69,7 +70,8 @@ void describe('getAmplifyClientsConfiguration', () => {
6970
mock.method(mockS3Client, 'send', s3ClientSendMock);
7071

7172
await assert.rejects(
72-
async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
73+
async () =>
74+
await internalGetAmplifyClientConfiguration(validEnv, mockS3Client),
7375
new Error(
7476
'Error retrieving the schema from S3. You may need to grant this function authorization on the schema. TEST_ERROR: TEST_MESSAGE.'
7577
)
@@ -83,7 +85,8 @@ void describe('getAmplifyClientsConfiguration', () => {
8385
mock.method(mockS3Client, 'send', s3ClientSendMock);
8486

8587
await assert.rejects(
86-
async () => await getAmplifyClientsConfiguration(validEnv, mockS3Client),
88+
async () =>
89+
await internalGetAmplifyClientConfiguration(validEnv, mockS3Client),
8790
new Error('Test Error')
8891
);
8992
});
@@ -99,7 +102,7 @@ void describe('getAmplifyClientsConfiguration', () => {
99102
mock.method(mockS3Client, 'send', s3ClientSendMock);
100103

101104
const { resourceConfig, libraryOptions } =
102-
await getAmplifyClientsConfiguration(validEnv, mockS3Client);
105+
await internalGetAmplifyClientConfiguration(validEnv, mockS3Client);
103106

104107
assert.deepEqual(
105108
await libraryOptions.Auth.credentialsProvider.getCredentialsAndIdentityId?.(),

packages/backend-function/src/runtime/get_amplify_clients_configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ type DataClientReturn<T> = T extends DataClientEnv
102102
* @param env - The environment variables for the data client
103103
* @returns An object containing the `resourceConfig` and `libraryOptions`
104104
*/
105-
export const getAmplifyClientsConfiguration = async <T>(
105+
export const internalGetAmplifyClientConfiguration = async <T>(
106106
env: T,
107107
s3Client?: S3Client
108108
): Promise<DataClientReturn<T>> => {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { getAmplifyClientsConfiguration } from './get_amplify_clients_configuration.js';
1+
export { internalGetAmplifyClientConfiguration } from './get_amplify_clients_configuration.js';

0 commit comments

Comments
 (0)