resolved merge conflicts from master

Author: briancaffey

.gitlab-ci.yml

@@ -5,16 +5,14 @@ stages:
   - build
   - integration
   - release
-  - plan
   - deploy
 
 # gitlab ci deployment options
 include:
   - local: /gitlab-ci/documentation.yml
   - local: /gitlab-ci/renovate.yml
-  - local: /gitlab-ci/aws/cdk.yml
-  # - local: /gitlab-ci/aws/cloudformation.yml
-  #- local: /gitlab-ci/gcp/terraform.yml
+  - local: /gitlab-ci/aws/dev.yml
+  - local: /gitlab-ci/aws/app.yml
 
 .Pytest:
   image: python:3.8

awscdk/app.py

@@ -13,8 +13,8 @@
 # if the the production environent subdomain should nott be included in the URL
 # redefine `full_domain_name` to `base_domain_name` for that environment
 full_domain_name = f"{environment_name}.{base_domain_name}"  # dev.mysite.com
-# if environment_name == "prod":
-#     full_domain_name = base_domain_name
+if environment_name == "app":
+    full_domain_name = base_domain_name
 base_app_name = os.environ.get("APP_NAME", "mysite-com")
 full_app_name = f"{environment_name}-{base_app_name}"  # dev-mysite-com
 aws_region = os.environ.get("AWS_DEFAULT_REGION", "us-east-1")