From bc650f21fe64a8b85efa9524982e00d5f2718ece Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 25 Aug 2023 12:16:57 -0400 Subject: [PATCH] Update cloud.gov org references This changeset adjusts our references to the cloud.gov org we are using from gsa-tts-benefits-studio-prototyping to gsa-tts-benefits-studio. Signed-off-by: Carlo Costino --- .github/workflows/deploy-demo.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/restage-apps.yml | 4 ++-- terraform/bootstrap/main.tf | 2 +- terraform/create_service_account.sh | 2 +- terraform/demo/main.tf | 2 +- terraform/destroy_service_account.sh | 2 +- terraform/development/main.tf | 2 +- terraform/development/reset.sh | 2 +- terraform/development/run.sh | 2 +- terraform/ops/cloudgov_user_report.py | 2 +- terraform/production/main.tf | 4 ++-- terraform/sandbox/main.tf | 2 +- terraform/set_space_egress.sh | 2 +- terraform/staging/main.tf | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 0a3aefca1..d08e62dc5 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -58,7 +58,7 @@ jobs: with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - cf_org: gsa-tts-benefits-studio-prototyping + cf_org: gsa-tts-benefits-studio cf_space: notify-demo push_arguments: >- --vars-file deploy-config/demo.yml diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 288064a77..493176fdd 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -62,7 +62,7 @@ jobs: with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - cf_org: gsa-tts-benefits-studio-prototyping + cf_org: gsa-tts-benefits-studio cf_space: notify-production push_arguments: >- --vars-file deploy-config/production.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eb6a2a709..53b40bfca 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - cf_org: gsa-tts-benefits-studio-prototyping + cf_org: gsa-tts-benefits-studio cf_space: notify-staging push_arguments: >- --vars-file deploy-config/staging.yml diff --git a/.github/workflows/restage-apps.yml b/.github/workflows/restage-apps.yml index 35e962c9d..abdadcfe0 100644 --- a/.github/workflows/restage-apps.yml +++ b/.github/workflows/restage-apps.yml @@ -23,7 +23,7 @@ jobs: with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - cf_org: gsa-tts-benefits-studio-prototyping + cf_org: gsa-tts-benefits-studio cf_space: notify-${{ inputs.environment }} full_command: "cf restage --strategy rolling notify-${{matrix.app}}-${{inputs.environment}}" - name: Restage ${{matrix.app}} egress @@ -31,6 +31,6 @@ jobs: with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - cf_org: gsa-tts-benefits-studio-prototyping + cf_org: gsa-tts-benefits-studio cf_space: notify-${{ inputs.environment }}-egress full_command: "cf restage --strategy rolling egress-proxy-notify-${{matrix.app}}-${{inputs.environment}}" diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf index 298f6ceba..5f30791c6 100644 --- a/terraform/bootstrap/main.tf +++ b/terraform/bootstrap/main.tf @@ -5,7 +5,7 @@ locals { module "s3" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.3.0" - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-management" name = local.s3_service_name } diff --git a/terraform/create_service_account.sh b/terraform/create_service_account.sh index b4c44e705..44c5e2a23 100755 --- a/terraform/create_service_account.sh +++ b/terraform/create_service_account.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -org="gsa-tts-benefits-studio-prototyping" +org="gsa-tts-benefits-studio" usage=" $0: Create a Service User Account for a given space diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index 36bedc64f..b1224bb4e 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -1,5 +1,5 @@ locals { - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-demo" env = "demo" app_name = "notify-api" diff --git a/terraform/destroy_service_account.sh b/terraform/destroy_service_account.sh index e8db20474..9a4c250ad 100755 --- a/terraform/destroy_service_account.sh +++ b/terraform/destroy_service_account.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -org="gsa-tts-benefits-studio-prototyping" +org="gsa-tts-benefits-studio" usage=" $0: Destroy a Service User Account in a given space diff --git a/terraform/development/main.tf b/terraform/development/main.tf index 5ccf76003..4dd7d741c 100644 --- a/terraform/development/main.tf +++ b/terraform/development/main.tf @@ -1,5 +1,5 @@ locals { - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-local-dev" recursive_delete = true key_name = "${var.username}-api-dev-key" diff --git a/terraform/development/reset.sh b/terraform/development/reset.sh index 4e11c0e28..fba5f104b 100755 --- a/terraform/development/reset.sh +++ b/terraform/development/reset.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash username=`whoami` -org="gsa-tts-benefits-studio-prototyping" +org="gsa-tts-benefits-studio" usage=" $0: Reset terraform state so run.sh can be run again or for a new username diff --git a/terraform/development/run.sh b/terraform/development/run.sh index c0297b2bb..4fe145002 100755 --- a/terraform/development/run.sh +++ b/terraform/development/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash username=`whoami` -org="gsa-tts-benefits-studio-prototyping" +org="gsa-tts-benefits-studio" usage=" $0: Create development infrastructure diff --git a/terraform/ops/cloudgov_user_report.py b/terraform/ops/cloudgov_user_report.py index 7a26fe28c..bb0a61bd3 100644 --- a/terraform/ops/cloudgov_user_report.py +++ b/terraform/ops/cloudgov_user_report.py @@ -2,7 +2,7 @@ from subprocess import check_output from cloudfoundry_client.client import CloudFoundryClient -ORG_NAME = "gsa-tts-benefits-studio-prototyping" +ORG_NAME = "gsa-tts-benefits-studio" client = CloudFoundryClient.build_from_cf_config() diff --git a/terraform/production/main.tf b/terraform/production/main.tf index 574ae0741..7476338d2 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -1,5 +1,5 @@ locals { - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-production" env = "production" app_name = "notify-api" @@ -75,7 +75,7 @@ module "sns_sms" { # TODO: decide on public API domain name # 1) the app has first been deployed # 2) the route has been manually created by an OrgManager: -# `cf create-domain gsa-tts-benefits-studio-prototyping api.notify.gov` +# `cf create-domain gsa-tts-benefits-studio api.notify.gov` ########################################################################### # module "domain" { # source = "github.com/18f/terraform-cloudgov//domain?ref=v0.2.0" diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 81ec0c263..adc2ff18a 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -1,5 +1,5 @@ locals { - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-sandbox" env = "sandbox" app_name = "notify-api" diff --git a/terraform/set_space_egress.sh b/terraform/set_space_egress.sh index e3893e809..ee2b6b397 100755 --- a/terraform/set_space_egress.sh +++ b/terraform/set_space_egress.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -org="gsa-tts-benefits-studio-prototyping" +org="gsa-tts-benefits-studio" usage=" $0: Set egress rules for given space diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 936ee210a..1ebbee652 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -1,5 +1,5 @@ locals { - cf_org_name = "gsa-tts-benefits-studio-prototyping" + cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-staging" env = "staging" app_name = "notify-api"