feat: remove alternate domain support

NASA-IMPACT · Aug 16, 2024 · 4b18b20 · 4b18b20
1 parent 5e2705a
commit 4b18b20
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 294 deletions.
diff --git a/app.py b/app.py
@@ -8,7 +8,6 @@
 
 from config import veda_app_settings
 from database.infrastructure.construct import RdsConstruct
-from domain.infrastructure.construct import DomainConstruct
 from ingest_api.infrastructure.config import IngestorConfig as ingest_config
 from ingest_api.infrastructure.construct import ApiConstruct as ingest_api_construct
 from ingest_api.infrastructure.construct import IngestorConstruct as ingestor_construct
@@ -70,15 +69,12 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
     stage=veda_app_settings.stage_name(),
 )
 
-domain = DomainConstruct(veda_stack, "domain", stage=veda_app_settings.stage_name())
-
 raster_api = RasterApiLambdaConstruct(
     veda_stack,
     "raster-api",
     stage=veda_app_settings.stage_name(),
     vpc=vpc.vpc,
     database=database,
-    domain=domain,
 )
 
 stac_api = StacApiLambdaConstruct(
@@ -88,7 +84,6 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
     vpc=vpc.vpc,
     database=database,
     raster_api=raster_api,
-    domain=domain,
 )
 
 website = VedaWebsite(
@@ -123,15 +118,13 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
     raster_api_url=raster_api_url,
 )
 
-
 ingest_api = ingest_api_construct(
     veda_stack,
     "ingest-api",
     config=ingestor_config,
     db_secret=database.pgstac.secret,
     db_vpc=vpc.vpc,
     db_vpc_subnets=database.vpc_subnets,
-    domain=domain,
 )
 
 ingestor = ingestor_construct(
@@ -144,43 +137,6 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
     db_vpc_subnets=database.vpc_subnets,
 )
 
-# TODO this conditional supports deploying a second set of APIs to a separate custom domain and should be removed if no longer necessary
-if veda_app_settings.alt_domain():
-    alt_domain = DomainConstruct(
-        veda_stack,
-        "alt-domain",
-        stage=veda_app_settings.stage_name(),
-        alt_domain=True,
-    )
-
-    alt_raster_api = RasterApiLambdaConstruct(
-        veda_stack,
-        "alt-raster-api",
-        stage=veda_app_settings.stage_name(),
-        vpc=vpc.vpc,
-        database=database,
-        domain_name=alt_domain.raster_domain_name,
-    )
-
-    alt_stac_api = StacApiLambdaConstruct(
-        veda_stack,
-        "alt-stac-api",
-        stage=veda_app_settings.stage_name(),
-        vpc=vpc.vpc,
-        database=database,
-        raster_api=raster_api,
-        domain_name=alt_domain.stac_domain_name,
-    )
-
-    alt_ingest_api = ingest_api_construct(
-        veda_stack,
-        "alt-ingest-api",
-        config=ingestor_config,
-        db_secret=database.pgstac.secret,
-        db_vpc=vpc.vpc,
-        domain_name=alt_domain.ingest_domain_name,
-    )
-
 git_sha = subprocess.check_output(["git", "rev-parse", "HEAD"]).decode().strip()
 try:
     git_tag = subprocess.check_output(["git", "describe", "--tags"]).decode().strip()

diff --git a/config.py b/config.py
@@ -120,15 +120,6 @@ def cdk_env(self) -> dict:
         else:
             return {}
 
-    def alt_domain(self) -> bool:
-        """True if alternative domain and host parameters provided"""
-        return all(
-            [
-                self.veda_domain_alt_hosted_zone_id,
-                self.veda_domain_alt_hosted_zone_name,
-            ]
-        )
-
     def stage_name(self) -> str:
         """Force lowercase stage name"""
         return self.stage.lower()

diff --git a/domain/infrastructure/config.py b/domain/infrastructure/config.py
diff --git a/domain/infrastructure/construct.py b/domain/infrastructure/construct.py
diff --git a/ingest_api/infrastructure/construct.py b/ingest_api/infrastructure/construct.py
@@ -17,10 +17,6 @@
 
 from .config import IngestorConfig
 
-if typing.TYPE_CHECKING:
-    from domain.infrastructure.construct import DomainConstruct
-
-
 class ApiConstruct(Construct):
     def __init__(
         self,
@@ -30,7 +26,6 @@ def __init__(
         db_secret: secretsmanager.ISecret,
         db_vpc: ec2.IVpc,
         db_vpc_subnets=ec2.SubnetSelection,
-        domain: Optional["DomainConstruct"] = None,
         **kwargs,
     ) -> None:
         super().__init__(scope, construct_id, **kwargs)
@@ -95,7 +90,6 @@ def __init__(
         self.api: aws_apigatewayv2_alpha.HttpApi = self.build_api(
             construct_id=construct_id,
             handler=self.api_lambda,
-            domain=domain,
             custom_host=config.custom_host,
         )
 
@@ -193,7 +187,6 @@ def build_api(
         *,
         construct_id: str,
         handler: aws_lambda.IFunction,
-        domain,
         custom_host: Optional[str],
     ) -> aws_apigatewayv2_alpha.HttpApi:
         integration_kwargs = dict(handler=handler)
@@ -212,20 +205,12 @@ def build_api(
             )
         )
 
-        domain_mapping = None
-        # Legacy method to use a custom subdomain for this api (i.e. <stage>-ingest.<domain-name>.com)
-        # If using a custom root path and/or a proxy server, do not use a custom subdomain
-        if domain and domain.ingest_domain_name:
-            domain_mapping = aws_apigatewayv2_alpha.DomainMappingOptions(
-                domain_name=domain.ingest_domain_name
-            )
         stack_name = Stack.of(self).stack_name
 
         return aws_apigatewayv2_alpha.HttpApi(
             self,
             f"{stack_name}-{construct_id}",
             default_integration=ingest_api_integration,
-            default_domain_mapping=domain_mapping,
         )
 
     def build_jwks_url(self, userpool_id: str) -> str: