darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix egress proxy deploy
This commit is contained in:
Ryan Ahearn
2022-11-09 10:52:08 -05:00
committed by GitHub
parent 72df1a18fd b54fa67f13
commit 929b641e2f
6 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/actions/deploy-proxy/action.yml vendored
View File

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

1
deploy-config/egress_proxy/notify-api-staging.deploy.acl Normal file
View File

@@ -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

14
terraform/demo/main.tf
View File

@@ -53,3 +53,17 @@ module "contact_list_bucket" {
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" 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"
]
}

12
terraform/production/main.tf
View File

@@ -54,6 +54,18 @@ module "contact_list_bucket" {
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" 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` # The following lines need to be commented out for the initial `terraform apply`
# It can be re-enabled after: # It can be re-enabled after:

3
terraform/sandbox/main.tf
View File

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

4
terraform/staging/main.tf
View File

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