Allow a v prefix for Terraform Version numbers

Author: dflook

image/src/terraform/module.py

@@ -126,7 +126,7 @@ def get_version_constraints(module: TerraformModule) -> Optional[list[Constraint
         try:
             return [Constraint(c) for c in str(block['required_version']).split(',')]
         except Exception:
-            debug('required_version constraint is malformed')
+            debug(f'required_version constraint is malformed: {str(block["required_version"])}')
 
     return None
 

image/src/terraform/versions.py

@@ -80,7 +80,7 @@ def __init__(self, constraint: str):
         else:
             raise ValueError(f'Invalid version constraint {constraint}')
 
-        if match := re.match(r'(?P<major>\d+)(?:\.(?P<minor>\d+))?(?:\.(?P<patch>\d+))?(?:-(?P<pre_release>.*))?', constraint):
+        if match := re.match(r'v?(?P<major>\d+)(?:\.(?P<minor>\d+))?(?:\.(?P<patch>\d+))?(?:-(?P<pre_release>.*))?', constraint):
             self.major = int(match.group('major'))
             self.minor = int(match.group('minor')) if match.group('minor') else None
             self.patch = int(match.group('patch')) if match.group('patch') else None

tests/terraform_version/test_required_version.py

@@ -0,0 +1,42 @@
+import hcl2
+
+from terraform.versions import Version
+from terraform_version.required_version import get_required_version
+
+
+def test_required_version():
+    expected_backend = hcl2.loads('''
+        terraform {
+            required_version = "1.0.0"
+        }
+    ''')
+
+    assert get_required_version(expected_backend, [Version('1.0.0')]) == Version('1.0.0')
+
+def test_required_version_v_prefix():
+    expected_backend = hcl2.loads('''
+        terraform {
+            required_version = "v1.0.0"
+        }
+    ''')
+
+    assert get_required_version(expected_backend, [Version('1.0.0')]) == Version('1.0.0')
+
+def test_required_version_greater_than():
+    expected_backend = hcl2.loads('''
+        terraform {
+            required_version = ">= 1.8.0"
+        }
+    ''')
+
+    assert get_required_version(expected_backend, [Version('1.7.0'), Version('1.8.0'), Version('1.8.1')]) == Version('1.8.1')
+
+
+def test_required_version_greater_than_v_prefix():
+    expected_backend = hcl2.loads('''
+        terraform {
+            required_version = ">= v1.8.0"
+        }
+    ''')
+
+    assert get_required_version(expected_backend, [Version('1.7.0'), Version('1.8.0'), Version('1.8.1')]) == Version('1.8.1')