Merge pull request #61 from shanejbrown/main

Add config validation for multi-platform images

buildrunner/config.py

@@ -34,6 +34,8 @@
     load_config,
 )
 
+from buildrunner.validation.config_model import validate_config
+
 from . import fetch
 
 MASTER_GLOBAL_CONFIG_FILE = '/etc/buildrunner/buildrunner.yaml'
@@ -370,6 +372,11 @@ def load_config(self, cfg_file, ctx=None, log_file=True):
 
         config = self._reorder_dependency_steps(config)
 
+        config_result = validate_config(**config)
+        if config_result.errors:
+            raise BuildRunnerConfigurationError('Please fix the following configuration errors:'
+                                                f'\n{config_result}')
+
         return config
 
     def get_temp_dir(self):

buildrunner/validation/config_model.py

@@ -0,0 +1,170 @@
+"""
+Copyright 2023 Adobe
+All Rights Reserved.
+
+NOTICE: Adobe permits you to use, modify, and distribute this file in accordance
+with the terms of the Adobe license agreement accompanying it.
+"""
+
+from typing import Dict, List, Optional, Set, Union
+
+# pylint: disable=no-name-in-module
+from pydantic import BaseModel, validator, ValidationError
+
+from buildrunner.validation.data import ValidationItem, ValidationResult
+
+
+class StepBuild(BaseModel):
+    """ Build model within a step """
+    path: Optional[str]
+    dockerfile: Optional[str]
+    pull: Optional[bool]
+    platform: Optional[str]
+    platforms: Optional[List[str]]
+
+
+class StepPushDict(BaseModel):
+    """ Push model within a step """
+    repository: str
+    tags: Optional[List[str]]
+
+
+class Step(BaseModel):
+    """ Step model """
+    build: Optional[StepBuild]
+    push: Optional[Union[StepPushDict, List[Union[str, StepPushDict]], str]]
+
+    def is_multi_platform(self):
+        """
+        Check if the step is a multi-platform build step
+        """
+        return self.build is not None and \
+            self.build.platforms is not None
+
+
+class Config(BaseModel):
+    """ Top level config model """
+    version: Optional[float]
+    steps: Optional[Dict[str, Step]]
+
+    # Note this is pydantic version 1.10 syntax
+    @validator('steps')
+    @classmethod
+    def validate_steps(cls, values) -> None:
+        """
+        Validate the config file
+
+        Raises:
+            ValueError | pydantic.ValidationError : If the config file is invalid
+        """
+
+        def validate_push(push: Union[StepPushDict, List[Union[str, StepPushDict]], str],
+                          mp_push_tags: Set[str],
+                          step_name: str,
+                          update_mp_push_tags: bool = True):
+            """
+            Validate push step
+
+            Args:
+                push (StepPushDict | list[str | StepPushDict] | str): Push step
+                mp_push_tags (Set[str]): Set of all tags used in multi-platform build steps
+                step_name (str): Name of the step
+                update_mp_push_tags (bool, optional): Whether to update the set of tags used in multi-platform steps.
+
+            Raises:
+                ValueError: If the config file is invalid
+            """
+            # Check for valid push section, duplicate mp tags are not allowed
+            if push is not None:
+                name = None
+                names = None
+                if isinstance(push, str):
+                    name = push
+                    if ":" not in name:
+                        name = f'{name}:latest'
+
+                if isinstance(push, StepPushDict):
+                    names = [f"{push.repository}:{tag}" for tag in push.tags]
+
+                if names is not None:
+                    for current_name in names:
+                        if current_name in mp_push_tags:
+                            # raise ValueError(f'Cannot specify duplicate tag {current_name} in build step {step_name}')
+                            raise ValueError(f'Cannot specify duplicate tag {current_name} in build step {step_name}')
+
+                if name is not None and name in mp_push_tags:
+                    # raise ValueError(f'Cannot specify duplicate tag {name} in build step {step_name}')
+                    raise ValueError(f'Cannot specify duplicate tag {name} in build step {step_name}')
+
+                if update_mp_push_tags and names is not None:
+                    mp_push_tags.update(names)
+
+                if update_mp_push_tags and name is not None:
+                    mp_push_tags.add(name)
+
+        def validate_multi_platform_build(mp_push_tags: Set[str]):
+            """
+            Validate multi-platform build steps
+
+            Args:
+                mp_push_tags (Set[str]): Set of all tags used in multi-platform build steps
+
+            Raises:
+                ValueError | pydantic.ValidationError: If the config file is invalid
+            """
+            # Iterate through each step
+            for step_name, step in values.items():
+                if step.is_multi_platform():
+                    if step.build.platform is not None:
+                        raise ValueError(f'Cannot specify both platform ({step.build.platform}) and '
+                                         f'platforms ({step.build.platforms}) in build step {step_name}')
+
+                    if not isinstance(step.build.platforms, list):
+                        raise ValueError(f'platforms must be a list in build step {step_name}')
+
+                    # Check for valid push section, duplicate mp tags are not allowed
+                    validate_push(step.push, mp_push_tags, step_name)
+
+        has_multi_platform_build = False
+        for step in values.values():
+            has_multi_platform_build = has_multi_platform_build or step.is_multi_platform()
+
+        if has_multi_platform_build:
+            mp_push_tags = set()
+            validate_multi_platform_build(mp_push_tags)
+
+            # Validate that all tags are unique across all multi-platform step
+            for step_name, step in values.items():
+
+                # Check that there are no single platform tags that match multi-platform tags
+                if not step.is_multi_platform():
+                    if step.push is not None:
+                        validate_push(push=step.push,
+                                      mp_push_tags=mp_push_tags,
+                                      step_name=step_name,
+                                      update_mp_push_tags=False)
+        return values
+
+
+def _add_validation_errors(result: ValidationResult, exc: ValidationError) -> None:
+    for error in exc.errors():
+        loc = [str(item) for item in error["loc"]]
+        result.add_error(ValidationItem(
+            message=f'Invalid configuration: {error["msg"]} ({error["type"]})',
+            field=".".join(loc),
+        ))
+
+
+def validate_config(**kwargs) -> ValidationResult:
+    """
+    Check if the config file is valid
+
+    Raises:
+        ValueError | pydantic.ValidationError : If the config file is invalid
+    """
+    result = ValidationResult()
+    try:
+        Config(**kwargs)
+    except ValidationError as exc:
+        _add_validation_errors(result, exc)
+    return result

buildrunner/validation/data.py

@@ -0,0 +1,95 @@
+"""
+Copyright 2023 Adobe
+All Rights Reserved.
+
+NOTICE: Adobe permits you to use, modify, and distribute this file in accordance
+with the terms of the Adobe license agreement accompanying it.
+"""
+from typing import List, Union
+# pylint: disable=no-name-in-module
+from pydantic import BaseModel
+
+
+class ValidationItem(BaseModel):
+    """
+    Contains a single validation error or warning.
+    """
+    message: str
+    field: Union[str, None] = None
+
+
+class ValidationResult(BaseModel):
+    """
+    Contains the result of a validation method.
+    """
+    warnings: List[ValidationItem] = []
+    errors: List[ValidationItem] = []
+
+    @staticmethod
+    def _convert(item: Union[str, ValidationItem]) -> ValidationItem:
+        if isinstance(item, str):
+            return ValidationItem(message=item)
+        return item
+
+    @classmethod
+    def error(cls, message: Union[str, ValidationItem]) -> 'ValidationResult':
+        """
+        Utility method to create a validation result consisting of a single error.
+        :param message: the error message
+        :return: a validation result
+        """
+        return cls(errors=[cls._convert(message)])
+
+    @classmethod
+    def warning(cls, message: Union[str, ValidationItem]) -> 'ValidationResult':
+        """
+        Utility method to create a validation result consisting of a single warning.
+        :param message: the warning message
+        :return: a validation result
+        """
+        return cls(warnings=[cls._convert(message)])
+
+    def add_error(self, message: Union[str, ValidationItem]) -> None:
+        """
+        Add an error to the result.
+        :param message: the error message
+        :return: None
+        """
+        self.errors.append(self._convert(message))
+
+    def add_warning(self, message: Union[str, ValidationItem]) -> None:
+        """
+        Add a warning to the result.
+        :param message: the warning message
+        :return: None
+        """
+        self.warnings.append(self._convert(message))
+
+    def merge_result(self, result: 'ValidationResult') -> None:
+        """
+        Merge the results of another validation result into this one.
+        :param result: the result to merge
+        :return: None
+        """
+        if result.errors:
+            self.errors.extend(result.errors)
+        if result.warnings:
+            self.warnings.extend(result.warnings)
+
+    def __str__(self) -> str:
+        message = ''
+        if self.errors:
+            errors = ''.join([f'  {error.field}:  {error.message}\n' for error in self.errors])
+            message += f'Errors:\n{errors}'
+
+        if self.warnings:
+            if message == '':
+                message += '\n'
+
+            warnings = ''.join([f'  {warning.field}:  {warning.message}\n' for warning in self.warnings])
+            message += f'Warnings:\n{warnings}'
+
+        return message
+
+    def __repr__(self) -> str:
+        return self.__str__()

requirements.in

@@ -11,3 +11,5 @@ vcsinfo>=2.1.105
 graphlib-backport>=1.0.3
 timeout-decorator>=0.5.0
 python-on-whales>=0.61.0
+# python-on-whales requires pydantic 1.10.11 08/2023
+pydantic>=1.10.11

requirements.txt

@@ -73,7 +73,9 @@ pkginfo==1.9.6
 pycparser==2.21
     # via cffi
 pydantic==1.10.11
-    # via python-on-whales
+    # via
+    #   -r requirements.in
+    #   python-on-whales
 pygments==2.15.1
     # via
     #   readme-renderer