Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import logging
import re

from aws_lambda_builders.utils import decode
from aws_lambda_builders.validator import RuntimeValidator
from aws_lambda_builders.workflows.java.utils import OSUtils

Expand Down Expand Up @@ -80,6 +81,6 @@ def _get_jvm_string(self, maven_path):
return None

for line in stdout.splitlines():
l_dec = line.decode()
l_dec = decode(line)
if l_dec.startswith("Java version"):
return l_dec
8 changes: 8 additions & 0 deletions tests/unit/workflows/java_maven/test_maven_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ def test_emits_warning_when_version_string_not_found(self):
validator.validate(runtime_path=self.runtime_path)
self.mock_log.warning.assert_called_with(MavenValidator.VERSION_STRING_WARNING, self.runtime_path)

def test_does_not_fail_on_non_utf8_output(self):
# e.g. a cp1252 "Maven home" path printed before the Java version line on Windows
version_string = "Maven home: C:\\Users\\Jos\xe9\\maven\nJava version: 1.8.0, vendor: Oracle".encode("cp1252")
self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string)]
validator = MavenValidator(self.runtime, self.architecture, os_utils=self.mock_os_utils, log=self.mock_log)
self.assertEqual(validator.validate(runtime_path=self.runtime_path), self.runtime_path)
self.mock_log.warning.assert_not_called()

def test_runtime_validate_unsupported_language_fail_open(self):
validator = MavenValidator(runtime="java2.0", architecture="arm64")
with self.assertRaises(UnsupportedRuntimeError):
Expand Down