zuul/zuul-sphinx
Code Issues Proposed changes

Merge "Make the yaml parser aware of '!encrypted/' tags"

Browse Source
This commit is contained in:
Zuul 2018-04-12 19:44:46 +00:00 committed by Gerrit Code Review
commit 2516aeff56
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zuul_sphinx/zuul.py
View File

@ -26,6 +26,17 @@ from docutils import nodes
import yaml
class ZuulSafeLoader(yaml.SafeLoader):
def __init__(self, *args, **kwargs):
super(ZuulSafeLoader, self).__init__(*args, **kwargs)
self.add_multi_constructor('!encrypted/', self.construct_encrypted)
@classmethod
def construct_encrypted(cls, loader, tag_suffix, node):
return loader.construct_sequence(node)
class ProjectTemplate(object):
def __init__(self, conf):
self.name = conf['name']
@ -72,7 +83,7 @@ class ZuulDirective(Directive):
def parse_zuul_yaml(self, path):
with open(path) as f:
data = yaml.safe_load(f)
data = yaml.load(f, Loader=ZuulSafeLoader)
layout = Layout()
for obj in data:
if 'job' in obj:
@ -86,7 +97,7 @@ class ZuulDirective(Directive):
layout = Layout()
for conf in os.listdir(path):
with open(os.path.join(path, conf)) as f:
data = yaml.safe_load(f)
data = yaml.load(f, Loader=ZuulSafeLoader)
for obj in data:
if 'job' in obj:
layout.jobs.append(obj['job'])