From b59b1581a7ef12d1762477d3a36b6f74365f546c Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 9 Nov 2023 14:27:02 -0800 Subject: [PATCH] upd ca certs entity --- microservices/gatewayApi/v2/routes/gateway.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/microservices/gatewayApi/v2/routes/gateway.py b/microservices/gatewayApi/v2/routes/gateway.py index c5691fe..d5cb7b0 100644 --- a/microservices/gatewayApi/v2/routes/gateway.py +++ b/microservices/gatewayApi/v2/routes/gateway.py @@ -398,7 +398,7 @@ def cleanup(dir_path): log.error("Error: %s : %s" % (dir_path, e.strerror)) def validate_base_entities(yaml, ns_attributes): - traversables = ['_format_version', '_plugin_configs', 'services', 'upstreams', 'certificates', 'caCertificates'] + traversables = ['_format_version', '_plugin_configs', 'services', 'upstreams', 'certificates', 'ca_certificates'] allow_protected_ns = ns_attributes.get('perm-protected-ns', ['deny'])[0] == 'allow' if allow_protected_ns: @@ -425,7 +425,7 @@ def validate_tags(yaml, required_tag): raise Exception('\n'.join(errors)) def traverse(source, errors, yaml, required_tag, qualifiers): - traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'caCertificates'] + traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'ca_certificates'] for k in yaml: if k in traversables: for index, item in enumerate(yaml[k]): @@ -599,7 +599,7 @@ def tags_transformation(namespace, yaml): def traverse_tags_transform(yaml, namespace, required_tag): object_count = 0 log = app.logger - traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'caCertificates'] + traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'ca_certificates'] for k in yaml: if k in traversables: for item in yaml[k]: @@ -618,7 +618,7 @@ def traverse_tags_transform(yaml, namespace, required_tag): def traverse_has_ns_qualifier(yaml, required_tag): log = app.logger - traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'caCertificates'] + traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'ca_certificates'] for k in yaml: if k in traversables: for item in yaml[k]: @@ -633,7 +633,7 @@ def traverse_has_ns_qualifier(yaml, required_tag): def traverse_has_ns_tag_only(yaml, required_tag): log = app.logger - traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'caCertificates'] + traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'ca_certificates'] for k in yaml: if k in traversables: for item in yaml[k]: @@ -654,7 +654,7 @@ def has_ns_qualifier(tags, required_tag): def traverse_get_ns_qualifier(yaml, required_tag): log = app.logger - traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'caCertificates'] + traversables = ['services', 'routes', 'plugins', 'upstreams', 'consumers', 'certificates', 'ca_certificates'] for k in yaml: if k in traversables: for item in yaml[k]: