Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NAS-130074 / 24.10 / Fix certificate authority ref #32

Merged
merged 2 commits into from
Jul 17, 2024
Merged

NAS-130074 / 24.10 / Fix certificate authority ref #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b228e44
Fix certificate authority ref
sonicaj Jul 17, 2024
ed3cbd6
No need to have lower limit of 9000 for ports
sonicaj Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions catalog_reader/questions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def normalize_question(question: dict, version_data: dict, context: dict) -> Non
{'value': i['id'], 'description': f'{i["name"]!r} Certificate'}
for i in context['certificates']
]
elif ref == 'definitions/certificateAuthority':
elif ref == 'definitions/certificate_authority':
get_cert_ca_options(schema, data, {'value': None, 'description': 'No Certificate Authority'})
data['enum'] += [{'value': None, 'description': 'No Certificate Authority'}] + [
{'value': i['id'], 'description': f'{i["name"]!r} Certificate Authority'}
Expand All @@ -75,10 +75,7 @@ def normalize_question(question: dict, version_data: dict, context: dict) -> Non
data['enum'] = [{'value': None, 'description': 'No Port Selected'}] if schema.get('null') else []
data['enum'] += [
{'value': i, 'description': f'{i!r} Port'}
for i in filter(
lambda p: schema.get('min', 9000) <= p <= schema.get('max', 65534),
context['unused_ports']
)
for i in context['unused_ports']
]
elif ref == 'normalize/acl':
data['attrs'] = ACL_QUESTION
Expand Down
Loading