move cognita userpool to test-infra bootstrap

Author: rushmash91

test/e2e/bootstrap_resources.py

@@ -19,11 +19,14 @@
 from acktest.bootstrapping import Resources
 from e2e import bootstrap_directory
 from acktest.bootstrapping.elbv2 import NetworkLoadBalancer
+from acktest.bootstrapping.cognito_identity import UserPool
 
 
 @dataclass
 class BootstrapResources(Resources):
     NetworkLoadBalancer: NetworkLoadBalancer
+    AuthorizerUserPool1: UserPool
+    AuthorizerUserPool2: UserPool
 
 _bootstrap_resources = None
 

test/e2e/service_bootstrap.py

@@ -4,7 +4,7 @@
 # not use this file except in compliance with the License. A copy of the
 # License is located at
 #
-#	 http://aws.amazon.com/apache2.0/
+# http://aws.amazon.com/apache2.0/
 #
 # or in the "license" file accompanying this file. This file is distributed
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
@@ -13,19 +13,27 @@
 """Bootstraps the resources required to run the API Gateway integration tests.
 """
 import logging
+import os
 
 from acktest.bootstrapping import Resources, BootstrapFailureException
 
 from e2e import bootstrap_directory
 from e2e.bootstrap_resources import BootstrapResources
 from acktest.bootstrapping.elbv2 import NetworkLoadBalancer
+from acktest.bootstrapping.cognito_identity import UserPool
 
 
 def service_bootstrap() -> Resources:
     logging.getLogger().setLevel(logging.INFO)
 
+    user_pool_1 = UserPool(name_prefix="ack-apigw-auth-pool-1")
+    user_pool_2 = UserPool(name_prefix="ack-apigw-auth-pool-2")
+
     resources = BootstrapResources(
-        NetworkLoadBalancer=NetworkLoadBalancer(name_prefix='vpc-link-test', scheme='internal')
+        NetworkLoadBalancer=NetworkLoadBalancer(
+            name_prefix='vpc-link-test', scheme='internal'),
+        AuthorizerUserPool1=user_pool_1,
+        AuthorizerUserPool2=user_pool_2,
     )
 
     try:
@@ -35,6 +43,7 @@ def service_bootstrap() -> Resources:
 
     return resources
 
+
 if __name__ == "__main__":
     config = service_bootstrap()
     # Write config to current directory by default

test/e2e/tests/authorizer_test.py

@@ -22,6 +22,7 @@
 
 from acktest.resources import random_suffix_name
 from acktest.k8s import resource as k8s
+from e2e.bootstrap_resources import get_bootstrap_resources
 from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_apigateway_resource
 from e2e.replacement_values import REPLACEMENT_VALUES
 from .rest_api_test import simple_rest_api
@@ -32,24 +33,18 @@
 
 
 @pytest.fixture(scope="function")
-def authorizer_test_resources(cognito_client, simple_rest_api):
+def authorizer_test_resources(simple_rest_api):
     _, rest_api_cr = simple_rest_api
     rest_api_id = rest_api_cr["status"].get("id")
     assert rest_api_id is not None
 
-    user_pool_name_1 = random_suffix_name("user-pool-1", 32)
-    user_pool_name_2 = random_suffix_name("user-pool-2", 32)
-    authorizer_name = random_suffix_name("authorizer", 32)
+    bootstrap_resources = get_bootstrap_resources()
 
-    pool1_resp = cognito_client.create_user_pool(PoolName=user_pool_name_1)
-    user_pool_id_1 = pool1_resp['UserPool']['Id']
-    user_pool_arn_1 = pool1_resp['UserPool']['Arn']
+    user_pool_arn_1 = bootstrap_resources.AuthorizerUserPool1.user_pool_arn
+    user_pool_arn_2 = bootstrap_resources.AuthorizerUserPool2.user_pool_arn
 
-    pool2_resp = cognito_client.create_user_pool(PoolName=user_pool_name_2)
-    user_pool_id_2 = pool2_resp['UserPool']['Id']
-    user_pool_arn_2 = pool2_resp['UserPool']['Arn']
+    authorizer_name = random_suffix_name("authorizer", 32)
 
-    # Create Authorizer CR using prerequisites
     replacements_authorizer = REPLACEMENT_VALUES.copy()
     replacements_authorizer["AUTHORIZER_NAME"] = authorizer_name
     replacements_authorizer["REST_API_ID"] = rest_api_id
@@ -75,9 +70,6 @@ def authorizer_test_resources(cognito_client, simple_rest_api):
         authorizer_ref, wait_periods=3, period_length=DEFAULT_WAIT_SECS)
     assert deleted_auth
 
-    cognito_client.delete_user_pool(UserPoolId=user_pool_id_1)
-    cognito_client.delete_user_pool(UserPoolId=user_pool_id_2)
-
 
 @service_marker
 @pytest.mark.canary