Jim MacArthur pushed to branch master at BuildStream / buildstream
Commits:
1 changed file:
Changes:
... | ... | @@ -53,7 +53,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key |
53 | 53 |
#
|
54 | 54 |
@staticmethod
|
55 | 55 |
def _new_from_config_node(spec_node, basedir=None):
|
56 |
- _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance_name'])
|
|
56 |
+ _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance-name'])
|
|
57 | 57 |
url = _yaml.node_get(spec_node, str, 'url')
|
58 | 58 |
push = _yaml.node_get(spec_node, bool, 'push', default_value=False)
|
59 | 59 |
if not url:
|
... | ... | @@ -61,7 +61,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key |
61 | 61 |
raise LoadError(LoadErrorReason.INVALID_DATA,
|
62 | 62 |
"{}: empty artifact cache URL".format(provenance))
|
63 | 63 |
|
64 |
- instance_name = _yaml.node_get(spec_node, str, 'instance_name', default_value=None)
|
|
64 |
+ instance_name = _yaml.node_get(spec_node, str, 'instance-name', default_value=None)
|
|
65 | 65 |
|
66 | 66 |
server_cert = _yaml.node_get(spec_node, str, 'server-cert', default_value=None)
|
67 | 67 |
if server_cert and basedir:
|