Skip to content

Commit 4aad0e0

Browse files
aws-sam-cli-botaws-sam-cli-bot
committed
Merge branch 'develop'
2 parents c901b8d + 1c55309 commit 4aad0e0

File tree

4 files changed

+29
-25
lines changed

4 files changed

+29
-25
lines changed

‎aws_lambda_builders/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
# Changing version will trigger a new release!
66
# Please make the version change as the last step of your development.
7-
__version__ = "1.22.0"
7+
__version__ = "1.23.0"
88
RPC_PROTOCOL_VERSION = "0.3"

‎aws_lambda_builders/validator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"nodejs12.x": [ARM64, X86_64],
1515
"nodejs14.x": [ARM64, X86_64],
1616
"nodejs16.x": [ARM64, X86_64],
17+
"nodejs18.x": [ARM64, X86_64],
1718
"python3.6": [X86_64],
1819
"python3.7": [X86_64],
1920
"python3.8": [ARM64, X86_64],

‎tests/integration/workflows/nodejs_npm/test_nodejs_npm.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def tearDown(self):
3535
shutil.rmtree(self.scratch_dir)
3636
shutil.rmtree(self.dependencies_dir)
3737

38-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
38+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
3939
def test_builds_project_without_dependencies(self, runtime):
4040
source_dir = os.path.join(self.TEST_DATA_FOLDER, "no-deps")
4141

@@ -51,7 +51,7 @@ def test_builds_project_without_dependencies(self, runtime):
5151
output_files = set(os.listdir(self.artifacts_dir))
5252
self.assertEqual(expected_files, output_files)
5353

54-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
54+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
5555
def test_builds_project_without_manifest(self, runtime):
5656
source_dir = os.path.join(self.TEST_DATA_FOLDER, "no-manifest")
5757

@@ -69,7 +69,7 @@ def test_builds_project_without_manifest(self, runtime):
6969
mock_warning.assert_called_once_with("package.json file not found. Continuing the build without dependencies.")
7070
self.assertEqual(expected_files, output_files)
7171

72-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
72+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
7373
def test_builds_project_and_excludes_hidden_aws_sam(self, runtime):
7474
source_dir = os.path.join(self.TEST_DATA_FOLDER, "excluded-files")
7575

@@ -85,7 +85,7 @@ def test_builds_project_and_excludes_hidden_aws_sam(self, runtime):
8585
output_files = set(os.listdir(self.artifacts_dir))
8686
self.assertEqual(expected_files, output_files)
8787

88-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
88+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
8989
def test_builds_project_with_remote_dependencies(self, runtime):
9090
source_dir = os.path.join(self.TEST_DATA_FOLDER, "npm-deps")
9191

@@ -105,7 +105,7 @@ def test_builds_project_with_remote_dependencies(self, runtime):
105105
output_modules = set(os.listdir(os.path.join(self.artifacts_dir, "node_modules")))
106106
self.assertEqual(expected_modules, output_modules)
107107

108-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
108+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
109109
def test_builds_project_with_npmrc(self, runtime):
110110
source_dir = os.path.join(self.TEST_DATA_FOLDER, "npmrc")
111111

@@ -131,12 +131,15 @@ def test_builds_project_with_npmrc(self, runtime):
131131
("nodejs12.x", "package-lock"),
132132
("nodejs14.x", "package-lock"),
133133
("nodejs16.x", "package-lock"),
134+
("nodejs18.x", "package-lock"),
134135
("nodejs12.x", "shrinkwrap"),
135136
("nodejs14.x", "shrinkwrap"),
136137
("nodejs16.x", "shrinkwrap"),
138+
("nodejs18.x", "shrinkwrap"),
137139
("nodejs12.x", "package-lock-and-shrinkwrap"),
138140
("nodejs14.x", "package-lock-and-shrinkwrap"),
139141
("nodejs16.x", "package-lock-and-shrinkwrap"),
142+
("nodejs18.x", "package-lock-and-shrinkwrap"),
140143
]
141144
)
142145
def test_builds_project_with_lockfile(self, runtime, dir_name):
@@ -163,7 +166,7 @@ def test_builds_project_with_lockfile(self, runtime, dir_name):
163166

164167
self.assertEqual(expected_files, output_files)
165168

166-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
169+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
167170
def test_fails_if_npm_cannot_resolve_dependencies(self, runtime):
168171
source_dir = os.path.join(self.TEST_DATA_FOLDER, "broken-deps")
169172

@@ -178,7 +181,7 @@ def test_fails_if_npm_cannot_resolve_dependencies(self, runtime):
178181

179182
self.assertIn("No matching version found for [email protected]", str(ctx.exception))
180183

181-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
184+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
182185
def test_builds_project_with_remote_dependencies_without_download_dependencies_with_dependencies_dir(self, runtime):
183186
source_dir = os.path.join(self.TEST_DATA_FOLDER, "npm-deps")
184187

@@ -196,7 +199,7 @@ def test_builds_project_with_remote_dependencies_without_download_dependencies_w
196199
output_files = set(os.listdir(self.artifacts_dir))
197200
self.assertEqual(expected_files, output_files)
198201

199-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
202+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
200203
def test_builds_project_with_remote_dependencies_with_download_dependencies_and_dependencies_dir(self, runtime):
201204
source_dir = os.path.join(self.TEST_DATA_FOLDER, "npm-deps")
202205

@@ -226,7 +229,7 @@ def test_builds_project_with_remote_dependencies_with_download_dependencies_and_
226229
output_dependencies_files = set(os.listdir(os.path.join(self.dependencies_dir)))
227230
self.assertNotIn(expected_dependencies_files, output_dependencies_files)
228231

229-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
232+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
230233
def test_builds_project_with_remote_dependencies_without_download_dependencies_without_dependencies_dir(
231234
self, runtime
232235
):
@@ -252,7 +255,7 @@ def test_builds_project_with_remote_dependencies_without_download_dependencies_w
252255
"artifacts directory. "
253256
)
254257

255-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
258+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
256259
def test_builds_project_without_combine_dependencies(self, runtime):
257260
source_dir = os.path.join(self.TEST_DATA_FOLDER, "npm-deps")
258261

‎tests/integration/workflows/nodejs_npm_esbuild/test_nodejs_npm_with_esbuild.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def tearDown(self):
3838
shutil.rmtree(self.artifacts_dir)
3939
shutil.rmtree(self.scratch_dir)
4040

41-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
41+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
4242
def test_builds_javascript_project_with_dependencies(self, runtime):
4343
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild")
4444

@@ -59,7 +59,7 @@ def test_builds_javascript_project_with_dependencies(self, runtime):
5959
output_files = set(os.listdir(self.artifacts_dir))
6060
self.assertEqual(expected_files, output_files)
6161

62-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
62+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
6363
def test_builds_javascript_project_with_multiple_entrypoints(self, runtime):
6464
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild-multiple-entrypoints")
6565

@@ -80,7 +80,7 @@ def test_builds_javascript_project_with_multiple_entrypoints(self, runtime):
8080
output_files = set(os.listdir(self.artifacts_dir))
8181
self.assertEqual(expected_files, output_files)
8282

83-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
83+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
8484
def test_builds_typescript_projects(self, runtime):
8585
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild-typescript")
8686

@@ -101,7 +101,7 @@ def test_builds_typescript_projects(self, runtime):
101101
output_files = set(os.listdir(self.artifacts_dir))
102102
self.assertEqual(expected_files, output_files)
103103

104-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
104+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
105105
def test_builds_with_external_esbuild(self, runtime):
106106
source_dir = os.path.join(self.TEST_DATA_FOLDER, "no-deps-esbuild")
107107
options = {"entry_points": ["included.js"]}
@@ -121,7 +121,7 @@ def test_builds_with_external_esbuild(self, runtime):
121121
output_files = set(os.listdir(self.artifacts_dir))
122122
self.assertEqual(expected_files, output_files)
123123

124-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
124+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
125125
def test_no_options_passed_to_esbuild(self, runtime):
126126
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild")
127127

@@ -138,7 +138,7 @@ def test_no_options_passed_to_esbuild(self, runtime):
138138

139139
self.assertEqual(str(context.exception), "NodejsNpmEsbuildBuilder:EsbuildBundle - entry_points not set ({})")
140140

141-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
141+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
142142
def test_bundle_with_implicit_file_types(self, runtime):
143143
source_dir = os.path.join(self.TEST_DATA_FOLDER, "implicit-file-types")
144144

@@ -159,7 +159,7 @@ def test_bundle_with_implicit_file_types(self, runtime):
159159
output_files = set(os.listdir(self.artifacts_dir))
160160
self.assertEqual(expected_files, output_files)
161161

162-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
162+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
163163
def test_bundles_project_without_dependencies(self, runtime):
164164
source_dir = os.path.join(self.TEST_DATA_FOLDER, "no-package-esbuild")
165165
options = {"entry_points": ["included"]}
@@ -185,7 +185,7 @@ def test_bundles_project_without_dependencies(self, runtime):
185185
output_files = set(os.listdir(self.artifacts_dir))
186186
self.assertEqual(expected_files, output_files)
187187

188-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
188+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
189189
def test_builds_project_with_remote_dependencies_without_download_dependencies_with_dependencies_dir(self, runtime):
190190
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-no-node_modules")
191191
options = {"entry_points": ["included.js"]}
@@ -213,7 +213,7 @@ def test_builds_project_with_remote_dependencies_without_download_dependencies_w
213213
output_files = set(os.listdir(self.artifacts_dir))
214214
self.assertEqual(expected_files, output_files)
215215

216-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
216+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
217217
def test_builds_project_with_remote_dependencies_with_download_dependencies_and_dependencies_dir(self, runtime):
218218
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-no-node_modules")
219219
options = {"entry_points": ["included.js"]}
@@ -243,7 +243,7 @@ def test_builds_project_with_remote_dependencies_with_download_dependencies_and_
243243
output_dependencies_files = set(os.listdir(os.path.join(self.dependencies_dir)))
244244
self.assertNotIn(expected_dependencies_files, output_dependencies_files)
245245

246-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
246+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
247247
def test_builds_project_with_remote_dependencies_without_download_dependencies_without_dependencies_dir(
248248
self, runtime
249249
):
@@ -268,7 +268,7 @@ def test_builds_project_with_remote_dependencies_without_download_dependencies_w
268268
" workflow can't include a dependencies directory without installing dependencies.",
269269
)
270270

271-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
271+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
272272
def test_builds_project_without_combine_dependencies(self, runtime):
273273
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-no-node_modules")
274274
options = {"entry_points": ["included.js"]}
@@ -299,7 +299,7 @@ def test_builds_project_without_combine_dependencies(self, runtime):
299299
output_dependencies_files = set(os.listdir(os.path.join(self.dependencies_dir)))
300300
self.assertNotIn(expected_dependencies_files, output_dependencies_files)
301301

302-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
302+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
303303
def test_builds_javascript_project_with_external(self, runtime):
304304
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild-externals")
305305

@@ -324,7 +324,7 @@ def test_builds_javascript_project_with_external(self, runtime):
324324
# Check that the module has been require() instead of bundled
325325
self.assertIn('require("minimal-request-promise")', js_file)
326326

327-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
327+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
328328
def test_builds_javascript_project_with_loader(self, runtime):
329329
osutils = OSUtils()
330330
source_dir = os.path.join(self.TEST_DATA_FOLDER, "no-deps-esbuild-loader")
@@ -366,7 +366,7 @@ def test_builds_javascript_project_with_loader(self, runtime):
366366
),
367367
)
368368

369-
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",)])
369+
@parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
370370
def test_includes_sourcemap_if_requested(self, runtime):
371371
source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild")
372372

0 commit comments

Comments
 (0)