Merge pull request #88 from shanejbrown/main

Bugfix validation 'env' can be any type (#6)
adobe · Oct 30, 2023 · 9bf13f8 · 9bf13f8
2 parents 7a71f3d + 51a349a
commit 9bf13f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/buildrunner/validation/config.py b/buildrunner/validation/config.py
@@ -6,7 +6,7 @@
 with the terms of the Adobe license agreement accompanying it.
 """
 
-from typing import Dict, List, Optional, Set, Union
+from typing import Any, Dict, List, Optional, Set, Union
 
 # pylint: disable=no-name-in-module
 from pydantic import BaseModel, Field, field_validator, ValidationError
@@ -39,7 +39,7 @@ class SSHKey(BaseModel, extra='forbid'):
 
     github: Optional[Dict[str, GithubModel]] = None
     # Global config attributes
-    env: Optional[Dict[str, str]] = None
+    env: Optional[Dict[str, Any]] = None
     build_servers: Optional[Dict[str, Union[str, List[str]]]] = Field(alias='build-servers', default=None)
     #  Intentionally has loose restrictions on ssh-keys since documentation isn't clear
     ssh_keys: Optional[Union[SSHKey, List[SSHKey]]] = Field(alias='ssh-keys', default=None)

diff --git a/buildrunner/validation/step.py b/buildrunner/validation/step.py
@@ -56,7 +56,7 @@ class RunAndServicesBase(BaseModel):
     dns: Optional[List[str]] = None
     dns_search: Optional[str] = None
     extra_hosts: Optional[Dict[str, str]] = None
-    env: Optional[Dict[str, Optional[str]]] = None
+    env: Optional[Dict[str, Optional[Any]]] = None
     files: Optional[Dict[str, str]] = None
     volumes_from: Optional[List[str]] = None
     ports:  Optional[Dict[int, Optional[int]]] = None