Merge pull request #480 from NHSDigital/master

APM-5171 allow numbers in Apigee namespacing

Author: sophieclayton12-nhs

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/validate_manifest.py

@@ -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))
 
 

ansible/collections/ansible_collections/nhsd/apigee/tests/unit/plugins/module_utils/models/ansible/test_correct_namespace.py

@@ -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
 

ansible/collections/ansible_collections/nhsd/apigee/tests/unit/plugins/module_utils/models/manifest/schema_versions/v1.1.8.json

@@ -171,7 +171,7 @@
             "items": {
               "anyOf": [
                 {
-                  "anyOf": [
+                  "oneOf": [
                     {
                       "$ref": "#/definitions/ApigeeProductAttributeAccess"
                     },