From eaeffb1c69a26490013e35c0a29ffcc302804130 Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 15 Feb 2024 17:21:30 -0500 Subject: [PATCH] Remove and rename admin writeable vars (#288) --- cloud/azure/templates/azure_saml_ses/main.tf | 6 +----- .../templates/azure_saml_ses/variables.tf | 20 ------------------- .../dev_azure/civiform_config.example.sh | 5 +---- e2e-test/civiform_config_aws_oidc.sh | 6 +++--- 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/cloud/azure/templates/azure_saml_ses/main.tf b/cloud/azure/templates/azure_saml_ses/main.tf index 992bfbd6..3228f2c7 100644 --- a/cloud/azure/templates/azure_saml_ses/main.tf +++ b/cloud/azure/templates/azure_saml_ses/main.tf @@ -39,11 +39,7 @@ module "app" { civiform_time_zone_id = var.civiform_time_zone_id - civic_entity_short_name = var.civic_entity_short_name - civic_entity_full_name = var.civic_entity_full_name - civic_entity_support_email_address = var.civic_entity_support_email_address - civic_entity_logo_with_name_url = var.civic_entity_logo_with_name_url - civic_entity_small_logo_url = var.civic_entity_small_logo_url + civic_entity_small_logo_url = var.civic_entity_small_logo_url adfs_admin_group = var.adfs_admin_group diff --git a/cloud/azure/templates/azure_saml_ses/variables.tf b/cloud/azure/templates/azure_saml_ses/variables.tf index 0a61a8f7..87529b89 100644 --- a/cloud/azure/templates/azure_saml_ses/variables.tf +++ b/cloud/azure/templates/azure_saml_ses/variables.tf @@ -15,26 +15,6 @@ variable "civiform_time_zone_id" { default = "America/Los_Angeles" } -variable "civic_entity_short_name" { - type = string - description = "Short name for civic entity (example: Rochester, Seattle)." -} - -variable "civic_entity_full_name" { - type = string - description = "Full name for civic entity (example: City of Rochester, City of Seattle)." -} - -variable "civic_entity_support_email_address" { - type = string - description = "Email address where applicants can contact civic entity for support with Civiform." -} - -variable "civic_entity_logo_with_name_url" { - type = string - description = "Logo with name used on the applicant-facing program index page" -} - variable "civic_entity_small_logo_url" { type = string description = "Logo with name used on the applicant-facing program index page" diff --git a/cloud/deploys/dev_azure/civiform_config.example.sh b/cloud/deploys/dev_azure/civiform_config.example.sh index ef2e47a0..27506143 100644 --- a/cloud/deploys/dev_azure/civiform_config.example.sh +++ b/cloud/deploys/dev_azure/civiform_config.example.sh @@ -4,10 +4,7 @@ # https://docs.civiform.us/contributor-guide/developer-guide/dev-azure export CIVIFORM_CLOUD_PROVIDER="azure" export CIVIFORM_MODE="dev" -export CIVIC_ENTITY_SHORT_NAME="Sooschester" -export CIVIC_ENTITY_FULL_NAME="City of Sooschester" -export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform-azure-staging-email@googlegroups.com" -export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://www.cityofrochester.gov/images/header-logo.png" +export SUPPORT_EMAIL_ADDRESS="civiform-azure-staging-email@googlegroups.com" export CIVIC_ENTITY_SMALL_LOGO_URL="https://www.cityofrochester.gov/assets/0/117/8589934986/c6791498-270e-40b1-9b81-aca8a510c1b5.jpg" export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" export EMAIL_SENDER="ses" diff --git a/e2e-test/civiform_config_aws_oidc.sh b/e2e-test/civiform_config_aws_oidc.sh index bf25b72a..4cde2b18 100644 --- a/e2e-test/civiform_config_aws_oidc.sh +++ b/e2e-test/civiform_config_aws_oidc.sh @@ -56,15 +56,15 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # REQUIRED # The short name for the civic entity. Ex. "Rochester" -export CIVIC_ENTITY_SHORT_NAME="E2E" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="E2E" # REQUIRED # The full name for the civic entity. Ex. "City of Rochester" -export CIVIC_ENTITY_FULL_NAME="E2E Test City" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="E2E Test City" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform-deploy-e2e-tests@exygy.com" +export SUPPORT_EMAIL_ADDRESS="civiform-deploy-e2e-tests@exygy.com" # REQUIRED # A link to an image of the civic entity logo that includes the entity name, to be used in the header for the "Get Benefits" page