rename to studio; properly handle if/else cases for user, pass, dbname env vars

Author: gskifstad

dbt/profiles.yml

@@ -96,7 +96,7 @@ civis-studio:
 #        "type": "string",
 #        "value": "my_dbt_schema"
 #    }, {
-#        "name": "code_cloud_redshift_prefix",
+#        "name": "studio_redshift_prefix",
 #        "description": null,
 #        "type": "string",
 #        "value": "civis_consumers" // matches the parameter name for the redshift database
@@ -106,7 +106,7 @@ civis-studio:
 #        "type": "database",
 #        "value": "{\"credential\":333,\"database\":999}"
 #    }, {
-#        "name": "code_cloud_bigquery_prefix",
+#        "name": "studio_bigquery_prefix",
 #        "description": null,
 #        "type": "string",
 #        "value": "civis_international_consumers" // matches the parameter name for the BQ database
@@ -119,18 +119,18 @@ studio-or-dbt-script:
   outputs:
     # Works for redshift or postgres
     redshift_adapter:
-      type: "{{ env_var(env_var('CODE_CLOUD_REDSHIFT_PREFIX', 'DATABASE') ~ '_TYPE') }}"
-      host: "{{ env_var(env_var('CODE_CLOUD_REDSHIFT_PREFIX', 'DATABASE') ~ '_HOST') }}"
-      port: "{{ env_var(env_var('CODE_CLOUD_REDSHIFT_PREFIX', 'DATABASE') ~ '_PORT') | as_number }}"
-      user: "{{ env_var(env_var('CODE_CLOUD_REDSHIFT_PREFIX', '') ~ '_CREDENTIAL_USERNAME', 'DATABASE_USERNAME') }}"
-      pass: "{{ env_var('DBT_ENV_SECRET_' ~ env_var('CODE_CLOUD_REDSHIFT_PREFIX', '') ~ '_CREDENTIAL_PASSWORD', 'DBT_ENV_SECRET_DATABASE_PASSWORD') }}"
-      dbname: "{{ env_var(env_var('CODE_CLOUD_REDSHIFT_PREFIX', '') ~ '_DATABASE', 'DATABASE_NAME') }}"
+      type: "{{ env_var(env_var('STUDIO_REDSHIFT_PREFIX', 'DATABASE') ~ '_TYPE') }}"
+      host: "{{ env_var(env_var('STUDIO_REDSHIFT_PREFIX', 'DATABASE') ~ '_HOST') }}"
+      port: "{{ env_var(env_var('STUDIO_REDSHIFT_PREFIX', 'DATABASE') ~ '_PORT') | as_number }}"
+      user: "{% if env_var('STUDIO_REDSHIFT_PREFIX', '') %}{{ env_var(env_var('STUDIO_REDSHIFT_PREFIX') ~ '_CREDENTIAL_USERNAME') }}{% else %}{{ env_var('DATABASE_USERNAME') }}{% endif %}"
+      pass: "{% if env_var('STUDIO_REDSHIFT_PREFIX', '') %}{{ env_var('DBT_ENV_SECRET_' ~ env_var('STUDIO_REDSHIFT_PREFIX') ~ '_CREDENTIAL_PASSWORD') }}{% else %}{{ env_var('DBT_ENV_SECRET_DATABASE_PASSWORD') }}{% endif %}"
+      dbname: "{% if env_var('STUDIO_REDSHIFT_PREFIX', '') %}{{ env_var(env_var('STUDIO_REDSHIFT_PREFIX') ~ '_DATABASE') }}{% else %}{{ env_var('DATABASE_NAME') }}{% endif %}"
       schema: "{{ env_var('DBT_SCHEMA') }}"
       threads: 4
 
     # TODO
     bigquery_service_account_adapter:
-      type: "{{ env_var(env_var('CODE_CLOUD_BIGQUERY_PREFIX', 'DATABASE') ~ '_TYPE') }}"
+      type: "{{ env_var(env_var('STUDIO_BIGQUERY_PREFIX', 'DATABASE') ~ '_TYPE') }}"
       method: "{{ env_var('GCP_AUTH_METHOD') }}"
       project: "{{ env_var('GCP_PROJECT_ID') }}"
       schema: "{{ env_var('DBT_SCHEMA') }}"
@@ -139,7 +139,7 @@ studio-or-dbt-script:
 
     bigquery_oauth_adapter:
       threads: 4
-      type: "{{ env_var(env_var('CODE_CLOUD_BIGQUERY_PREFIX', 'DATABASE') ~ '_TYPE') }}"
+      type: "{{ env_var(env_var('STUDIO_BIGQUERY_PREFIX', 'DATABASE') ~ '_TYPE') }}"
       method: "{{ env_var('GCP_AUTH_METHOD') }}"
       project: "{{ env_var('GCP_PROJECT_ID') }}"
       schema: "{{ env_var('DBT_SCHEMA') }}"