APM-6502-New-env-setup

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/constants.py

@@ -8,6 +8,7 @@
         "internal-qa",
         "internal-qa-sandbox",
         "ref",
+        "res",
     ],
     "nhsd-prod": ["dev", "int", "sandbox", "prod"],
 }

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

@@ -35,6 +35,7 @@ class AddJwksResourceUrlToApp(pydantic.BaseModel):
         "internal-qa",
         "internal-qa-sandbox",
         "ref",
+        "res",
         "dev",
         "int",
         "sandbox",
@@ -56,11 +57,10 @@ def check_org_env_combo(cls, environment, values):
             "internal-qa",
             "internal-qa-sandbox",
             "ref",
+            "res",
         ]
         if org == "nhsd-nonprod" and environment not in non_prod_envs:
-            raise ValueError(
-                f"Invalid environment {environment} for organization {org}"
-            )
+            raise ValueError(f"Invalid environment {environment} for organization {org}")
         return environment
 
     @pydantic.validator("environment")

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

@@ -22,6 +22,7 @@
     "internal-qa",
     "internal-qa-sandbox",
     "ref",
+    "res",
     "dev",
     "sandbox",
     "int",
@@ -35,9 +36,7 @@ class ApigeeProductAttributeRateLimiting(BaseModel):
     value: Union[Dict[str, RateLimitingConfig], str]
 
     @validator("value")
-    def validate_ratelimiting(
-        cls, ratelimiting: Union[Dict[str, RateLimitingConfig], str]
-    ) -> str:
+    def validate_ratelimiting(cls, ratelimiting: Union[Dict[str, RateLimitingConfig], str]) -> str:
         """
         Apigee API requires a string.  We decode it as JSON in the
         shared flow.
@@ -110,36 +109,39 @@ def _literal_name(class_):
     + ")$)"
 )
 
+
 class ApigeeProductAttributeOther(BaseModel):
     name: constr(regex=PRODUCT_ATTRIBUTE_REGEX)
     value: str
 
+
 ApigeeProductAttributeSpecial = Annotated[
-    Union [
+    Union[
         ApigeeProductAttributeAccess,
         ApigeeProductAttributeRateLimit,
         ApigeeProductAttributeRateLimiting,
     ],
-    Field(discriminator="name")
+    Field(discriminator="name"),
 ]
 
+
 def _count_cls(items: List[Any], cls: Type):
     return sum(isinstance(item, cls) for item in items)
 
 
 class ApigeeProduct(BaseModel):
     name: str
     approvalType: Literal["auto", "manual"] = "manual"
-    attributes: List[Union[ApigeeProductAttributeSpecial, ApigeeProductAttributeOther]] = [{"name": "access", "value": "private"}]
+    attributes: List[Union[ApigeeProductAttributeSpecial, ApigeeProductAttributeOther]] = [
+        {"name": "access", "value": "private"}
+    ]
     description: str = None
     displayName: str = None
 
     # Note: This value is manually inserted by apigee_environment
     # object that contains this product. So if you do not provide a
     # value in the manifest file it is still populated.
-    environments: conlist(
-        item_type=LITERAL_APIGEE_ENVIRONMENTS, min_items=1, max_items=1
-    )
+    environments: conlist(item_type=LITERAL_APIGEE_ENVIRONMENTS, min_items=1, max_items=1)
     proxies: List[str] = []
     quota: constr(regex=r"[1-9][0-9]*") = None
     quotaInterval: constr(regex=r"[1-9][0-9]*") = None

ansible/collections/ansible_collections/nhsd/apigee/roles/deploy_manifest/vars/main.yml

@@ -1,6 +1,14 @@
 APIGEE_ORGANIZATIONS: [nhsd-nonprod, nhsd-prod]
 APIGEE_ENVIRONMENTS:
-  nhsd-nonprod: [internal-dev, internal-dev-sandbox, internal-qa, internal-qa-sandbox, ref]
+  nhsd-nonprod:
+    [
+      internal-dev,
+      internal-dev-sandbox,
+      internal-qa,
+      internal-qa-sandbox,
+      ref,
+      res,
+    ]
   nhsd-prod: [dev, sandbox, int, prod]
 
 APIGEE_ENVIRONMENT: "{{ lookup('env','APIGEE_ENVIRONMENT') }}"

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

@@ -223,6 +223,10 @@
               "const": "ref",
               "type": "string"
             },
+            {
+              "const": "res",
+              "type": "string"
+            },
             {
               "const": "dev",
               "type": "string"

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

@@ -282,6 +282,10 @@
               "const": "ref",
               "type": "string"
             },
+            {
+              "const": "res",
+              "type": "string"
+            },
             {
               "const": "dev",
               "type": "string"

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

@@ -282,6 +282,10 @@
               "const": "ref",
               "type": "string"
             },
+            {
+              "const": "res",
+              "type": "string"
+            },
             {
               "const": "dev",
               "type": "string"

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

@@ -382,6 +382,10 @@
               "const": "ref",
               "type": "string"
             },
+            {
+              "const": "res",
+              "type": "string"
+            },
             {
               "const": "dev",
               "type": "string"

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

@@ -260,6 +260,10 @@
                 "const": "ref",
                 "type": "string"
               },
+              {
+                "const": "res",
+                "type": "string"
+              },
               {
                 "const": "dev",
                 "type": "string"

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

@@ -260,6 +260,10 @@
                 "const": "ref",
                 "type": "string"
               },
+              {
+                "const": "res",
+                "type": "string"
+              },
               {
                 "const": "dev",
                 "type": "string"

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

@@ -239,6 +239,7 @@
               "internal-qa",
               "internal-qa-sandbox",
               "ref",
+              "res",
               "dev",
               "sandbox",
               "int",
@@ -371,6 +372,7 @@
             "internal-qa",
             "internal-qa-sandbox",
             "ref",
+            "res",
             "dev",
             "sandbox",
             "int",