don't attempt to parse the minimum compiler version from the runtime enumeration

Author: bmoffatt

aws_lambda_builders/workflows/go_modules/validator.py

@@ -52,15 +52,16 @@ def validate(self, runtime_path):
 
         runtime_path = super(GoRuntimeValidator, self).validate(runtime_path)
 
-        expected_major_version = int(self.runtime.replace(self.LANGUAGE, "").split(".")[0])
-        min_expected_minor_version = 11 if expected_major_version == 1 else 0
+
 
         p = subprocess.Popen([runtime_path, "version"], cwd=os.getcwd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         version_string, _ = p.communicate()
 
         if p.returncode == 0:
             major_version, minor_version = GoRuntimeValidator.get_go_versions(version_string.decode())
-            if major_version == expected_major_version and minor_version >= min_expected_minor_version:
+            min_expected_major_version = 1
+            min_expected_minor_version = 11 if major_version == 1 else 0
+            if major_version >= min_expected_major_version and minor_version >= min_expected_minor_version:
                 self._valid_runtime_path = runtime_path
                 return self._valid_runtime_path
 

aws_lambda_builders/workflows/go_modules/workflow.py

@@ -35,4 +35,4 @@ def __init__(
         self.actions = [GoModulesBuildAction(source_dir, output_path, builder)]
 
     def get_validators(self):
-        return [GoRuntimeValidator(runtime="go1.x", architecture=self.architecture)]
+        return [GoRuntimeValidator(runtime=self.runtime, architecture=self.architecture)]