af9e03ec08
Rewrite YAML parser, YAML objects and parameters expansion logic to
enable better control over expansion logic.
Broken backward compatilibity:
* More agressive parameter expansion. This may lead to parameters
expanded in places where they were not expanded before.
* Top-level elements, which is not known to parser (such as 'job',
'view', 'project' etc), are now lead to parse failures.
Prepend them with underscore to be ignored by parser.
* Files included using '!include-raw:' elements and having formatting in
it's path ('lazy-loaded' in previous implementation) are now expanded
too.
Use '!include-raw-escape:' for them instead.
See changes in these tests for examples:
tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml
* Parameters with template value using itself were substituted as is.
For example: "timer: '{timer}'" was expanded to "{timer}". Now it
leads to recursive parameter error.
See changes in this test for example:
tests/yamlparser/job_fixtures/parameter_name_reuse_default.*
->
tests/yamlparser/error_fixtures/parameter_name_reuse_default.*
* When job group includes a job which was never declared, it was just
ignored. Now it fails: job is missing.
See changes in this test for example:
tests/yamlparser/job_fixtures/job_group_includes_missing_job.*
->
tests/yamlparser/error_fixtures/job_group_includes_missing_job.*
Change-Id: Ief4e515f065a1b9e0f74fe06d7e94fa77d69f273
96 lines
2.8 KiB
Python
96 lines
2.8 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from dataclasses import dataclass
|
|
|
|
from .root_base import RootBase, NonTemplateRootMixin, TemplateRootMixin, Group
|
|
from .defaults import split_contents_params, view_contents_keys
|
|
|
|
|
|
@dataclass
|
|
class ViewBase(RootBase):
|
|
view_type: str
|
|
|
|
@classmethod
|
|
def from_dict(cls, config, roots, expander, data):
|
|
keep_descriptions = config.yamlparser["keep_descriptions"]
|
|
d = {**data}
|
|
name = d.pop("name")
|
|
id = d.pop("id", None)
|
|
description = d.pop("description", None)
|
|
defaults = d.pop("defaults", "global")
|
|
view_type = d.pop("view-type", "list")
|
|
contents, params = split_contents_params(d, view_contents_keys)
|
|
return cls(
|
|
roots.defaults,
|
|
expander,
|
|
keep_descriptions,
|
|
id,
|
|
name,
|
|
description,
|
|
defaults,
|
|
params,
|
|
contents,
|
|
view_type,
|
|
)
|
|
|
|
def _as_dict(self):
|
|
return {
|
|
"name": self.name,
|
|
"view-type": self.view_type,
|
|
**self.contents,
|
|
}
|
|
|
|
|
|
class View(ViewBase, NonTemplateRootMixin):
|
|
@classmethod
|
|
def add(cls, config, roots, expander, param_expander, data):
|
|
view = cls.from_dict(config, roots, expander, data)
|
|
roots.assign(roots.views, view.id, view, "view")
|
|
|
|
|
|
class ViewTemplate(ViewBase, TemplateRootMixin):
|
|
@classmethod
|
|
def add(cls, config, roots, expander, params_expander, data):
|
|
template = cls.from_dict(config, roots, params_expander, data)
|
|
roots.assign(roots.view_templates, template.id, template, "view template")
|
|
|
|
|
|
@dataclass
|
|
class ViewGroup(Group):
|
|
_views: dict
|
|
_view_templates: dict
|
|
|
|
@classmethod
|
|
def add(cls, config, roots, expander, params_expander, data):
|
|
d = {**data}
|
|
name = d.pop("name")
|
|
view_specs = [
|
|
cls._spec_from_dict(item, error_context=f"View group {name}")
|
|
for item in d.pop("views")
|
|
]
|
|
group = cls(
|
|
name,
|
|
view_specs,
|
|
d,
|
|
roots.views,
|
|
roots.view_templates,
|
|
)
|
|
roots.assign(roots.view_groups, group.name, group, "view group")
|
|
|
|
def __str__(self):
|
|
return f"View group {self.name}"
|
|
|
|
@property
|
|
def _root_dicts(self):
|
|
return [self._views, self._view_templates]
|