Skip to content

APM-5171 allow numbers in Apigee namespacing #479

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

Merged
sophieclayton12-nhs merged 2 commits into from
Mar 14, 2024
Merged

APM-5171 allow numbers in Apigee namespacing #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec0c3cb
APM-5171 allow numbers in api name and env suffix when validating Api…
sophieclayton12-nhs Mar 13, 2024
d422e39
APM-5171 test fix
sophieclayton12-nhs Mar 14, 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
2 changes: 1 addition & 1 deletion .../ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/validate_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def correct_namespace(name, api_name, env_name) -> bool:
:param api_name: The meta.api.name item from your manifest
:param env_name: The environment name (e.g. 'internal-dev', 'int', or 'prod')
"""
regex = f"^{api_name}(-[a-z]+)*-{env_name}(-[a-z]+)*$"
regex = f"^{api_name}(-[a-z0-9]+)*-{env_name}(-[a-z0-9]+)*$"
return bool(re.match(regex, name))


Expand Down
4 changes: 4 additions & 0 deletions ...ions/nhsd/apigee/tests/unit/plugins/module_utils/models/ansible/test_correct_namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def test_correct_namespace_with_both_types_of_suffix():
assert correct_namespace("canary-api-suffix-internal-dev-application-restricted", API_NAME, ENV_NAME) is True


def test_correct_namespace_with_number_in_suffix():
assert correct_namespace("canary-api-suffix1-internal-dev-suffix2", API_NAME, ENV_NAME) is True


def test_correct_namespace_missing_hyphen_1():
assert correct_namespace("canary-apisuffix-internal-dev-application-restricted", API_NAME, ENV_NAME) is False

Expand Down
2 changes: 1 addition & 1 deletion ...s/nhsd/apigee/tests/unit/plugins/module_utils/models/manifest/schema_versions/v1.1.8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"items": {
"anyOf": [
{
"anyOf": [
"oneOf": [
{
"$ref": "#/definitions/ApigeeProductAttributeAccess"
},
Expand Down