Skip to content

Commit aef9757

Browse files
committed
Apply fix for the valid syntax test
1 parent 0a0703d commit aef9757

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import fs from 'fs';
33
import { FunctionDataConfigGenerator } from './function_data_config_generator.js';
44
import assert from 'assert';
55
import { pathToFileURL } from 'url';
6+
import { FunctionEnvironmentTypeGenerator } from './function_env_type_generator.js';
67

78
void describe('FunctionDataConfigGenerator', () => {
89
void it('generates a type definition file', () => {
@@ -41,6 +42,11 @@ void describe('FunctionDataConfigGenerator', () => {
4142

4243
functionDataConfigGenerator.generateDataConfigShim();
4344

45+
// The data config shim depends upon the env shim, so we need to build it for the config to be importable
46+
const functionEnvironmentTypeGenerator =
47+
new FunctionEnvironmentTypeGenerator('testFunction');
48+
functionEnvironmentTypeGenerator.generateTypedProcessEnvShim(['TEST_ENV']);
49+
4450
// import to validate syntax of data config file
4551
await import(pathToFileURL(filePath).toString());
4652
});

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { describe, it, mock } from 'node:test';
22
import fs from 'fs';
3-
import fsp from 'fs/promises';
43
import { FunctionEnvironmentTypeGenerator } from './function_env_type_generator.js';
54
import assert from 'assert';
65
import { pathToFileURL } from 'url';
@@ -57,7 +56,6 @@ void describe('FunctionEnvironmentTypeGenerator', () => {
5756
});
5857

5958
void it('generated type definition file has valid syntax', async () => {
60-
const targetDirectory = await fsp.mkdtemp('func_env_type_gen_test');
6159
const functionEnvironmentTypeGenerator =
6260
new FunctionEnvironmentTypeGenerator('testFunction');
6361
const filePath = `${process.cwd()}/.amplify/generated/env/testFunction.ts`;
@@ -66,8 +64,6 @@ void describe('FunctionEnvironmentTypeGenerator', () => {
6664

6765
// import to validate syntax of type definition file
6866
await import(pathToFileURL(filePath).toString());
69-
70-
await fsp.rm(targetDirectory, { recursive: true, force: true });
7167
});
7268

7369
void it('does not generate duplicate environment variables', () => {

0 commit comments

Comments
 (0)