Merge pull request #114 from GSA/fix-egress-proxy-deploy

Fix egress proxy deploy

.github/actions/deploy-proxy/action.yml

@@ -26,8 +26,9 @@ runs:
     - name: Copy config files
       shell: bash
       run: cp ./deploy-config/egress_proxy/${{ inputs.app }}.*.acl ${{ steps.create-temp-dir.outputs.path }}
-    - name: Deploy proxy
+    - name: Build and deploy proxy
       shell: bash
       run: >
         cd ${{ steps.create-temp-dir.outputs.path }};
+        make;
         ./bin/cf-deployproxy -a ${{ inputs.app }} -p egress-proxy -e egress_proxy

deploy-config/egress_proxy/notify-api-staging.deploy.acl

@@ -0,0 +1 @@
+Update this file to force a re-deploy of the egress proxy even when notify-api-staging.<allow|deny>.acl haven't changed

terraform/demo/main.tf

@@ -53,3 +53,17 @@ module "contact_list_bucket" {
   recursive_delete = local.recursive_delete
   s3_service_name  = "${local.app_name}-contact-list-bucket-${local.env}"
 }
+
+module "egress-space" {
+  source = "../shared/egress_space"
+
+  cf_user                  = var.cf_user
+  cf_password              = var.cf_password
+  cf_org_name              = local.cf_org_name
+  cf_restricted_space_name = local.cf_space_name
+  deployers = [
+    var.cf_user,
+    "ryan.ahearn@gsa.gov",
+    "steven.reilly@gsa.gov"
+  ]
+}

terraform/production/main.tf

@@ -54,6 +54,18 @@ module "contact_list_bucket" {
   s3_service_name  = "${local.app_name}-contact-list-bucket-${local.env}"
 }
 
+module "egress-space" {
+  source = "../shared/egress_space"
+
+  cf_user                  = var.cf_user
+  cf_password              = var.cf_password
+  cf_org_name              = local.cf_org_name
+  cf_restricted_space_name = local.cf_space_name
+  deployers = [
+    var.cf_user
+  ]
+}
+
 ###########################################################################
 # The following lines need to be commented out for the initial `terraform apply`
 # It can be re-enabled after:

terraform/sandbox/main.tf

@@ -63,6 +63,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "ryan.ahearn@gsa.gov"
+    "ryan.ahearn@gsa.gov",
+    "steven.reilly@gsa.gov"
   ]
 }

terraform/staging/main.tf

@@ -62,6 +62,8 @@ module "egress-space" {
   cf_org_name              = local.cf_org_name
   cf_restricted_space_name = local.cf_space_name
   deployers = [
-    var.cf_user
+    var.cf_user,
+    "ryan.ahearn@gsa.gov",
+    "steven.reilly@gsa.gov"
   ]
 }