Update circleci to default to same ci deployer for staging and prod

GSA-TTS · Jan 7, 2025 · 5f40f02 · 5f40f02
1 parent 3ba4f01
commit 5f40f02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/generators/rails_template18f/circleci/circleci_generator.rb b/lib/generators/rails_template18f/circleci/circleci_generator.rb
@@ -89,8 +89,8 @@ def readme_staging_deploy
 
             | Secret Name | Description |
             | ----------- | ----------- |
-            | `CF_STAGING_USERNAME` | cloud.gov SpaceDeployer username |
-            | `CF_STAGING_PASSWORD` | cloud.gov SpaceDeployer password |
+            | `CF_USERNAME` | cloud.gov SpaceDeployer username |
+            | `CF_PASSWORD` | cloud.gov SpaceDeployer password |
             | `RAILS_MASTER_KEY` | `config/master.key` |
             #{terraform_secret_values}
           EOM
@@ -107,8 +107,8 @@ def readme_prod_deploy
 
               | Secret Name | Description |
               | ----------- | ----------- |
-              | `CF_PRODUCTION_USERNAME` | cloud.gov SpaceDeployer username |
-              | `CF_PRODUCTION_PASSWORD` | cloud.gov SpaceDeployer password |
+              | `CF_USERNAME` | cloud.gov SpaceDeployer username, if different value than staging, update name in .circleci/config.yml |
+              | `CF_PASSWORD` | cloud.gov SpaceDeployer password, if different value than staging, update name in .circleci/config.yml |
               | `PRODUCTION_RAILS_MASTER_KEY` | `config/credentials/production.key` |
               #{terraform_secret_values}
             EOM

diff --git a/lib/generators/rails_template18f/circleci/templates/circleci/config.yml.tt b/lib/generators/rails_template18f/circleci/templates/circleci/config.yml.tt
@@ -319,8 +319,8 @@ jobs:
           var_file: staging.tfvars
           var: >-
             rails_master_key="$RAILS_MASTER_KEY",
-            cf_user="$CF_STAGING_USERNAME",
-            cf_password="$CF_STAGING_PASSWORD"
+            cf_user="$CF_USERNAME",
+            cf_password="$CF_PASSWORD"
       - persist_to_workspace:
           root: .
           paths:
@@ -363,8 +363,8 @@ jobs:
           var_file: production.tfvars
           var: >-
             rails_master_key="$PRODUCTION_RAILS_MASTER_KEY",
-            cf_user="$CF_PRODUCTION_USERNAME",
-            cf_password="$CF_PRODUCTION_PASSWORD"
+            cf_user="$CF_USERNAME",
+            cf_password="$CF_PASSWORD"
       - persist_to_workspace:
           root: .
           paths: