Bug: Nexus Image Version Must be Semver

src/aosm/azext_aosm/common/constants.py

@@ -79,7 +79,8 @@ class ManifestsExist(str, Enum):
 CNF_VALUES_SCHEMA_FILENAME = "values.schema.json"
 CNF_TEMPLATE_FOLDER_NAME = "cnf"
 
-SEMVER_REGEX = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
+NEXUS_IMAGE_REGEX = r"^[\~]?(\d+)\.(\d+)\.(\d+)$"
+# SEMVER_REGEX = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
 #################
 # OLD CONSTANTS #
 #################

src/aosm/azext_aosm/common/utils.py

@@ -13,7 +13,7 @@
 import tempfile
 
 from knack.log import get_logger
-from azext_aosm.common.constants import SEMVER_REGEX
+from azext_aosm.common.constants import NEXUS_IMAGE_REGEX
 from azext_aosm.common.exceptions import InvalidFileTypeError, MissingDependency
 
 logger = get_logger(__name__)
@@ -130,5 +130,11 @@ def split_image_path(image) -> "tuple[str, str, str]":
     (name, version) = name_and_version.split(":", 2)
     return (source_acr_registry, name, version)
 
-def is_semver(string):
-    return re.match(SEMVER_REGEX, string) is not None
+def is_valid_nexus_image_version(string):
+    """Check if image version is valid.
+
+    This is based on validation in pez repo.
+    It requires the image version to be major.minor.path,
+    but does enforce full semver validation.
+    """
+    return re.match(NEXUS_IMAGE_REGEX, string) is not None

src/aosm/azext_aosm/configuration_models/onboarding_vnf_input_config.py

@@ -12,7 +12,7 @@
 from azext_aosm.configuration_models.onboarding_nfd_base_input_config import (
     OnboardingNFDBaseInputConfig,
 )
-from azext_aosm.common.utils import split_image_path, is_semver
+from azext_aosm.common.utils import split_image_path, is_valid_nexus_image_version
 
 
 @dataclass
@@ -233,7 +233,7 @@ def validate(self):
             raise ValidationError("You must include at least one image")
         for image in self.images:
             (_, _, version) = split_image_path(image)
-            if not is_semver(version):
+            if not is_valid_nexus_image_version(version):
                 raise ValidationError(f"{image} has invalid version '{version}'.\n"
                                       "Allowed formats are major.minor.patch")
         if not self.arm_templates: