From 2ace8d976d97caa09f89b948fee9961ab5b3e38e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 25 Apr 2023 09:23:50 -0700 Subject: [PATCH 001/291] Adding logos --- logos/long-logo.png | Bin 0 -> 11821 bytes logos/small-logo.png | Bin 0 -> 30307 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 logos/long-logo.png create mode 100644 logos/small-logo.png diff --git a/logos/long-logo.png b/logos/long-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c977439246719e324a95b7f4d7c1cd8e992f7886 GIT binary patch literal 11821 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 literal 0 HcmV?d00001 diff --git a/logos/small-logo.png b/logos/small-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8b29bea9310d0528a2de89d803fce62bb29b2109 GIT binary patch literal 30307 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

k@5Tmor0pYnE>*x?-4y!80K4i0 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 literal 0 HcmV?d00001 From 14ea09b0559e432e43e898665c1dd95e0760e9e0 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 25 Apr 2023 09:27:56 -0700 Subject: [PATCH 002/291] Rename logo files --- logos/{long-logo.png => civiform-long-logo.png} | Bin logos/{small-logo.png => civiform-small-logo.png} | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename logos/{long-logo.png => civiform-long-logo.png} (100%) rename logos/{small-logo.png => civiform-small-logo.png} (100%) diff --git a/logos/long-logo.png b/logos/civiform-long-logo.png similarity index 100% rename from logos/long-logo.png rename to logos/civiform-long-logo.png diff --git a/logos/small-logo.png b/logos/civiform-small-logo.png similarity index 100% rename from logos/small-logo.png rename to logos/civiform-small-logo.png From e201301d11c34516bb31d8cb83ecca91ef5000ae Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 25 Apr 2023 14:16:45 -0700 Subject: [PATCH 003/291] Removing civiform_config.sh from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b384efb..3dd43bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -civiform_config.sh .DS_Store .idea *.log From 656baa97b15688c622f03ae32086b4f6d299ce9a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 25 Apr 2023 17:34:36 -0700 Subject: [PATCH 004/291] Initial add of new test environment config settings --- civiform_config.sh | 289 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 civiform_config.sh diff --git a/civiform_config.sh b/civiform_config.sh new file mode 100644 index 0000000..508cc14 --- /dev/null +++ b/civiform_config.sh @@ -0,0 +1,289 @@ +#! /usr/bin/env bash + +# CiviForm deployment configuration file. +# +# Copy this file to civiform_config.sh in the same directory and edit the copy. +# +# cp civiform_config.example.sh civiform_config.sh +# +# Configuration variables must be specified in SCREAMING_SNAKE_CASE with the +# "export" keyword preceding them. If the value contains whitespace it must be +# surrounded by quotes. There should be no spaces before or after the equals sign. + +################################################# +# Global variables for all CiviForm deployments +################################################# + +# REQUIRED +# One of prod, staging, or dev. +export CIVIFORM_MODE="staging" + +# REQUIRED +# CiviForm server version to deploy. +# +# For dev and staging civiform modes, can be "latest". For prod, must be a version from +# https://github.com/civiform/civiform/releases, for example "v1.2.3". +export CIVIFORM_VERSION="latest" + +# REQUIRED +# Version of the infrastructure to use. +# Needs to be either: +# - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true +# - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false +# - "latest" to use latest version of either docker image or code from the repo, +# depending on USE_DOCKER flag. +# +# Using "latest" is recommended. +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" + +# Terraform configuration +################################################# + +# REQUIRED +# A supported CiviForm cloud provider, lower case. +# "aws" or "azure" +export CIVIFORM_CLOUD_PROVIDER="aws" + + +# REQUIRED +# The template directory for this deployment. +# For aws, use "cloud/aws/templates/aws_oidc" +# For azure, use "cloud/azure/templates/azure_saml_ses" +export TERRAFORM_TEMPLATE_DIR="cloud/aws/templates/aws_oidc" + +# REQUIRED +# The docker repository name for retrieving server images. +export DOCKER_REPOSITORY_NAME="civiform" + +# REQUIRED +# The docker user name for retrieving server images. +export DOCKER_USERNAME="civiform" + +# REQUIRED +# The authentication protocal used for applicant and trusted intermediary accounts. +# Supported values: "oidc", "saml" +export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" + + + +# Deployment-specific Civiform configuration +################################################# + +# REQUIRED +# The short name for the civic entity. Ex. "Rochester" +export CIVIC_ENTITY_SHORT_NAME="Seattle" + +# REQUIRED +# The full name for the civic entity. Ex. "City of Rochester" +export CIVIC_ENTITY_FULL_NAME="City of Seattle" + +# REQUIRED +# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov +export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +# 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 +export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" + +# REQUIRED +# A link to an image of the civic entity logo, to be used on the login page +export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" + +# OPTIONAL +# A link to an 16x16 of 32x32 pixel favicon of the civic entity, +# in format .ico, .png, or .gif. +export FAVICON_URL="https://seattle.gov/favicon.ico" + +# REQUIRED +# The email address to use for the "from" field in emails sent from CiviForm. +export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the program administrator's email, as would happen in prod. +export STAGING_PROGRAM_ADMIN_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the trusted intermediary's email, as would happen in prod. +export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the applicant's email, as would happen in prod. +export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The domain name for this CiviForm deployment, including the protocol. +# E.g. "https://civiform.seattle.gov" +export BASE_URL="https://civiformtest.seattle.gov" + +# OPTIONAL +# When set enables demo mode for the civiform application. Should be set for +# staging but not prod. The value is hostname without protocol and should correspond +# BASE_URl. Example: "civiform.seattle.gov" +export STAGING_HOSTNAME="civiformtest.seattle.gov" + +# OPTIONAL +# The time zone to be used when rendering any times within the CiviForm +# UI. A list of valid time zone identifiers can be found at: +# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" + +# OPTIONAL +# If enabled, allows exporting Prometheus server metrics over HTTP at "/metrics" +# Defaults to false. +export CIVIFORM_SERVER_METRICS_ENABLED=true + + + + +######################################################################### +# Template variables for AWS. Skip if deploying to other cloud providers. +######################################################################### + +# REQUIRED +# AWS region where civiform server and supporting infra will be deployed. +# Unofficial list of available regions: https://gist.github.com/colinvh/14e4b7fb6b66c29f79d3 +export AWS_REGION="us-west-2" + +# REQUIRED +# The name to prefix all resources with. +export APP_PREFIX="civiform-test-" # max 19 chars, only numbers, letters, dashes, and underscores + +# REQUIRED +# ARN of the SSL certificate that will be used to handle HTTPS traffic. The certiciate +# should be created and validated before the deployment is done. Certificate can be created +# in AWS web console: https://console.aws.amazon.com/acm/home#/certificates/list +# WARNING: certificate needs to be created in the same region as AWS_REGION above, make sure +# select correct region in web AWS console when creating certificate. +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" + +# RERUIRED +# Number of Civiform server tasks to run. This value can be set to 0 to shutdown servers. +# It can be useful, for example, when server continiously fails on startup: set this to 0 +# to shutdown servers while figuring out the error. +export FARGATE_DESIRED_TASK_COUNT=2 + + + +# generic-oidc Auth configuration +################################################# + +# REQUIRED +# Which auth provider to use for applicants to login. +# If set to a non-disabled value, you must configure the respective auth parameters +export CIVIFORM_APPLICANT_IDP="idcs" + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The name of the OIDC provider. Must be URL-safe. +# Gets appended to the auth callback URL. +export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The discovery metadata URI provideded by the OIDC provider. +# Usually ends in .well-known/openid-configuration +export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" + +# OPTIONAL +# The type of OIDC flow to execute, and how the data is encoded. +# See https://auth0.com/docs/authenticate/protocols/oauth#authorization-endpoint +export APPLICANT_OIDC_RESPONSE_MODE="form_post" +export APPLICANT_OIDC_RESPONSE_TYPE="id_token token" + +# OPTIONAL +# Any additional claims to request, in addition to the default scopes "openid profile email" +export APPLICANT_OIDC_ADDITIONAL_SCOPES="" + +# OPTIONAL +# If your OIDC provider provides the user's language preference, +# provide the profile field it's returned in. +export APPLICANT_OIDC_LOCALE_ATTRIBUTE="" + +# OPTIONAL +# The name of the profile field where the user's email is stored. +# Defaults to "email" +export APPLICANT_OIDC_EMAIL_ATTRIBUTE="email" + +# OPTIONAL +# The name of the profile field where the user's name is stored. +# If there is only one name field(the display name) use APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE. +# If the name is split into multiple fields, use the APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE +# and APPLICANT_OIDC_LAST_NAME_ATTRIBUTE as necessary. +export APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE="name" +export APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE="" +export APPLICANT_OIDC_LAST_NAME_ATTRIBUTE="" + +# REQUIRED +export APPLICANT_REGISTER_URI="https://qalogin.seattle.gov:12443/#/registration?appName=CIVIFORM_STAGE" +export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://qalogin.seattle.gov:12443/#/logout?appName=CIVIFORM_STAGE" +export APPLICANT_OIDC_POST_LOGOUT_REDIRECT_PARAM="" +export APPLICANT_OIDC_PROVIDER_LOGOUT=true + + +# ADFS and Azure AD configuration +# More information on https://docs.civiform.us/contributor-guide/developer-guide/authentication-providers +######################################################################################################### + +# REQUIRED +# The discovery metadata URI provideded by the ADFS provider. +# Usually ends in .well-known/openid-configuration +export ADFS_DISCOVERY_URI="https://sts.seattle.gov/adfs/.well-known/openid-configuration" + +# OPTIONAL +# Should be set to "allatclaims" for ADFS and empty value for Azure AD. +export ADFS_ADDITIONAL_SCOPES="allatclaims" + +# OPTIONAL +# Should be set to "group" for ADFS and "groups" for Azure AD. +export AD_GROUPS_ATTRIBUTE_NAME="group" + +# OPTIONAL +# The ADFS group name for specifying CiviForm admins. If using Azure AD this is +# the group's object ID +export ADFS_ADMIN_GROUP="ad\ITD_CiviForm_Admins_Test" + + + +################################################# +# Additional settings +################################################# + +# API +export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false + +# Evolutions +export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true + +# Analytics +export MEASUREMENT_ID="G-HXM0Y35TGE" + +# ESRI +export ESRI_ADDRESS_CORRECTION_ENABLED=true +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS.0="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS.0="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS.0="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES.0="CITYNAME" + +# Allow Feature Flags +export FEATURE_FLAG_OVERRIDES_ENABLED=true + +# Feature Flags +export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true +export CIVIFORM_APPLICATION_STATUS_TRACKING_ENABLED=true +export PREDICATES_MULTIPLE_QUESTIONS_ENABLED=true +export PROGRAM_ELIGIBILITY_CONDITIONS_ENABLED=true +export CIVIFORM_ADMIN_REPORTING_UI_ENABLED=true + +# Common Intake +export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" +export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" + +# Email +export SES_SENDER_EMAIL="civiform.staging@seattle.gov" +export AWS_SES_SENDER="civiform.staging@seattle.gov" From 984608eec8d0ef554062582a7215da2ba23f6677 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 25 Apr 2023 17:45:48 -0700 Subject: [PATCH 005/291] Updating findaddresscandidates url --- civiform_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.sh b/civiform_config.sh index 508cc14..50c6f4c 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -263,7 +263,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS.0="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS.0="Seattle" From 67e376343d46a0559e1f25a5ae9552a20f07ebac Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 26 Apr 2023 14:22:37 -0700 Subject: [PATCH 006/291] Tweaks for deployment tool --- civiform_config.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index 50c6f4c..975101a 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -152,7 +152,7 @@ export AWS_REGION="us-west-2" # REQUIRED # The name to prefix all resources with. -export APP_PREFIX="civiform-test-" # max 19 chars, only numbers, letters, dashes, and underscores +export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and underscores # REQUIRED # ARN of the SSL certificate that will be used to handle HTTPS traffic. The certiciate @@ -244,7 +244,7 @@ export AD_GROUPS_ATTRIBUTE_NAME="group" # OPTIONAL # The ADFS group name for specifying CiviForm admins. If using Azure AD this is # the group's object ID -export ADFS_ADMIN_GROUP="ad\ITD_CiviForm_Admins_Test" +export ADFS_ADMIN_GROUP="ad\\ITD_CiviForm_Admins_Test" @@ -265,10 +265,10 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS.0="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS.0="Seattle" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS.0="Seattle" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES.0="CITYNAME" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS=("https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query") +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS=("Seattle") +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS=("Seattle") +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES=("CITYNAME") # Allow Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true From 6c796534eefcfbaf31ae52f6d96099d65121ed07 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 28 Apr 2023 10:44:50 -0700 Subject: [PATCH 007/291] Adding whitespace around logo --- logos/civiform-small-logo.png | Bin 30307 -> 29599 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logos/civiform-small-logo.png b/logos/civiform-small-logo.png index 8b29bea9310d0528a2de89d803fce62bb29b2109..785a107ea3389254e1c4bc37008fb0e13b29bc76 100644 GIT binary patch delta 26323 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 Date: Wed, 14 Jun 2023 14:10:15 -0700 Subject: [PATCH 008/291] Create run-probers-only.yml --- .github/workflows/run-probers-only.yml | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/run-probers-only.yml diff --git a/.github/workflows/run-probers-only.yml b/.github/workflows/run-probers-only.yml new file mode 100644 index 0000000..d583b44 --- /dev/null +++ b/.github/workflows/run-probers-only.yml @@ -0,0 +1,31 @@ +name: Run Probers Only + +on: + workflow_dispatch: {} + workflow_call: + +#permissions: read-all + +# Two probers running at once can break each other. +concurrency: + group: stagingenvironment + cancel-in-progress: true + +jobs: + run_prober: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Run Prober Tests + env: + BASE_URL: "https://civiformtest.seattle.gov" + TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} + TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} + uses: nick-fields/retry@v2 + with: + timeout_minutes: 70 + max_attempts: 1 + retry_wait_seconds: 15 + command: bin/run-prober From 450d18f1dec8a573ef16350c2187ef0f5438cda5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 14 Jun 2023 14:14:34 -0700 Subject: [PATCH 009/291] Adding prober script --- bin/run-prober | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 bin/run-prober diff --git a/bin/run-prober b/bin/run-prober new file mode 100755 index 0000000..e5f5bc1 --- /dev/null +++ b/bin/run-prober @@ -0,0 +1,31 @@ +#! /usr/bin/env bash + +# DOC: Run the browser test suite in Docker against the staging environment. + +# Shards allow splitting the run into multiple chunks +# See https://jestjs.io/docs/next/cli#--shard +SHARD_NUM="${1}" +SHARD_COMMAND="" + +if [[ -n "${SHARD_NUM}" ]]; then + SHARD_COMMAND=" -- --shard=${SHARD_NUM}" +fi + +docker pull civiform/civiform-browser-test:latest + +# Enable video recording on CI tests as it will be helpful to debug test +# failures. +export RECORD_VIDEO=1 + +docker run \ + -e BASE_URL="${BASE_URL}" \ + -e RECORD_VIDEO="${RECORD_VIDEO}" \ + -e TEST_USER_AUTH_STRATEGY="seattle-staging" \ + -e TEST_USER_LOGIN="${TEST_USER_LOGIN}" \ + -e TEST_USER_PASSWORD="${TEST_USER_PASSWORD}" \ + -e TEST_USER_DISPLAY_NAME="TEST, UATAPP" \ + -e TEST_CIVIC_ENTITY_SHORT_NAME="Seattle" \ + -e DISABLE_BROWSER_ERROR_WATCHER=true \ + -e DISABLE_SCREENSHOTS=false \ + civiform/civiform-browser-test:latest \ + -c "npm install && npm test ${SHARD_COMMAND}" From eb6cc69a0f769f825747236163cf7725beab5ebd Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 14 Jun 2023 14:14:49 -0700 Subject: [PATCH 010/291] Disable esri validation --- civiform_config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index 975101a..524f42c 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -264,11 +264,11 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS=("https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query") -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS=("Seattle") -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS=("Seattle") -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES=("CITYNAME") +#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true +#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS=("https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query") +#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS=("Seattle") +#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS=("Seattle") +#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES=("CITYNAME") # Allow Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true From 5c87b932825cbfcfbd2c5a0acbb5c4a36220dc00 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 14 Jun 2023 14:16:00 -0700 Subject: [PATCH 011/291] Disable video capture --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index e5f5bc1..3bd88dd 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -15,7 +15,7 @@ docker pull civiform/civiform-browser-test:latest # Enable video recording on CI tests as it will be helpful to debug test # failures. -export RECORD_VIDEO=1 +export RECORD_VIDEO=0 docker run \ -e BASE_URL="${BASE_URL}" \ From 9b395126e60e8fabaf7e8d4e67dac0b95cb97fb6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 29 Jun 2023 14:09:50 -0700 Subject: [PATCH 012/291] Updating settings for new test environment --- civiform_config.sh | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index 524f42c..b1e71d4 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -166,7 +166,7 @@ export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc920 # Number of Civiform server tasks to run. This value can be set to 0 to shutdown servers. # It can be useful, for example, when server continiously fails on startup: set this to 0 # to shutdown servers while figuring out the error. -export FARGATE_DESIRED_TASK_COUNT=2 +export FARGATE_DESIRED_TASK_COUNT=1 @@ -218,8 +218,8 @@ export APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE="" export APPLICANT_OIDC_LAST_NAME_ATTRIBUTE="" # REQUIRED -export APPLICANT_REGISTER_URI="https://qalogin.seattle.gov:12443/#/registration?appName=CIVIFORM_STAGE" -export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://qalogin.seattle.gov:12443/#/logout?appName=CIVIFORM_STAGE" +export APPLICANT_REGISTER_URI="https://qalogin.seattle.gov:12443/#/registration?appName=CIVIFORM_TEST" +export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://qalogin.seattle.gov:12443/#/logout?appName=CIVIFORM_TEST" export APPLICANT_OIDC_POST_LOGOUT_REDIRECT_PARAM="" export APPLICANT_OIDC_PROVIDER_LOGOUT=true @@ -231,20 +231,20 @@ export APPLICANT_OIDC_PROVIDER_LOGOUT=true # REQUIRED # The discovery metadata URI provideded by the ADFS provider. # Usually ends in .well-known/openid-configuration -export ADFS_DISCOVERY_URI="https://sts.seattle.gov/adfs/.well-known/openid-configuration" +export ADFS_DISCOVERY_URI="https://login.microsoftonline.com/78e61e45-6beb-4009-8f99-359d8b54f41b/v2.0/.well-known/openid-configuration" # OPTIONAL # Should be set to "allatclaims" for ADFS and empty value for Azure AD. -export ADFS_ADDITIONAL_SCOPES="allatclaims" +export ADFS_ADDITIONAL_SCOPES="" # OPTIONAL # Should be set to "group" for ADFS and "groups" for Azure AD. -export AD_GROUPS_ATTRIBUTE_NAME="group" +export AD_GROUPS_ATTRIBUTE_NAME="groups" # OPTIONAL # The ADFS group name for specifying CiviForm admins. If using Azure AD this is # the group's object ID -export ADFS_ADMIN_GROUP="ad\\ITD_CiviForm_Admins_Test" +export ADFS_ADMIN_GROUP="5909e7f3-3f4c-4ad1-93e8-17e6ba6ab8a3" @@ -264,11 +264,11 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" -#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true -#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS=("https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query") -#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS=("Seattle") -#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS=("Seattle") -#export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES=("CITYNAME") +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" # Allow Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true @@ -287,3 +287,11 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Email export SES_SENDER_EMAIL="civiform.staging@seattle.gov" export AWS_SES_SENDER="civiform.staging@seattle.gov" + +export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, lo, so, es-US, tl, vi" + +# Nonsense to delete in the future +export LOGIN_RADIUS_API_KEY="" +export LOGIN_RADIUS_METADATA_URI="" +export LOGIN_RADIUS_SAML_APP_NAME="" +export ADMIN_SETTINGS_PANEL_ENABLED=true From 9f1a5b4987ffa2a892c28c3a401a3e828f038719 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 30 Jun 2023 10:28:33 -0700 Subject: [PATCH 013/291] Cleaning up config.sh --- civiform_config.sh | 63 +++++++++++----------------------------------- 1 file changed, 15 insertions(+), 48 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index b1e71d4..b5fd6da 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -7,8 +7,8 @@ # cp civiform_config.example.sh civiform_config.sh # # Configuration variables must be specified in SCREAMING_SNAKE_CASE with the -# "export" keyword preceding them. If the value contains whitespace it must be -# surrounded by quotes. There should be no spaces before or after the equals sign. +# "export" keyword preceding them. All values must be quoted as strings. There +# should be no spaces before or after the equals sign. ################################################# # Global variables for all CiviForm deployments @@ -61,11 +61,8 @@ export DOCKER_USERNAME="civiform" # REQUIRED # The authentication protocal used for applicant and trusted intermediary accounts. -# Supported values: "oidc", "saml" export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" - - # Deployment-specific Civiform configuration ################################################# @@ -117,14 +114,9 @@ export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" # REQUIRED -# The domain name for this CiviForm deployment, including the protocol. +# The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" export BASE_URL="https://civiformtest.seattle.gov" - -# OPTIONAL -# When set enables demo mode for the civiform application. Should be set for -# staging but not prod. The value is hostname without protocol and should correspond -# BASE_URl. Example: "civiform.seattle.gov" export STAGING_HOSTNAME="civiformtest.seattle.gov" # OPTIONAL @@ -140,44 +132,28 @@ export CIVIFORM_SERVER_METRICS_ENABLED=true - -######################################################################### -# Template variables for AWS. Skip if deploying to other cloud providers. -######################################################################### +################################################# +# Template variables for: aws_oidc +################################################# # REQUIRED -# AWS region where civiform server and supporting infra will be deployed. -# Unofficial list of available regions: https://gist.github.com/colinvh/14e4b7fb6b66c29f79d3 export AWS_REGION="us-west-2" # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and underscores -# REQUIRED -# ARN of the SSL certificate that will be used to handle HTTPS traffic. The certiciate -# should be created and validated before the deployment is done. Certificate can be created -# in AWS web console: https://console.aws.amazon.com/acm/home#/certificates/list -# WARNING: certificate needs to be created in the same region as AWS_REGION above, make sure -# select correct region in web AWS console when creating certificate. export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" - -# RERUIRED -# Number of Civiform server tasks to run. This value can be set to 0 to shutdown servers. -# It can be useful, for example, when server continiously fails on startup: set this to 0 -# to shutdown servers while figuring out the error. export FARGATE_DESIRED_TASK_COUNT=1 - - -# generic-oidc Auth configuration -################################################# - # REQUIRED # Which auth provider to use for applicants to login. # If set to a non-disabled value, you must configure the respective auth parameters export CIVIFORM_APPLICANT_IDP="idcs" +# generic-oidc Auth configuration +################################################# + # REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" # The name of the OIDC provider. Must be URL-safe. # Gets appended to the auth callback URL. @@ -223,7 +199,6 @@ export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://qalogin.seattle.gov:12443/#/l export APPLICANT_OIDC_POST_LOGOUT_REDIRECT_PARAM="" export APPLICANT_OIDC_PROVIDER_LOGOUT=true - # ADFS and Azure AD configuration # More information on https://docs.civiform.us/contributor-guide/developer-guide/authentication-providers ######################################################################################################### @@ -246,8 +221,6 @@ export AD_GROUPS_ATTRIBUTE_NAME="groups" # the group's object ID export ADFS_ADMIN_GROUP="5909e7f3-3f4c-4ad1-93e8-17e6ba6ab8a3" - - ################################################# # Additional settings ################################################# @@ -270,28 +243,22 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" -# Allow Feature Flags -export FEATURE_FLAG_OVERRIDES_ENABLED=true - -# Feature Flags -export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export CIVIFORM_APPLICATION_STATUS_TRACKING_ENABLED=true -export PREDICATES_MULTIPLE_QUESTIONS_ENABLED=true -export PROGRAM_ELIGIBILITY_CONDITIONS_ENABLED=true -export CIVIFORM_ADMIN_REPORTING_UI_ENABLED=true - # Common Intake export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" # Email -export SES_SENDER_EMAIL="civiform.staging@seattle.gov" export AWS_SES_SENDER="civiform.staging@seattle.gov" export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, lo, so, es-US, tl, vi" +# Feature Flags +export FEATURE_FLAG_OVERRIDES_ENABLED=true +export ADMIN_SETTINGS_PANEL_ENABLED=true +export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true +export PHONE_QUESTION_TYPE_ENABLED=true + # Nonsense to delete in the future export LOGIN_RADIUS_API_KEY="" export LOGIN_RADIUS_METADATA_URI="" export LOGIN_RADIUS_SAML_APP_NAME="" -export ADMIN_SETTINGS_PANEL_ENABLED=true From 2754defd9af3019d3320a3fd1475e27f8eb533f1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 26 Jul 2023 10:11:55 -0700 Subject: [PATCH 014/291] Removing ADMIN_SETTINGS_PANEL_ENABLED --- civiform_config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/civiform_config.sh b/civiform_config.sh index b5fd6da..da35bd0 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -254,7 +254,6 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, lo, so, es-US, tl, vi # Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true -export ADMIN_SETTINGS_PANEL_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export PHONE_QUESTION_TYPE_ENABLED=true From 4be9acd5dd3627d8513d4ad49895af1648d8705b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 1 Aug 2023 09:01:15 -0700 Subject: [PATCH 015/291] Updating config to remove unneeded settings --- civiform_config.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index da35bd0..a36c906 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -250,14 +250,9 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Email export AWS_SES_SENDER="civiform.staging@seattle.gov" -export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, lo, so, es-US, tl, vi" +export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export PHONE_QUESTION_TYPE_ENABLED=true - -# Nonsense to delete in the future -export LOGIN_RADIUS_API_KEY="" -export LOGIN_RADIUS_METADATA_URI="" -export LOGIN_RADIUS_SAML_APP_NAME="" From 28c2070afd042dec7e86855979386b7844196a4f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 22 Aug 2023 12:08:17 -0700 Subject: [PATCH 016/291] Update civiform_config.sh Remove APPLICANT_OIDC_EMAIL_ATTRIBUTE --- civiform_config.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/civiform_config.sh b/civiform_config.sh index a36c906..499b60e 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -179,11 +179,6 @@ export APPLICANT_OIDC_ADDITIONAL_SCOPES="" # provide the profile field it's returned in. export APPLICANT_OIDC_LOCALE_ATTRIBUTE="" -# OPTIONAL -# The name of the profile field where the user's email is stored. -# Defaults to "email" -export APPLICANT_OIDC_EMAIL_ATTRIBUTE="email" - # OPTIONAL # The name of the profile field where the user's name is stored. # If there is only one name field(the display name) use APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE. From ae67c19cdeef93db985e96129d07c42e097f54f3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 22 Sep 2023 07:30:06 -0700 Subject: [PATCH 017/291] Updating env variables for: SENDER_EMAIL_ADDRESS, STAGING_ADD_NO_INDEX_META_TAG --- civiform_config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/civiform_config.sh b/civiform_config.sh index 499b60e..d1bbd37 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -113,6 +113,12 @@ export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" # sending it to the applicant's email, as would happen in prod. export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" +# OPTIONAL +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. +export STAGING_ADD_NOINDEX_META_TAG=true + # REQUIRED # The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" @@ -243,7 +249,7 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" # Email -export AWS_SES_SENDER="civiform.staging@seattle.gov" +export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" From 91b18c26ae5e8c569e4559dbae065ef2d5aeec36 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 22 Sep 2023 07:39:49 -0700 Subject: [PATCH 018/291] Adding applicant_portal_name env var --- civiform_config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/civiform_config.sh b/civiform_config.sh index d1bbd37..652db70 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -86,6 +86,9 @@ export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattl # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" +# OPTIONAL +export APPLICANT_PORTAL_NAME="Seattle" + # OPTIONAL # A link to an 16x16 of 32x32 pixel favicon of the civic entity, # in format .ico, .png, or .gif. From 828c61bdea7b33568054d518097f1b7305dc4c9c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 24 Oct 2023 11:44:59 -0700 Subject: [PATCH 019/291] Disable prometheus and graphana --- civiform_config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/civiform_config.sh b/civiform_config.sh index 652db70..758d32e 100644 --- a/civiform_config.sh +++ b/civiform_config.sh @@ -137,8 +137,10 @@ export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" # OPTIONAL # If enabled, allows exporting Prometheus server metrics over HTTP at "/metrics" # Defaults to false. -export CIVIFORM_SERVER_METRICS_ENABLED=true +export CIVIFORM_SERVER_METRICS_ENABLED=false +# Don't deploy of Prometheus and Graphana +export MONITORING_STACK_ENABLED=false ################################################# @@ -260,3 +262,5 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export PHONE_QUESTION_TYPE_ENABLED=true + + From f61e7cc87655651d9cb1291db74b8d9a6cc75a0d Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 24 Oct 2023 11:55:14 -0700 Subject: [PATCH 020/291] Rename file to match environment --- civiform_config.sh => civiform_config.test.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename civiform_config.sh => civiform_config.test.sh (100%) diff --git a/civiform_config.sh b/civiform_config.test.sh similarity index 100% rename from civiform_config.sh rename to civiform_config.test.sh From f5c0174c2a1224905e126012e4d178bcfdbefa4b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 24 Oct 2023 15:28:51 -0700 Subject: [PATCH 021/291] Adding staging config file --- civiform_config.staging.sh | 266 +++++++++++++++++++++++++++++++++++++ 1 file changed, 266 insertions(+) create mode 100644 civiform_config.staging.sh diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh new file mode 100644 index 0000000..3f20b8b --- /dev/null +++ b/civiform_config.staging.sh @@ -0,0 +1,266 @@ +#! /usr/bin/env bash + +# CiviForm deployment configuration file. +# +# Copy this file to civiform_config.sh in the same directory and edit the copy. +# +# cp civiform_config.example.sh civiform_config.sh +# +# Configuration variables must be specified in SCREAMING_SNAKE_CASE with the +# "export" keyword preceding them. All values must be quoted as strings. There +# should be no spaces before or after the equals sign. + +################################################# +# Global variables for all CiviForm deployments +################################################# + +# REQUIRED +# One of prod, staging, or dev. +export CIVIFORM_MODE="staging" + +# REQUIRED +# CiviForm server version to deploy. +# +# For dev and staging civiform modes, can be "latest". For prod, must be a version from +# https://github.com/civiform/civiform/releases, for example "v1.2.3". +export CIVIFORM_VERSION="latest" + +# REQUIRED +# Version of the infrastructure to use. +# Needs to be either: +# - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true +# - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false +# - "latest" to use latest version of either docker image or code from the repo, +# depending on USE_DOCKER flag. +# +# Using "latest" is recommended. +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" + +# Terraform configuration +################################################# + +# REQUIRED +# A supported CiviForm cloud provider, lower case. +# "aws" or "azure" +export CIVIFORM_CLOUD_PROVIDER="aws" + + +# REQUIRED +# The template directory for this deployment. +# For aws, use "cloud/aws/templates/aws_oidc" +# For azure, use "cloud/azure/templates/azure_saml_ses" +export TERRAFORM_TEMPLATE_DIR="cloud/aws/templates/aws_oidc" + +# REQUIRED +# The docker repository name for retrieving server images. +export DOCKER_REPOSITORY_NAME="civiform" + +# REQUIRED +# The docker user name for retrieving server images. +export DOCKER_USERNAME="civiform" + +# REQUIRED +# The authentication protocal used for applicant and trusted intermediary accounts. +export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" + +# Deployment-specific Civiform configuration +################################################# + +# REQUIRED +# The short name for the civic entity. Ex. "Rochester" +export CIVIC_ENTITY_SHORT_NAME="Seattle" + +# REQUIRED +# The full name for the civic entity. Ex. "City of Rochester" +export CIVIC_ENTITY_FULL_NAME="City of Seattle" + +# REQUIRED +# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov +export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +# 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 +export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" + +# REQUIRED +# A link to an image of the civic entity logo, to be used on the login page +export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" + +# OPTIONAL +export APPLICANT_PORTAL_NAME="Seattle" + +# OPTIONAL +# A link to an 16x16 of 32x32 pixel favicon of the civic entity, +# in format .ico, .png, or .gif. +export FAVICON_URL="https://seattle.gov/favicon.ico" + +# REQUIRED +# The email address to use for the "from" field in emails sent from CiviForm. +export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the program administrator's email, as would happen in prod. +export STAGING_PROGRAM_ADMIN_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the trusted intermediary's email, as would happen in prod. +export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the applicant's email, as would happen in prod. +export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# OPTIONAL +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. +export STAGING_ADD_NOINDEX_META_TAG=true + +# REQUIRED +# The domain name for this CiviForm deployment, including the protocol. +# E.g. "https://civiform.seattle.gov" +export BASE_URL="https://civiformstage.seattle.gov" +export STAGING_HOSTNAME="civiformstage.seattle.gov" + +# OPTIONAL +# The time zone to be used when rendering any times within the CiviForm +# UI. A list of valid time zone identifiers can be found at: +# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" + +# OPTIONAL +# If enabled, allows exporting Prometheus server metrics over HTTP at "/metrics" +# Defaults to false. +export CIVIFORM_SERVER_METRICS_ENABLED=false + +# Don't deploy of Prometheus and Graphana +export MONITORING_STACK_ENABLED=false + + +################################################# +# Template variables for: aws_oidc +################################################# + +# REQUIRED +export AWS_REGION="us-west-2" + +# REQUIRED +# The name to prefix all resources with. +export APP_PREFIX="cf-staging" # max 19 chars, only numbers, letters, dashes, and underscores + +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" +export FARGATE_DESIRED_TASK_COUNT=1 + +# REQUIRED +# Which auth provider to use for applicants to login. +# If set to a non-disabled value, you must configure the respective auth parameters +export CIVIFORM_APPLICANT_IDP="idcs" + +# generic-oidc Auth configuration +################################################# + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The name of the OIDC provider. Must be URL-safe. +# Gets appended to the auth callback URL. +export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The discovery metadata URI provideded by the OIDC provider. +# Usually ends in .well-known/openid-configuration +export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" + +# OPTIONAL +# The type of OIDC flow to execute, and how the data is encoded. +# See https://auth0.com/docs/authenticate/protocols/oauth#authorization-endpoint +export APPLICANT_OIDC_RESPONSE_MODE="form_post" +export APPLICANT_OIDC_RESPONSE_TYPE="id_token token" + +# OPTIONAL +# Any additional claims to request, in addition to the default scopes "openid profile email" +export APPLICANT_OIDC_ADDITIONAL_SCOPES="" + +# OPTIONAL +# If your OIDC provider provides the user's language preference, +# provide the profile field it's returned in. +export APPLICANT_OIDC_LOCALE_ATTRIBUTE="" + +# OPTIONAL +# The name of the profile field where the user's name is stored. +# If there is only one name field(the display name) use APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE. +# If the name is split into multiple fields, use the APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE +# and APPLICANT_OIDC_LAST_NAME_ATTRIBUTE as necessary. +export APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE="name" +export APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE="" +export APPLICANT_OIDC_LAST_NAME_ATTRIBUTE="" + +# REQUIRED +export APPLICANT_REGISTER_URI="https://qalogin.seattle.gov:12443/#/registration?appName=CIVIFORM_STAGE" +export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://qalogin.seattle.gov:12443/#/logout?appName=CIVIFORM_STAGE" +export APPLICANT_OIDC_POST_LOGOUT_REDIRECT_PARAM="" +export APPLICANT_OIDC_PROVIDER_LOGOUT=true + +# ADFS and Azure AD configuration +# More information on https://docs.civiform.us/contributor-guide/developer-guide/authentication-providers +######################################################################################################### + +# REQUIRED +# The discovery metadata URI provideded by the ADFS provider. +# Usually ends in .well-known/openid-configuration +export ADFS_DISCOVERY_URI="https://login.microsoftonline.com/78e61e45-6beb-4009-8f99-359d8b54f41b/v2.0/.well-known/openid-configuration" + +# OPTIONAL +# Should be set to "allatclaims" for ADFS and empty value for Azure AD. +export ADFS_ADDITIONAL_SCOPES="" + +# OPTIONAL +# Should be set to "group" for ADFS and "groups" for Azure AD. +export AD_GROUPS_ATTRIBUTE_NAME="groups" + +# OPTIONAL +# The ADFS group name for specifying CiviForm admins. If using Azure AD this is +# the group's object ID +export ADFS_ADMIN_GROUP="5909e7f3-3f4c-4ad1-93e8-17e6ba6ab8a3" + +################################################# +# Additional settings +################################################# + +# API +export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false + +# Evolutions +export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true + +# Analytics +export MEASUREMENT_ID="G-HXM0Y35TGE" + +# ESRI +export ESRI_ADDRESS_CORRECTION_ENABLED=true +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" + +# Common Intake +export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" +export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" + +# Email +export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" + +# Feature Flags +export FEATURE_FLAG_OVERRIDES_ENABLED=true +export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true +export PHONE_QUESTION_TYPE_ENABLED=true + + From 08dac1935aea9786c6a83c3f79e934cef61d5fb1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 25 Oct 2023 17:38:41 -0700 Subject: [PATCH 022/291] Create deploy.yml --- .github/workflows/deploy.yml | 86 ++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..c5a3745 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,86 @@ +name: Seattle Deploy + +on: + workflow_dispatch: + inputs: + probers_enabled: + description: 'Runs probers when checked' + default: true + required: true + type: boolean + schedule: + - cron: '0 12 1/1 * *' + +permissions: + id-token: write + contents: read + +# Two probers running at once can break each other. +concurrency: + group: stagingenvironment + cancel-in-progress: true + +jobs: + deploy: + runs-on: ubuntu-latest + + env: + SKIP_CONFIRMATIONS: true + SKIP_TAG_CHECK: true + SLACK_CHANNEL: 'C03UXPUEXU4' + DEPLOY_TARGET: 'staging' + DEPLOY_SUBDOMAIN: 'civiformstage' + + steps: + - name: Notify Slack Start + uses: slackapi/slack-github-action@v1.24.0 + with: + channel-id: ${{ env.SLACK_CHANNEL }} + slack-message: ":space-needle: Starting deploy for Seattle ${{ env.DEPLOY_TARGET }}. Probers enabled: ${{ github.event.inputs.probers_enabled }}" + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + + - name: Checkout + uses: actions/checkout@v4 + + + + + + + - name: resolve latest snapshot tag + run: source bin/resolve-latest-snapshot-tag + + - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} + env: + AWS_ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.SECRET_ACCESS_KEY }} + run: bin/deploy --config="civiform_config.${{ env.DEPLOY_TARGET }}.sh" + + + + + + - name: Run Prober tests + if: github.event.inputs == null || github.event.inputs.probers_enabled == 'true' + env: + TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} + TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} + TEST_USER_DISPLAY_NAME: "TEST, UATAPP" + TEST_CIVIC_ENTITY_SHORT_NAME: "Seattle" + uses: nick-fields/retry@v2 + with: + timeout_minutes: 70 + max_attempts: 1 + retry_wait_seconds: 30 + command: bin/run-prober "https://${{ env.DEPLOY_SUBDOMAIN }}.seattle.gov" + + - name: Notify Slack Complete + if: always() + uses: slackapi/slack-github-action@v1.24.0 + with: + channel-id: ${{ env.SLACK_CHANNEL }} + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Staging Deploy for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From fed7df3cb705c5e7e5dabb220c3748ee251f45ea Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 31 Oct 2023 09:16:32 -0700 Subject: [PATCH 023/291] Enabled the APPLICATION_EXPORTABLE feature --- civiform_config.staging.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 3f20b8b..f4f501b 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -262,5 +262,5 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export PHONE_QUESTION_TYPE_ENABLED=true - +export APPLICATION_EXPORTABLE=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 758d32e..dcd885d 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -262,5 +262,5 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export PHONE_QUESTION_TYPE_ENABLED=true - +export APPLICATION_EXPORTABLE=true From b5b4997dba7ffa906d6f2cd4a1dc50a0e844edb7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 1 Nov 2023 15:47:03 -0700 Subject: [PATCH 024/291] Removing duplicate variable --- civiform_config.staging.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index f4f501b..9d56b2c 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -253,9 +253,7 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" -# Email -export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" - +# Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags From 2382999751cd676e1b68f9aa5b80d7af10ce50b1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 1 Nov 2023 15:48:16 -0700 Subject: [PATCH 025/291] Removing duplicate variable --- civiform_config.test.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index dcd885d..cda48ad 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -253,9 +253,7 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" -# Email -export SENDER_EMAIL_ADDRESS="civiform.staging@seattle.gov" - +# Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags From eec7febd730b0e120b8dfb2ef50bdcb4c638fbe2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 2 Nov 2023 12:54:23 -0700 Subject: [PATCH 026/291] Setting test site to specific version --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index dcd885d..8fcc36d 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="v1.41.0" # REQUIRED # Version of the infrastructure to use. From 5de869c4cd6645a3c33be7e90f3f9e8a30c342d2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 15:05:51 -0800 Subject: [PATCH 027/291] Create slack-notification-tester.yml --- .../workflows/slack-notification-tester.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/slack-notification-tester.yml diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml new file mode 100644 index 0000000..8eb596c --- /dev/null +++ b/.github/workflows/slack-notification-tester.yml @@ -0,0 +1,20 @@ +name: Slack Notification Tester + +on: + workflow_dispatch: {} + +permissions: read-all + +jobs: + run_prober: + runs-on: ubuntu-latest + steps: + - name: Notify Slack Complete + if: always() + uses: slackapi/slack-github-action@v1.24.0 + with: + channel-id: 'C03UXPUEXU4' + slack-message: ":space-needle: Test Message from Seattle Staging Deploy: ${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 15cb071108037ac295ccc673df5e48e5f8903922 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 15:16:01 -0800 Subject: [PATCH 028/291] Update deploy.yml --- .github/workflows/deploy.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c5a3745..5af170a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,24 +43,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - - - - - name: resolve latest snapshot tag run: source bin/resolve-latest-snapshot-tag - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} env: - AWS_ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} run: bin/deploy --config="civiform_config.${{ env.DEPLOY_TARGET }}.sh" - - - - - name: Run Prober tests if: github.event.inputs == null || github.event.inputs.probers_enabled == 'true' env: From 1ee67ec9e84fdab3d417a38eca683af0734d28dc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 15:19:45 -0800 Subject: [PATCH 029/291] Adding snapshot finder script --- bin/resolve-latest-snapshot-tag | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 bin/resolve-latest-snapshot-tag diff --git a/bin/resolve-latest-snapshot-tag b/bin/resolve-latest-snapshot-tag new file mode 100755 index 0000000..247c916 --- /dev/null +++ b/bin/resolve-latest-snapshot-tag @@ -0,0 +1,23 @@ +#! /usr/bin/env bash + +set -e +set -o pipefail + +docker pull docker.io/civiform/civiform:latest + +snapshot_tag="$(docker inspect docker.io/civiform/civiform:latest \ + | jq '.[0].Config.Env' \ + | grep 'CIVIFORM_IMAGE_TAG' \ + | grep -oP 'SNAPSHOT-\w+-\d+')" + +if [[ -z "${snapshot_tag}" ]]; then + echo "Latest snapshot tag not found." 2>&1 + exit 1 +fi + +export LATEST_SNAPSHOT_TAG="${snapshot_tag}" + +if [[ -n "${GITHUB_ENV}" ]]; then + echo "LATEST_SNAPSHOT_TAG=${snapshot_tag}" >>"${GITHUB_ENV}" +fi + From 17c6f8bd6d14b622ed706f227dfd59a8586f81d5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 15:34:50 -0800 Subject: [PATCH 030/291] Update deploy.yml --- .github/workflows/deploy.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5af170a..ed0b710 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,6 +46,17 @@ jobs: - name: resolve latest snapshot tag run: source bin/resolve-latest-snapshot-tag + + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-region: us-west-2 + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + + + - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From 7f39338929d3d0c87192bbb415751d5d0c06d709 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 16:42:46 -0800 Subject: [PATCH 031/291] Update deploy.yml --- .github/workflows/deploy.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ed0b710..dc92bb6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,20 +43,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: resolve latest snapshot tag + - name: Resolve Latest Snapshot Tag run: source bin/resolve-latest-snapshot-tag - - - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: aws-region: us-west-2 - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - + role-to-assume: ${{ secrets.AWS_ROLE_IAM }} - - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From 28639166bf576c54aefecbf088e3257d64ce23fe Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 17:32:58 -0800 Subject: [PATCH 032/291] Update deploy.yml --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dc92bb6..d25a700 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,6 +47,7 @@ jobs: run: source bin/resolve-latest-snapshot-tag - name: Configure AWS Credentials + id: credentials uses: aws-actions/configure-aws-credentials@v2 with: aws-region: us-west-2 @@ -54,8 +55,8 @@ jobs: - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ steps.credentials.outputs.aws-access-key-id }} + AWS_SECRET_ACCESS_KEY: ${{ steps.credentials.outputs.aws-secret-access-key }} run: bin/deploy --config="civiform_config.${{ env.DEPLOY_TARGET }}.sh" - name: Run Prober tests From 3cf4b80958caaf3bcc6101fd0493c150ed484d37 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 17:35:32 -0800 Subject: [PATCH 033/291] Update deploy.yml --- .github/workflows/deploy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d25a700..9bc2a3c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,7 +52,10 @@ jobs: with: aws-region: us-west-2 role-to-assume: ${{ secrets.AWS_ROLE_IAM }} - + + - name: Get caller identity + run: aws sts get-caller-identity + - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} env: AWS_ACCESS_KEY_ID: ${{ steps.credentials.outputs.aws-access-key-id }} From a6d5b67a4487357ae17d1f3bf1d35688edaeccf3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 17:47:10 -0800 Subject: [PATCH 034/291] Update deploy.yml --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9bc2a3c..ab25624 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,10 +48,11 @@ jobs: - name: Configure AWS Credentials id: credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-west-2 role-to-assume: ${{ secrets.AWS_ROLE_IAM }} + output-credentials: true - name: Get caller identity run: aws sts get-caller-identity From 341b276cbdd81996dd41d389ca79473ead47274b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 18:11:34 -0800 Subject: [PATCH 035/291] Update run-prober --- bin/run-prober | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/bin/run-prober b/bin/run-prober index 3bd88dd..5a7fdff 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -2,15 +2,6 @@ # DOC: Run the browser test suite in Docker against the staging environment. -# Shards allow splitting the run into multiple chunks -# See https://jestjs.io/docs/next/cli#--shard -SHARD_NUM="${1}" -SHARD_COMMAND="" - -if [[ -n "${SHARD_NUM}" ]]; then - SHARD_COMMAND=" -- --shard=${SHARD_NUM}" -fi - docker pull civiform/civiform-browser-test:latest # Enable video recording on CI tests as it will be helpful to debug test @@ -28,4 +19,4 @@ docker run \ -e DISABLE_BROWSER_ERROR_WATCHER=true \ -e DISABLE_SCREENSHOTS=false \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test ${SHARD_COMMAND}" + -c "npm install && npm test From 8df6e877a33397b8cefa0e544539df0d319b12c9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 18:15:01 -0800 Subject: [PATCH 036/291] Update deploy.yml --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ab25624..1fc6be7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -69,13 +69,14 @@ jobs: TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} TEST_USER_DISPLAY_NAME: "TEST, UATAPP" - TEST_CIVIC_ENTITY_SHORT_NAME: "Seattle" + TEST_CIVIC_ENTITY_SHORT_NAME: "Seattle" + BASE_URL: "https://${{ env.DEPLOY_SUBDOMAIN}}.seattle.gov" uses: nick-fields/retry@v2 with: timeout_minutes: 70 max_attempts: 1 retry_wait_seconds: 30 - command: bin/run-prober "https://${{ env.DEPLOY_SUBDOMAIN }}.seattle.gov" + command: bin/run-prober - name: Notify Slack Complete if: always() From feefaaceddb7ad35175e367729779b6cdf339fa7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 18:18:45 -0800 Subject: [PATCH 037/291] Update run-prober --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index 5a7fdff..aebd1bc 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -19,4 +19,4 @@ docker run \ -e DISABLE_BROWSER_ERROR_WATCHER=true \ -e DISABLE_SCREENSHOTS=false \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test + -c "npm install && npm test" From 97879840e2be826df50654dbeef59df595eda340 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 18:36:52 -0800 Subject: [PATCH 038/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 9d56b2c..752c7ab 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -68,19 +68,15 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # REQUIRED # The short name for the civic entity. Ex. "Rochester" -export CIVIC_ENTITY_SHORT_NAME="Seattle" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" # REQUIRED # The full name for the civic entity. Ex. "City of Rochester" -export CIVIC_ENTITY_FULL_NAME="City of Seattle" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" - -# 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 -export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" +export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" # REQUIRED # A link to an image of the civic entity logo, to be used on the login page @@ -255,10 +251,15 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +# Don't need to bother with this until we have new languages +# export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags -export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export PHONE_QUESTION_TYPE_ENABLED=true export APPLICATION_EXPORTABLE=true +# I think these are obsolete +#export FEATURE_FLAG_OVERRIDES_ENABLED=true +#export PHONE_QUESTION_TYPE_ENABLED=true + + From e9fcd5b82783ebd21d62f977fe32464f0d5c1102 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 Nov 2023 21:36:06 -0800 Subject: [PATCH 039/291] Adding API_GENERATED_DOCS_ENABLED --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 752c7ab..e87d3c0 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -257,7 +257,7 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true - +export API_GENERATED_DOCS_ENABLED=true # I think these are obsolete #export FEATURE_FLAG_OVERRIDES_ENABLED=true #export PHONE_QUESTION_TYPE_ENABLED=true From 62bc82f2051cc282e39d86f6718a1c3dd7ef5382 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:01:45 -0800 Subject: [PATCH 040/291] Create inputs-test.yml --- .github/workflows/inputs-test.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/inputs-test.yml diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml new file mode 100644 index 0000000..62eca28 --- /dev/null +++ b/.github/workflows/inputs-test.yml @@ -0,0 +1,19 @@ +name: Inputs Test + +on: + workflow_dispatch: + inputs: + probers_enabled: + description: 'Runs probers when checked' + default: true + required: true + type: boolean + + +jobs: + test-job: + runs-on: ubuntu-latest + + steps: + - name: Notify Slack Start + run: "echo ${{ github.event.inputs.probers_enabled }}" From c6d6a0eb7516b3030c3a731ea5e7b571ce5553bf Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:06:26 -0800 Subject: [PATCH 041/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 62eca28..0c68288 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -3,6 +3,17 @@ name: Inputs Test on: workflow_dispatch: inputs: + site-env: + type: choice + description: Site location + options: + - test + - staging + + environment: + type: environment + + probers_enabled: description: 'Runs probers when checked' default: true @@ -15,5 +26,5 @@ jobs: runs-on: ubuntu-latest steps: - - name: Notify Slack Start + - name: Display value run: "echo ${{ github.event.inputs.probers_enabled }}" From e563497769fb391ed93ff6f6f38e291c0c6a5765 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:12:40 -0800 Subject: [PATCH 042/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 0c68288..0998c8a 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -3,17 +3,9 @@ name: Inputs Test on: workflow_dispatch: inputs: - site-env: - type: choice - description: Site location - options: - - test - - staging - environment: type: environment - probers_enabled: description: 'Runs probers when checked' default: true @@ -26,5 +18,14 @@ jobs: runs-on: ubuntu-latest steps: - - name: Display value + - name: Display github.event.inputs.probers_enabled run: "echo ${{ github.event.inputs.probers_enabled }}" + + - name: Display github.event.inputs.environment + run: "echo ${{ github.event.inputs.environment }}" + + - name: Display env.DEPLOY_SUBDOMAIN + run: "echo ${{ env.DEPLOY_SUBDOMAIN }}" + + - name: Display env.DEPLOY_TARGET + run: "echo ${{ env.DEPLOY_TARGET }}" From 71be5e5ecd5526dd89e19ee6ca6ff52265a72a30 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:14:18 -0800 Subject: [PATCH 043/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 0998c8a..5c4a80b 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -24,8 +24,8 @@ jobs: - name: Display github.event.inputs.environment run: "echo ${{ github.event.inputs.environment }}" - - name: Display env.DEPLOY_SUBDOMAIN - run: "echo ${{ env.DEPLOY_SUBDOMAIN }}" + - name: Display vars.DEPLOY_SUBDOMAIN + run: "echo ${{ vars.DEPLOY_SUBDOMAIN }}" - - name: Display env.DEPLOY_TARGET - run: "echo ${{ env.DEPLOY_TARGET }}" + - name: Display vars.DEPLOY_TARGET + run: "echo ${{ vars.DEPLOY_TARGET }}" From 682c71d9d1584bf894f2e6f0c126aa177166ee71 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:20:57 -0800 Subject: [PATCH 044/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 5c4a80b..d86b853 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -16,16 +16,13 @@ on: jobs: test-job: runs-on: ubuntu-latest - + environment: ${{ vars.ENVIRONMENT_STAGE }} + steps: - - name: Display github.event.inputs.probers_enabled - run: "echo ${{ github.event.inputs.probers_enabled }}" - - - name: Display github.event.inputs.environment - run: "echo ${{ github.event.inputs.environment }}" - - - name: Display vars.DEPLOY_SUBDOMAIN - run: "echo ${{ vars.DEPLOY_SUBDOMAIN }}" - - - name: Display vars.DEPLOY_TARGET - run: "echo ${{ vars.DEPLOY_TARGET }}" + - name: Display + run: | + echo "${{ vars.ENVIRONMENT_STAGE }}" + echo "${{ github.event.inputs.probers_enabled }}" + echo "${{ github.event.inputs.environment }}" + echo "${{ vars.DEPLOY_SUBDOMAIN }}" + echo "${{ vars.DEPLOY_TARGET }}" From 3d9ae38fdcc3fd6ad991806d831bddc597e8b65f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:26:54 -0800 Subject: [PATCH 045/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index d86b853..8d6c4de 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -19,10 +19,19 @@ jobs: environment: ${{ vars.ENVIRONMENT_STAGE }} steps: + - name: A + run: echo "${{ vars }}" + + - name: B + run: echo "${{ env }}" + + - name: C + run: echo "${{ github.event.inputs }}" + - name: Display run: | - echo "${{ vars.ENVIRONMENT_STAGE }}" - echo "${{ github.event.inputs.probers_enabled }}" - echo "${{ github.event.inputs.environment }}" - echo "${{ vars.DEPLOY_SUBDOMAIN }}" - echo "${{ vars.DEPLOY_TARGET }}" + echo "vars.ENVIRONMENT_STAGE: ${{ vars.ENVIRONMENT_STAGE }}" + echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" + echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" + echo "vars.DEPLOY_SUBDOMAIN: ${{ vars.DEPLOY_SUBDOMAIN }}" + echo "vars.DEPLOY_TARGET: ${{ vars.DEPLOY_TARGET }}" From 6be07a5d7942e4ac3f53a500d455385db0649c4b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:28:30 -0800 Subject: [PATCH 046/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 8d6c4de..f823699 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -16,17 +16,11 @@ on: jobs: test-job: runs-on: ubuntu-latest - environment: ${{ vars.ENVIRONMENT_STAGE }} + environment: ${{ github.event.inputs.environment }} steps: - - name: A - run: echo "${{ vars }}" - - - name: B - run: echo "${{ env }}" - - name: C - run: echo "${{ github.event.inputs }}" + run: echo "${{ github.event.inputs.environment }}" - name: Display run: | From 71053a2871f591e210628241c54409b79e06d8ac Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:29:56 -0800 Subject: [PATCH 047/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index f823699..faef135 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -19,13 +19,9 @@ jobs: environment: ${{ github.event.inputs.environment }} steps: - - name: C - run: echo "${{ github.event.inputs.environment }}" - - name: Display run: | - echo "vars.ENVIRONMENT_STAGE: ${{ vars.ENVIRONMENT_STAGE }}" echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" - echo "vars.DEPLOY_SUBDOMAIN: ${{ vars.DEPLOY_SUBDOMAIN }}" echo "vars.DEPLOY_TARGET: ${{ vars.DEPLOY_TARGET }}" + echo "vars.DEPLOY_SUBDOMAIN: ${{ vars.DEPLOY_SUBDOMAIN }}" From f1bd5b7de28ac7ac2ad2fd7b121bd0a6dc822712 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:41:00 -0800 Subject: [PATCH 048/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index faef135..c137926 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -5,23 +5,19 @@ on: inputs: environment: type: environment - probers_enabled: description: 'Runs probers when checked' default: true required: true type: boolean - - + jobs: test-job: runs-on: ubuntu-latest environment: ${{ github.event.inputs.environment }} - steps: - name: Display run: | echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" - echo "vars.DEPLOY_TARGET: ${{ vars.DEPLOY_TARGET }}" - echo "vars.DEPLOY_SUBDOMAIN: ${{ vars.DEPLOY_SUBDOMAIN }}" + echo "vars.SUBDOMAIN: ${{ vars.SUBDOMAIN }}" From 7afdfbda7196bf52770d1c76aaebca2bf785674a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:45:53 -0800 Subject: [PATCH 049/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index c137926..477681d 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -5,11 +5,14 @@ on: inputs: environment: type: environment + default: test + required: true + probers_enabled: + type: boolean description: 'Runs probers when checked' default: true required: true - type: boolean jobs: test-job: From 10324f823cc405f9985b5089038a6d8c4222715e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:49:27 -0800 Subject: [PATCH 050/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 477681d..fe21969 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -5,7 +5,7 @@ on: inputs: environment: type: environment - default: test + default: staging required: true probers_enabled: @@ -14,6 +14,9 @@ on: default: true required: true + schedule: + - cron: '*/5 * * * *' + jobs: test-job: runs-on: ubuntu-latest From 733e6be30b4e65c2b1afa58f317f0707ad2e1568 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 12:58:47 -0800 Subject: [PATCH 051/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index fe21969..4fbebc0 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -20,7 +20,7 @@ on: jobs: test-job: runs-on: ubuntu-latest - environment: ${{ github.event.inputs.environment }} + environment: ${{ github.event.inputs.environment || staging }} steps: - name: Display run: | From 15f83458dc6284bc9bda5a2584e9ba17b923c096 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 13:05:39 -0800 Subject: [PATCH 052/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 4fbebc0..6c9f710 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -20,7 +20,7 @@ on: jobs: test-job: runs-on: ubuntu-latest - environment: ${{ github.event.inputs.environment || staging }} + environment: ${{ github.event.inputs.environment || 'staging' }} steps: - name: Display run: | From 230ca946a79708b7c4dc4de0fa6d9ddcdcce1469 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 13:20:53 -0800 Subject: [PATCH 053/291] Update deploy.yml --- .github/workflows/deploy.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1fc6be7..fd1237d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,11 +3,17 @@ name: Seattle Deploy on: workflow_dispatch: inputs: + environment: + type: environment + default: staging + required: true + probers_enabled: + type: boolean description: 'Runs probers when checked' default: true required: true - type: boolean + schedule: - cron: '0 12 1/1 * *' @@ -23,20 +29,19 @@ concurrency: jobs: deploy: runs-on: ubuntu-latest + environment: ${{ github.event.inputs.environment || 'staging' }} env: SKIP_CONFIRMATIONS: true SKIP_TAG_CHECK: true SLACK_CHANNEL: 'C03UXPUEXU4' - DEPLOY_TARGET: 'staging' - DEPLOY_SUBDOMAIN: 'civiformstage' steps: - name: Notify Slack Start uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting deploy for Seattle ${{ env.DEPLOY_TARGET }}. Probers enabled: ${{ github.event.inputs.probers_enabled }}" + slack-message: ":space-needle: Starting Seattle Deploy [Env: ${{ github.event.inputs.environment }}]. Probers enabled: ${{ github.event.inputs.probers_enabled }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} @@ -57,11 +62,11 @@ jobs: - name: Get caller identity run: aws sts get-caller-identity - - name: Run deployment with latest on ${{ env.DEPLOY_TARGET }} + - name: Run deployment with latest on ${{ github.event.inputs.environment }} env: AWS_ACCESS_KEY_ID: ${{ steps.credentials.outputs.aws-access-key-id }} AWS_SECRET_ACCESS_KEY: ${{ steps.credentials.outputs.aws-secret-access-key }} - run: bin/deploy --config="civiform_config.${{ env.DEPLOY_TARGET }}.sh" + run: bin/deploy --config="civiform_config.${{ github.event.inputs.environment }}.sh" - name: Run Prober tests if: github.event.inputs == null || github.event.inputs.probers_enabled == 'true' @@ -70,7 +75,7 @@ jobs: TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} TEST_USER_DISPLAY_NAME: "TEST, UATAPP" TEST_CIVIC_ENTITY_SHORT_NAME: "Seattle" - BASE_URL: "https://${{ env.DEPLOY_SUBDOMAIN}}.seattle.gov" + BASE_URL: "https://${{ vars.SUBDOMAIN }}.seattle.gov" uses: nick-fields/retry@v2 with: timeout_minutes: 70 @@ -83,7 +88,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Staging Deploy for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy [Env: ${{ github.event.inputs.environment }}] for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 3d17a0d1c44fa242c75a3351cc5f1a728508d4ad Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 13:21:36 -0800 Subject: [PATCH 054/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 6c9f710..1b8d23a 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -14,9 +14,6 @@ on: default: true required: true - schedule: - - cron: '*/5 * * * *' - jobs: test-job: runs-on: ubuntu-latest From 214edb270524216e6bbe26b443723d6e53ff4c5c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:16:09 -0800 Subject: [PATCH 055/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 1b8d23a..232623e 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -18,9 +18,15 @@ jobs: test-job: runs-on: ubuntu-latest environment: ${{ github.event.inputs.environment || 'staging' }} + env: + ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} + PROBERS_ENABLED: ${{ github.event.inputs == null || github.event.inputs.probers_enabled == 'true' }} steps: - name: Display + if: (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && run: | echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" echo "vars.SUBDOMAIN: ${{ vars.SUBDOMAIN }}" + echo "env.ENVIRONMENT: ${{ env.ENVIRONMENT }}" + echo "env.PROBERS_ENABLED: ${{ env.PROBERS_ENABLED }}" From c99dbc041a466a9b8b5859186de8b2bd9639de67 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:18:14 -0800 Subject: [PATCH 056/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 232623e..69e4598 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -13,7 +13,10 @@ on: description: 'Runs probers when checked' default: true required: true - + + schedule: + - cron: '*/5 * * * *' + jobs: test-job: runs-on: ubuntu-latest @@ -23,7 +26,7 @@ jobs: PROBERS_ENABLED: ${{ github.event.inputs == null || github.event.inputs.probers_enabled == 'true' }} steps: - name: Display - if: (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && + #if: (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && run: | echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" From 62d999b5c722bb927b1a6f8568e83ddefd5a16ff Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:22:27 -0800 Subject: [PATCH 057/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 69e4598..4ec3f18 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -23,7 +23,7 @@ jobs: environment: ${{ github.event.inputs.environment || 'staging' }} env: ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} - PROBERS_ENABLED: ${{ github.event.inputs == null || github.event.inputs.probers_enabled == 'true' }} + PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} steps: - name: Display #if: (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && From def40ef5232f3b595fcbc2f441bff05da5bb77ed Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:35:46 -0800 Subject: [PATCH 058/291] Update deploy.yml --- .github/workflows/deploy.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fd1237d..4fdff53 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,13 +35,20 @@ jobs: SKIP_CONFIRMATIONS: true SKIP_TAG_CHECK: true SLACK_CHANNEL: 'C03UXPUEXU4' + # When run by the schedule github.event.inputs are not set. It's easier to normalize these here into environment variables + # than to have the extra logic all over and duplicated. + # If environment is null default to the staging site + ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} + # Consider probers to be enabled if manually checked or if run from a schedule, but only run them on the staging site + # beause we don't want to wipe test site data. + PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} steps: - name: Notify Slack Start uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting Seattle Deploy [Env: ${{ github.event.inputs.environment }}]. Probers enabled: ${{ github.event.inputs.probers_enabled }}" + slack-message: ":space-needle: Starting Seattle Deploy [Env: ${{ env.ENVIRONMENT }}]. Probers enabled: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} @@ -62,14 +69,14 @@ jobs: - name: Get caller identity run: aws sts get-caller-identity - - name: Run deployment with latest on ${{ github.event.inputs.environment }} + - name: Run deployment with latest on ${{ env.ENVIRONMENT }} env: AWS_ACCESS_KEY_ID: ${{ steps.credentials.outputs.aws-access-key-id }} AWS_SECRET_ACCESS_KEY: ${{ steps.credentials.outputs.aws-secret-access-key }} - run: bin/deploy --config="civiform_config.${{ github.event.inputs.environment }}.sh" + run: bin/deploy --config="civiform_config.${{ env.ENVIRONMENT }}.sh" - name: Run Prober tests - if: github.event.inputs == null || github.event.inputs.probers_enabled == 'true' + if: PROBERS_ENABLED == 'true' env: TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} @@ -88,7 +95,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy [Env: ${{ github.event.inputs.environment }}] for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy [Env: ${{ env.ENVIRONMENT }}] for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 14dc43d19667ff20ea4a598bac65689f99c34d9f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:36:44 -0800 Subject: [PATCH 059/291] Update inputs-test.yml --- .github/workflows/inputs-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml index 4ec3f18..b01fdf2 100644 --- a/.github/workflows/inputs-test.yml +++ b/.github/workflows/inputs-test.yml @@ -14,8 +14,8 @@ on: default: true required: true - schedule: - - cron: '*/5 * * * *' + #schedule: + # - cron: '*/5 * * * *' jobs: test-job: From 91ce578cfdffa63c3642ef9ef61fc21434ce557f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 14:39:12 -0800 Subject: [PATCH 060/291] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4fdff53..313f253 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -76,7 +76,7 @@ jobs: run: bin/deploy --config="civiform_config.${{ env.ENVIRONMENT }}.sh" - name: Run Prober tests - if: PROBERS_ENABLED == 'true' + if: (env.PROBERS_ENABLED == 'true') env: TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} From e7a566d084b539c47de7c4b1d3df4a662da490a2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 15:09:09 -0800 Subject: [PATCH 061/291] Create renovate.json --- .github/renovate.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/renovate.json diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..4f39080 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,3 @@ +{ + "extends": ["config:base"] +} From e353c637849a80bb26a1bbd6d248ace4c54b3af8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 23:10:45 +0000 Subject: [PATCH 062/291] Update actions/checkout action to v4 --- .github/workflows/run-probers-only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-probers-only.yml b/.github/workflows/run-probers-only.yml index d583b44..d3fe0ad 100644 --- a/.github/workflows/run-probers-only.yml +++ b/.github/workflows/run-probers-only.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Prober Tests env: From dce4edd304ebe7215d31e103538749807fc3bb3a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 15:30:39 -0800 Subject: [PATCH 063/291] Create asdf.md --- asdf.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 asdf.md diff --git a/asdf.md b/asdf.md new file mode 100644 index 0000000..c9140d4 --- /dev/null +++ b/asdf.md @@ -0,0 +1,5 @@ +# Setup + +Environments are configured under the repository settings. + +To add a new deployment target create a new environment and a new deploy config file named civiform_config.ENV_NAME.sh From f5a6b4f9f5a2f760c51d9e6c8d191cf5b37c065f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 9 Nov 2023 15:30:58 -0800 Subject: [PATCH 064/291] Rename asdf.md to SETUP.md --- asdf.md => SETUP.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename asdf.md => SETUP.md (100%) diff --git a/asdf.md b/SETUP.md similarity index 100% rename from asdf.md rename to SETUP.md From 191d96aec6108a98675217183ad504a2f4ea0687 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 13 Nov 2023 08:04:23 -0800 Subject: [PATCH 065/291] Removing test workflow --- .github/workflows/inputs-test.yml | 35 ------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/inputs-test.yml diff --git a/.github/workflows/inputs-test.yml b/.github/workflows/inputs-test.yml deleted file mode 100644 index b01fdf2..0000000 --- a/.github/workflows/inputs-test.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Inputs Test - -on: - workflow_dispatch: - inputs: - environment: - type: environment - default: staging - required: true - - probers_enabled: - type: boolean - description: 'Runs probers when checked' - default: true - required: true - - #schedule: - # - cron: '*/5 * * * *' - -jobs: - test-job: - runs-on: ubuntu-latest - environment: ${{ github.event.inputs.environment || 'staging' }} - env: - ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} - PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} - steps: - - name: Display - #if: (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && - run: | - echo "github.event.inputs.probers_enabled: ${{ github.event.inputs.probers_enabled }}" - echo "github.event.inputs.environment: ${{ github.event.inputs.environment }}" - echo "vars.SUBDOMAIN: ${{ vars.SUBDOMAIN }}" - echo "env.ENVIRONMENT: ${{ env.ENVIRONMENT }}" - echo "env.PROBERS_ENABLED: ${{ env.PROBERS_ENABLED }}" From 360b36a18c7d73cd7465e4b9b864029418827d27 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 13 Nov 2023 08:53:49 -0800 Subject: [PATCH 066/291] New line test --- .github/workflows/slack-notification-tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index 8eb596c..166ad4e 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -13,8 +13,8 @@ jobs: if: always() uses: slackapi/slack-github-action@v1.24.0 with: - channel-id: 'C03UXPUEXU4' - slack-message: ":space-needle: Test Message from Seattle Staging Deploy: ${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" + channel-id: 'C03UXPUEXU4' + slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 6b5f3f5d1c29b3e496afaa2c148adfa70745d7e2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 13 Nov 2023 08:59:09 -0800 Subject: [PATCH 067/291] Making deploy step configurable --- .github/workflows/deploy.yml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 313f253..84f405a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,13 @@ on: type: environment default: staging required: true - + + deploy_enabled: + type: boolean + description: 'Deploy when checked' + default: true + required: true + probers_enabled: type: boolean description: 'Runs probers when checked' @@ -39,19 +45,21 @@ jobs: # than to have the extra logic all over and duplicated. # If environment is null default to the staging site ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} + # Consider deployment to be enabled if manually checked or if run from a schedule + DEPLOY_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.deploy_enabled == 'true') }} # Consider probers to be enabled if manually checked or if run from a schedule, but only run them on the staging site # beause we don't want to wipe test site data. PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} - + steps: - name: Notify Slack Start uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting Seattle Deploy [Env: ${{ env.ENVIRONMENT }}]. Probers enabled: ${{ env.PROBERS_ENABLED }}" + slack-message: ":space-needle: Starting Seattle Deploy\nEnvironment: ${{ env.ENVIRONMENT }}.\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} - + - name: Checkout uses: actions/checkout@v4 @@ -65,11 +73,12 @@ jobs: aws-region: us-west-2 role-to-assume: ${{ secrets.AWS_ROLE_IAM }} output-credentials: true - + - name: Get caller identity run: aws sts get-caller-identity - + - name: Run deployment with latest on ${{ env.ENVIRONMENT }} + if: (env.DEPLOY_ENABLED == 'true') env: AWS_ACCESS_KEY_ID: ${{ steps.credentials.outputs.aws-access-key-id }} AWS_SECRET_ACCESS_KEY: ${{ steps.credentials.outputs.aws-secret-access-key }} @@ -80,22 +89,22 @@ jobs: env: TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} - TEST_USER_DISPLAY_NAME: "TEST, UATAPP" - TEST_CIVIC_ENTITY_SHORT_NAME: "Seattle" - BASE_URL: "https://${{ vars.SUBDOMAIN }}.seattle.gov" + TEST_USER_DISPLAY_NAME: 'TEST, UATAPP' + TEST_CIVIC_ENTITY_SHORT_NAME: 'Seattle' + BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' uses: nick-fields/retry@v2 with: timeout_minutes: 70 max_attempts: 1 retry_wait_seconds: 30 command: bin/run-prober - + - name: Notify Slack Complete if: always() uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy [Env: ${{ env.ENVIRONMENT }}] for ${{ env.LATEST_SNAPSHOT_TAG }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>" + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nEnvironment: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From e6a51b86c9baf49da034546010703a4eddc71a30 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 13 Nov 2023 09:02:08 -0800 Subject: [PATCH 068/291] Message updates --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 84f405a..f121db8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,7 +56,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting Seattle Deploy\nEnvironment: ${{ env.ENVIRONMENT }}.\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" + slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}.\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} @@ -104,7 +104,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nEnvironment: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}" + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nEnv: ${{ env.ENVIRONMENT }}\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From d08d02f746b8ffdc6161f7d835321b30feec266c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 13 Nov 2023 09:04:40 -0800 Subject: [PATCH 069/291] String updates for message --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f121db8..9ad947c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,7 +56,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}.\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" + slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} @@ -104,7 +104,7 @@ jobs: uses: slackapi/slack-github-action@v1.24.0 with: channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nEnv: ${{ env.ENVIRONMENT }}\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" + slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 9a9e6f7ad64ac93883311e51cb00b18ffb5ba331 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 14 Nov 2023 11:26:27 -0800 Subject: [PATCH 070/291] Adding prod config --- civiform_config.prod.sh | 267 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) create mode 100644 civiform_config.prod.sh diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh new file mode 100644 index 0000000..d6b189d --- /dev/null +++ b/civiform_config.prod.sh @@ -0,0 +1,267 @@ +#! /usr/bin/env bash + +# CiviForm deployment configuration file. +# +# Copy this file to civiform_config.sh in the same directory and edit the copy. +# +# cp civiform_config.example.sh civiform_config.sh +# +# Configuration variables must be specified in SCREAMING_SNAKE_CASE with the +# "export" keyword preceding them. All values must be quoted as strings. There +# should be no spaces before or after the equals sign. + +################################################# +# Global variables for all CiviForm deployments +################################################# + +# REQUIRED +# One of prod, staging, or dev. +export CIVIFORM_MODE="prod" + +# REQUIRED +# CiviForm server version to deploy. +# +# For dev and staging civiform modes, can be "latest". For prod, must be a version from +# https://github.com/civiform/civiform/releases, for example "v1.2.3". +export CIVIFORM_VERSION="v1.42.0" + +# REQUIRED +# Version of the infrastructure to use. +# Needs to be either: +# - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true +# - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false +# - "latest" to use latest version of either docker image or code from the repo, +# depending on USE_DOCKER flag. +# +# Using "latest" is recommended. +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" + +# Terraform configuration +################################################# + +# REQUIRED +# A supported CiviForm cloud provider, lower case. +# "aws" or "azure" +export CIVIFORM_CLOUD_PROVIDER="aws" + + +# REQUIRED +# The template directory for this deployment. +# For aws, use "cloud/aws/templates/aws_oidc" +# For azure, use "cloud/azure/templates/azure_saml_ses" +export TERRAFORM_TEMPLATE_DIR="cloud/aws/templates/aws_oidc" + +# REQUIRED +# The docker repository name for retrieving server images. +export DOCKER_REPOSITORY_NAME="civiform" + +# REQUIRED +# The docker user name for retrieving server images. +export DOCKER_USERNAME="civiform" + +# REQUIRED +# The authentication protocal used for applicant and trusted intermediary accounts. +export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" + +# Deployment-specific Civiform configuration +################################################# + +# REQUIRED +# The short name for the civic entity. Ex. "Rochester" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" + +# REQUIRED +# The full name for the civic entity. Ex. "City of Rochester" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" + +# REQUIRED +# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov +export SUPPORT_EMAIL_ADDRESS="CiviForm@seattle.gov" + +# 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 +export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" + +# REQUIRED +# A link to an image of the civic entity logo, to be used on the login page +export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" + +# OPTIONAL +export APPLICANT_PORTAL_NAME="Seattle" + +# OPTIONAL +# A link to an 16x16 of 32x32 pixel favicon of the civic entity, +# in format .ico, .png, or .gif. +export FAVICON_URL="https://seattle.gov/favicon.ico" + +# REQUIRED +# The email address to use for the "from" field in emails sent from CiviForm. +export SENDER_EMAIL_ADDRESS="civiform-notification@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the program administrator's email, as would happen in prod. +export STAGING_PROGRAM_ADMIN_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the trusted intermediary's email, as would happen in prod. +export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# REQUIRED +# The email address that receives a notifications email each time an applicant +# submits an application to a program in the staging environments, instead of +# sending it to the applicant's email, as would happen in prod. +export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" + +# OPTIONAL +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. +export STAGING_ADD_NOINDEX_META_TAG=false + +# REQUIRED +# The domain name for this CiviForm deployment, including the protocol. +# E.g. "https://civiform.seattle.gov" +export BASE_URL="https://civiform.seattle.gov" +export STAGING_HOSTNAME="civiform.seattle.gov" + +# OPTIONAL +# The time zone to be used when rendering any times within the CiviForm +# UI. A list of valid time zone identifiers can be found at: +# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" + +# OPTIONAL +# If enabled, allows exporting Prometheus server metrics over HTTP at "/metrics" +# Defaults to false. +export CIVIFORM_SERVER_METRICS_ENABLED=false + +# Don't deploy of Prometheus and Graphana +export MONITORING_STACK_ENABLED=false + + +################################################# +# Template variables for: aws_oidc +################################################# + +# REQUIRED +export AWS_REGION="us-west-2" + +# REQUIRED +# The name to prefix all resources with. +export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and underscores + +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" +export FARGATE_DESIRED_TASK_COUNT=1 + +# REQUIRED +# Which auth provider to use for applicants to login. +# If set to a non-disabled value, you must configure the respective auth parameters +export CIVIFORM_APPLICANT_IDP="idcs" + +# generic-oidc Auth configuration +################################################# + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The name of the OIDC provider. Must be URL-safe. +# Gets appended to the auth callback URL. +export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" + +# REQUIRED if CIVIFORM_APPLICANT_IDP="generic-oidc" +# The discovery metadata URI provideded by the OIDC provider. +# Usually ends in .well-known/openid-configuration +export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-3359adb31e35415e8c1729c5c8098c6d.identity.oraclecloud.com/.well-known/openid-configuration" + +# OPTIONAL +# The type of OIDC flow to execute, and how the data is encoded. +# See https://auth0.com/docs/authenticate/protocols/oauth#authorization-endpoint +export APPLICANT_OIDC_RESPONSE_MODE="form_post" +export APPLICANT_OIDC_RESPONSE_TYPE="id_token token" + +# OPTIONAL +# Any additional claims to request, in addition to the default scopes "openid profile email" +export APPLICANT_OIDC_ADDITIONAL_SCOPES="" + +# OPTIONAL +# If your OIDC provider provides the user's language preference, +# provide the profile field it's returned in. +export APPLICANT_OIDC_LOCALE_ATTRIBUTE="" + +# OPTIONAL +# The name of the profile field where the user's name is stored. +# If there is only one name field(the display name) use APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE. +# If the name is split into multiple fields, use the APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE +# and APPLICANT_OIDC_LAST_NAME_ATTRIBUTE as necessary. +export APPLICANT_OIDC_FIRST_NAME_ATTRIBUTE="name" +export APPLICANT_OIDC_MIDDLE_NAME_ATTRIBUTE="" +export APPLICANT_OIDC_LAST_NAME_ATTRIBUTE="" + +# REQUIRED +export APPLICANT_REGISTER_URI="https://login.seattle.gov/#/registration?appName=CiviForm" +export APPLICANT_OIDC_OVERRIDE_LOGOUT_URL="https://login.seattle.gov/#/logout?appName=CIVIFORM" +export APPLICANT_OIDC_POST_LOGOUT_REDIRECT_PARAM="" +export APPLICANT_OIDC_PROVIDER_LOGOUT=true + +# ADFS and Azure AD configuration +# More information on https://docs.civiform.us/contributor-guide/developer-guide/authentication-providers +######################################################################################################### + +# REQUIRED +# The discovery metadata URI provideded by the ADFS provider. +# Usually ends in .well-known/openid-configuration +export ADFS_DISCOVERY_URI="https://login.microsoftonline.com/78e61e45-6beb-4009-8f99-359d8b54f41b/v2.0/.well-known/openid-configuration" + +# OPTIONAL +# Should be set to "allatclaims" for ADFS and empty value for Azure AD. +export ADFS_ADDITIONAL_SCOPES="" + +# OPTIONAL +# Should be set to "group" for ADFS and "groups" for Azure AD. +export AD_GROUPS_ATTRIBUTE_NAME="groups" + +# OPTIONAL +# The ADFS group name for specifying CiviForm admins. If using Azure AD this is +# the group's object ID +export ADFS_ADMIN_GROUP="f8c8e6c8-a5d7-4476-91bd-7f1691d16625" + +################################################# +# Additional settings +################################################# + +# Prod overrides +export POSTGRES_INSTANCE_CLASS="db.m5.large" + +# API +export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false + +# Evolutions +export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true + +# Analytics +export MEASUREMENT_ID="G-HXM0Y35TGE" + +# ESRI +export ESRI_ADDRESS_CORRECTION_ENABLED=true +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" + +# Common Intake +export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" +export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" + +# Language Settings +export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +# Don't need to bother with this until we have new languages +# export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" + +# Feature Flags +export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true +export APPLICATION_EXPORTABLE=true + From a53e2979deec634c147eec3309cfd8f842c9c9bb Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 15 Nov 2023 11:15:04 -0800 Subject: [PATCH 071/291] Removing old prober action --- .github/workflows/run-probers-only.yml | 31 -------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .github/workflows/run-probers-only.yml diff --git a/.github/workflows/run-probers-only.yml b/.github/workflows/run-probers-only.yml deleted file mode 100644 index d3fe0ad..0000000 --- a/.github/workflows/run-probers-only.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Run Probers Only - -on: - workflow_dispatch: {} - workflow_call: - -#permissions: read-all - -# Two probers running at once can break each other. -concurrency: - group: stagingenvironment - cancel-in-progress: true - -jobs: - run_prober: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Run Prober Tests - env: - BASE_URL: "https://civiformtest.seattle.gov" - TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} - TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} - uses: nick-fields/retry@v2 - with: - timeout_minutes: 70 - max_attempts: 1 - retry_wait_seconds: 15 - command: bin/run-prober From f650f0146025f0610c9664184308c62c0c80a623 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 15 Nov 2023 12:01:01 -0800 Subject: [PATCH 072/291] Adding new OIDC feature flags --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index e87d3c0..08289a6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -262,4 +262,5 @@ export API_GENERATED_DOCS_ENABLED=true #export FEATURE_FLAG_OVERRIDES_ENABLED=true #export PHONE_QUESTION_TYPE_ENABLED=true - +export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false +export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false From 9357b211a535c0fab3a512a5a6dedb1cd73fee1c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 15 Nov 2023 12:57:04 -0800 Subject: [PATCH 073/291] Set specific snapshot version --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 08289a6..930c80f 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-3ec176a-1700014879" # REQUIRED # Version of the infrastructure to use. From 4439ce64355671946c40e83f743858b9e270b205 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 15 Nov 2023 13:07:22 -0800 Subject: [PATCH 074/291] Set staging version back to latest --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 930c80f..08289a6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-3ec176a-1700014879" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From bcfe9fe848a76cce543a8bc672d30f5c503123c8 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 16 Nov 2023 08:19:56 -0800 Subject: [PATCH 075/291] Updating staging version --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 08289a6..930c80f 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-3ec176a-1700014879" # REQUIRED # Version of the infrastructure to use. From 40f43fa05bdfa7f197386e38049e9594414323ab Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 16 Nov 2023 08:20:41 -0800 Subject: [PATCH 076/291] Updating test version to v1.43 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 6e94c34..2e787ae 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.41.0" +export CIVIFORM_VERSION="v1.43.0" # REQUIRED # Version of the infrastructure to use. From 2ea8c3998ed1c2f4e648d0ae59db50a0f46d5a13 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 16 Nov 2023 09:43:39 -0800 Subject: [PATCH 077/291] Updating concurrency groups --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9ad947c..cc14f56 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,8 +29,7 @@ permissions: # Two probers running at once can break each other. concurrency: - group: stagingenvironment - cancel-in-progress: true + group: group-${{ github.event.inputs.environment || 'staging' }} jobs: deploy: From 2978e498b19ee697dd1a94cfbea6f187e81e5a4e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 16 Nov 2023 09:56:00 -0800 Subject: [PATCH 078/291] Adding run-name --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cc14f56..3f42db7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,5 @@ name: Seattle Deploy +run-name: Seattle Deploy for ${{ github.event.inputs.environment || 'staging' }} on: workflow_dispatch: From f1e8f1318f5d4d8468e5a2dbab832ab243d650d7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 21 Nov 2023 08:03:55 -0800 Subject: [PATCH 079/291] Setting staging back to 'latest' --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 930c80f..08289a6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-3ec176a-1700014879" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 445b4c535762365cc7c29461b28ae25a24699cf8 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 29 Nov 2023 11:26:35 -0800 Subject: [PATCH 080/291] Setting civiform version to v1.43.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index d6b189d..4cae4da 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.42.0" +export CIVIFORM_VERSION="v1.43.0" # REQUIRED # Version of the infrastructure to use. From 11ce5fd73f2f31d3339d3c413ca569430b1c427d Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 29 Nov 2023 15:06:13 -0800 Subject: [PATCH 081/291] Temp add DURABLE_JOBS_POLL_INTERVAL_SECONDS to long value --- civiform_config.test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2e787ae..f543ed6 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -14,6 +14,9 @@ # Global variables for all CiviForm deployments ################################################# +# TEMP SETTING WHILE RESTORING DATABASE +export DURABLE_JOBS_POLL_INTERVAL_SECONDS=5000 + # REQUIRED # One of prod, staging, or dev. export CIVIFORM_MODE="staging" From 79c15141cf5df96fc8f16fba67ac9f6831e8ab5f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 29 Nov 2023 17:05:03 -0800 Subject: [PATCH 082/291] Remove durable job temp setting --- civiform_config.test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index f543ed6..2e787ae 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -14,9 +14,6 @@ # Global variables for all CiviForm deployments ################################################# -# TEMP SETTING WHILE RESTORING DATABASE -export DURABLE_JOBS_POLL_INTERVAL_SECONDS=5000 - # REQUIRED # One of prod, staging, or dev. export CIVIFORM_MODE="staging" From e54b8435e1ad0c3cacf31cb68fca2c4ae1ba7d1b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 30 Nov 2023 14:39:24 -0800 Subject: [PATCH 083/291] Updating prod version. Enable applicant visible languages --- civiform_config.prod.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 4cae4da..a013955 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.43.0" +export CIVIFORM_VERSION="v1.44.0" # REQUIRED # Version of the infrastructure to use. @@ -258,8 +258,7 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" -# Don't need to bother with this until we have new languages -# export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true From 2e657c4138ecb9107b65ce351dac765063a2176d Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 30 Nov 2023 14:40:26 -0800 Subject: [PATCH 084/291] Enable applicant visible languages --- civiform_config.staging.sh | 3 +-- civiform_config.test.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 08289a6..18dd124 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -251,8 +251,7 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" -# Don't need to bother with this until we have new languages -# export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2e787ae..052b6af 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -255,6 +255,7 @@ export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags export FEATURE_FLAG_OVERRIDES_ENABLED=true From 252370e2da299c8c6bc4b0bd29e0df751d425462 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 5 Dec 2023 10:35:35 -0800 Subject: [PATCH 085/291] Updating test civiform version --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 052b6af..984451a 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.43.0" +export CIVIFORM_VERSION="v1.44.0" # REQUIRED # Version of the infrastructure to use. From 893bd742497afd94e6546c1cfcd74dd7c1f11cac Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 6 Dec 2023 15:17:29 -0800 Subject: [PATCH 086/291] Updating comment --- civiform_config.prod.sh | 2 +- civiform_config.staging.sh | 2 +- civiform_config.test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index a013955..e4cf269 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -86,7 +86,7 @@ export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattl # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# OPTIONAL +# REQUIRED export APPLICANT_PORTAL_NAME="Seattle" # OPTIONAL diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 18dd124..4daebdd 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -82,7 +82,7 @@ export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# OPTIONAL +# REQUIRED export APPLICANT_PORTAL_NAME="Seattle" # OPTIONAL diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 984451a..514e711 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -86,7 +86,7 @@ export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattl # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# OPTIONAL +# REQUIRED export APPLICANT_PORTAL_NAME="Seattle" # OPTIONAL From 04d39327fb06733fee8921af0ac369a98c561c36 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 6 Dec 2023 15:23:13 -0800 Subject: [PATCH 087/291] Updating civic entity short name for different environments --- bin/run-prober | 2 +- civiform_config.staging.sh | 4 ++-- civiform_config.test.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/run-prober b/bin/run-prober index aebd1bc..dfb8bfe 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -15,7 +15,7 @@ docker run \ -e TEST_USER_LOGIN="${TEST_USER_LOGIN}" \ -e TEST_USER_PASSWORD="${TEST_USER_PASSWORD}" \ -e TEST_USER_DISPLAY_NAME="TEST, UATAPP" \ - -e TEST_CIVIC_ENTITY_SHORT_NAME="Seattle" \ + -e TEST_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" \ -e DISABLE_BROWSER_ERROR_WATCHER=true \ -e DISABLE_SCREENSHOTS=false \ civiform/civiform-browser-test:latest \ diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 4daebdd..ebacb04 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -68,11 +68,11 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # REQUIRED # The short name for the civic entity. Ex. "Rochester" -export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" # REQUIRED # The full name for the civic entity. Ex. "City of Rochester" -export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle [STAGING]" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 514e711..6c26bfe 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -68,11 +68,11 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # REQUIRED # The short name for the civic entity. Ex. "Rochester" -export CIVIC_ENTITY_SHORT_NAME="Seattle" +export CIVIC_ENTITY_SHORT_NAME="Seattle [TEST]" # REQUIRED # The full name for the civic entity. Ex. "City of Rochester" -export CIVIC_ENTITY_FULL_NAME="City of Seattle" +export CIVIC_ENTITY_FULL_NAME="City of Seattle [TEST]" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov From 5d53e9e3a20111e0114ef7ddf803c9ebf61b3535 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 6 Dec 2023 15:25:50 -0800 Subject: [PATCH 088/291] Pull CIVIC_ENTITY_SHORT_NAME value for probers from env settings --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3f42db7..69aeb5e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -90,7 +90,7 @@ jobs: TEST_USER_LOGIN: ${{ secrets.TEST_USER_LOGIN }} TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }} TEST_USER_DISPLAY_NAME: 'TEST, UATAPP' - TEST_CIVIC_ENTITY_SHORT_NAME: 'Seattle' + TEST_CIVIC_ENTITY_SHORT_NAME: '${{ vars.CIVIC_ENTITY_SHORT_NAME }}' BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' uses: nick-fields/retry@v2 with: From 4dd3e0fe920b3d85aa78779e071390e17cf298db Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 11 Dec 2023 12:05:33 -0800 Subject: [PATCH 089/291] Enable caching of version, program, and questions --- civiform_config.prod.sh | 5 +++++ civiform_config.staging.sh | 5 +++++ civiform_config.test.sh | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index e4cf269..3798682 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -231,6 +231,11 @@ export ADFS_ADMIN_GROUP="f8c8e6c8-a5d7-4476-91bd-7f1691d16625" # Additional settings ################################################# +# Caching +export VERSION_CACHE_ENABLED=true +export PROGRAM_CACHE_ENABLED=true +export QUESTION_CACHE_ENABLED=true + # Prod overrides export POSTGRES_INSTANCE_CLASS="db.m5.large" diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index ebacb04..fb0eeed 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -227,6 +227,11 @@ export ADFS_ADMIN_GROUP="5909e7f3-3f4c-4ad1-93e8-17e6ba6ab8a3" # Additional settings ################################################# +# Caching +export VERSION_CACHE_ENABLED=true +export PROGRAM_CACHE_ENABLED=true +export QUESTION_CACHE_ENABLED=true + # API export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 6c26bfe..218a145 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -231,6 +231,11 @@ export ADFS_ADMIN_GROUP="5909e7f3-3f4c-4ad1-93e8-17e6ba6ab8a3" # Additional settings ################################################# +# Caching +export VERSION_CACHE_ENABLED=true +export PROGRAM_CACHE_ENABLED=true +export QUESTION_CACHE_ENABLED=true + # API export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false From f17cd5edc81f8b253ecbe3fa25fc5fee90959d03 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 13 Dec 2023 12:34:25 -0800 Subject: [PATCH 090/291] Updating test/prod version to v1.45 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 3798682..bf3da0b 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.44.0" +export CIVIFORM_VERSION="v1.45.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 218a145..b27e314 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.44.0" +export CIVIFORM_VERSION="v1.45.0" # REQUIRED # Version of the infrastructure to use. From acad5e216131679519047e4b4c69347c1ad7e8b5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 18 Dec 2023 08:30:27 -0800 Subject: [PATCH 091/291] Cleanup --- civiform_config.prod.sh | 9 ++------- civiform_config.staging.sh | 4 ---- civiform_config.test.sh | 10 +++------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index bf3da0b..077fccc 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -78,10 +78,6 @@ export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov export SUPPORT_EMAIL_ADDRESS="CiviForm@seattle.gov" -# 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 -export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" - # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" @@ -236,9 +232,6 @@ export VERSION_CACHE_ENABLED=true export PROGRAM_CACHE_ENABLED=true export QUESTION_CACHE_ENABLED=true -# Prod overrides -export POSTGRES_INSTANCE_CLASS="db.m5.large" - # API export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false @@ -269,3 +262,5 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true +# Prod overrides +export POSTGRES_INSTANCE_CLASS="db.m5.large" diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index fb0eeed..c1c78c0 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -262,9 +262,5 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true -# I think these are obsolete -#export FEATURE_FLAG_OVERRIDES_ENABLED=true -#export PHONE_QUESTION_TYPE_ENABLED=true - export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false diff --git a/civiform_config.test.sh b/civiform_config.test.sh index b27e314..92c7e05 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -78,10 +78,6 @@ export CIVIC_ENTITY_FULL_NAME="City of Seattle [TEST]" # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" -# 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 -export CIVIC_ENTITY_LOGO_WITH_NAME_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-long-logo.png" - # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" @@ -263,8 +259,8 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags -export FEATURE_FLAG_OVERRIDES_ENABLED=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export PHONE_QUESTION_TYPE_ENABLED=true export APPLICATION_EXPORTABLE=true - +export API_GENERATED_DOCS_ENABLED=true +export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true +export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true From a7c9d8eb207edd3c6e731dc1cd74a1a1a9a01319 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 18 Dec 2023 08:36:59 -0800 Subject: [PATCH 092/291] Cleanup --- civiform_config.prod.sh | 10 +++++++--- civiform_config.staging.sh | 8 ++++++-- civiform_config.test.sh | 4 ++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 077fccc..382c9e9 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -146,6 +146,10 @@ export MONITORING_STACK_ENABLED=false # REQUIRED export AWS_REGION="us-west-2" +# OPTIONAL +# Database size +export POSTGRES_INSTANCE_CLASS="db.m5.large" + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and underscores @@ -261,6 +265,6 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl # Feature Flags export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true - -# Prod overrides -export POSTGRES_INSTANCE_CLASS="db.m5.large" +export API_GENERATED_DOCS_ENABLED=true +export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false +export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c1c78c0..e74c880 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -146,6 +146,10 @@ export MONITORING_STACK_ENABLED=false # REQUIRED export AWS_REGION="us-west-2" +# OPTIONAL +# Database size +export POSTGRES_INSTANCE_CLASS="db.t3.micro" + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-staging" # max 19 chars, only numbers, letters, dashes, and underscores @@ -262,5 +266,5 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true -export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false -export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false +export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true +export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 92c7e05..d3aa6ae 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -146,6 +146,10 @@ export MONITORING_STACK_ENABLED=false # REQUIRED export AWS_REGION="us-west-2" +# OPTIONAL +# Database size +export POSTGRES_INSTANCE_CLASS="db.t3.micro" + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and underscores From 61314e843346bf34b00329e7fd881a8ffc130a69 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 18 Dec 2023 08:38:19 -0800 Subject: [PATCH 093/291] Adding NEW_APPLICANT_URL_SCHEMA_ENABLED feature flag --- civiform_config.prod.sh | 1 + civiform_config.staging.sh | 1 + civiform_config.test.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 382c9e9..6d7acf9 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -268,3 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false +export NEW_APPLICANT_URL_SCHEMA_ENABLED=false diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index e74c880..1356dfd 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -268,3 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true +export NEW_APPLICANT_URL_SCHEMA_ENABLED=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index d3aa6ae..da88a13 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -268,3 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true +export NEW_APPLICANT_URL_SCHEMA_ENABLED=false From 91a52f35fc8d048ca101f52f5b32d2c5ac838260 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Jan 2024 11:16:57 -0800 Subject: [PATCH 094/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1356dfd..f8f7c62 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -268,4 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true -export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export NEW_APPLICANT_URL_SCHEMA_ENABLED=false From a80a1dc471f8f163503927d5dd2273753ed1f4be Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 5 Jan 2024 16:09:05 -0800 Subject: [PATCH 095/291] Re-enable New applicant url format --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index f8f7c62..1356dfd 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -268,4 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true -export NEW_APPLICANT_URL_SCHEMA_ENABLED=false +export NEW_APPLICANT_URL_SCHEMA_ENABLED=true From bac4bbeb5ede4c56ca34e45e4152872121d7fe5e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 8 Jan 2024 07:43:22 -0800 Subject: [PATCH 096/291] Disable NEW_APPLICANT_URL_SCHEMA_ENABLED For testing --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1356dfd..f8f7c62 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -268,4 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true -export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export NEW_APPLICANT_URL_SCHEMA_ENABLED=false From 30f18242148d38de8a66256bdf3eae301a823ace Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 8 Jan 2024 08:22:58 -0800 Subject: [PATCH 097/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index f8f7c62..1356dfd 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -268,4 +268,4 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true -export NEW_APPLICANT_URL_SCHEMA_ENABLED=false +export NEW_APPLICANT_URL_SCHEMA_ENABLED=true From ac6cbc60d297718214a446594ed3eeb4ca72f31a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Jan 2024 06:11:48 -0800 Subject: [PATCH 098/291] Update prod staging url --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 6d7acf9..86250b2 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -122,7 +122,7 @@ export STAGING_ADD_NOINDEX_META_TAG=false # The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" export BASE_URL="https://civiform.seattle.gov" -export STAGING_HOSTNAME="civiform.seattle.gov" +export STAGING_HOSTNAME="civiformstage.seattle.gov" # OPTIONAL # The time zone to be used when rendering any times within the CiviForm From 2a0932fc63aaf51d8d5f19e1eec8c20830d07802 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 10 Jan 2024 10:32:24 -0800 Subject: [PATCH 099/291] Adding UNIVERSAL_QUESTIONS flag to config files --- civiform_config.prod.sh | 1 + civiform_config.staging.sh | 1 + civiform_config.test.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 86250b2..816984e 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -269,3 +269,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false export NEW_APPLICANT_URL_SCHEMA_ENABLED=false +export UNIVERSAL_QUESTIONS=false diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1356dfd..43a5987 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -269,3 +269,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export UNIVERSAL_QUESTIONS=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index da88a13..3e75e28 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -269,3 +269,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=false +export UNIVERSAL_QUESTIONS=false From 87850914d00ccc20a4c155d49ebcfa321fedf3ab Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:15:58 -0800 Subject: [PATCH 100/291] Adding script to test gis status --- bin/test_gis.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100755 bin/test_gis.sh diff --git a/bin/test_gis.sh b/bin/test_gis.sh new file mode 100755 index 0000000..f39f993 --- /dev/null +++ b/bin/test_gis.sh @@ -0,0 +1,59 @@ +#! /usr/bin/env bash + +# DOC: Test seattle gis servers + +pushd "$(git rev-parse --show-toplevel)" > /dev/null + +set -e +set +x + +function test_url { + local url="${1}" + local jq_array_path="${2}" + local expected_array_size="${3}" + + response="$(curl \ + -H "User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:121.0) Gecko/20100101 Firefox/121.0" \ + -H "Accept: application/json" \ + -H "DNT: 1" \ + -H "Connection: keep-alive" \ + -H "Pragma: no-cache" \ + -H "Cache-Control: no-cache" \ + --retry 0 \ + --silent \ + "${url}")" + + if ! jq --exit-status . >/dev/null 2>&1 <<<"${response}"; then + echo "Failed to parse response" + echo "--------------------------------------------------------------------" + echo "${response}" + exit 1 + # else + # echo "Valid JSON" + fi + + actual_array_size="$(jq "${jq_array_path} | length" <<<"${response}")" + + if [[ "${expected_array_size}" != "${actual_array_size:0:1}" ]]; then + echo "Did not get the expected result count. Expected |${expected_array_size}|. Actual |${actual_array_size}|" + echo "--------------------------------------------------------------------" + echo "${response}" | jq + exit 1 + # else + # echo "General array counts match" + fi +} + +echo "Test findAddressCandidates" +findAddressCandidatesUrl="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates?Address=700+5th+Ave&City=Seattle&Region=WA&Postal=98101&f=pjson" +test_url "${findAddressCandidatesUrl}" ".candidates" 3 + +echo "Test serviceArea" +serviceAreaUrl="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query?geometryType=esriGeometryPoint&outFields=*&returnGeometry=false&f=json&inSR=2926&maxLocations=3&geometry={''x'':1271253,''y'':224277,''spatialReference'':2926}" +test_url "${serviceAreaUrl}" ".fields" 8 + +echo "Test ssl certficate" +echo | openssl s_client -servername gisdata.seattle.gov -connect gisdata.seattle.gov:443 +echo $? + + From 56727f819da6412cc1cec7759680498abcb04575 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:19:23 -0800 Subject: [PATCH 101/291] Create test_gis.yml --- .github/workflows/test_gis.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/test_gis.yml diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml new file mode 100644 index 0000000..d36144d --- /dev/null +++ b/.github/workflows/test_gis.yml @@ -0,0 +1,20 @@ +name: Test GIS + +on: + workflow_dispatch: + + # schedule: + # - cron: '0 12 1/1 * *' + +permissions: read + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Run deployment with latest on ${{ env.ENVIRONMENT }} + run: bin/test_gis.sh From 3017a9308712eba106ff74451965ec4035eb67eb Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:44:57 -0800 Subject: [PATCH 102/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index d36144d..a4d8228 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -6,7 +6,7 @@ on: # schedule: # - cron: '0 12 1/1 * *' -permissions: read +permissions: {} jobs: deploy: From f8775580c3baef994766df660e213b873475434a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:47:07 -0800 Subject: [PATCH 103/291] Clean up and change value to test --- bin/test_gis.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index f39f993..67e59ab 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -13,13 +13,6 @@ function test_url { local expected_array_size="${3}" response="$(curl \ - -H "User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:121.0) Gecko/20100101 Firefox/121.0" \ - -H "Accept: application/json" \ - -H "DNT: 1" \ - -H "Connection: keep-alive" \ - -H "Pragma: no-cache" \ - -H "Cache-Control: no-cache" \ - --retry 0 \ --silent \ "${url}")" @@ -54,6 +47,4 @@ test_url "${serviceAreaUrl}" ".fields" 8 echo "Test ssl certficate" echo | openssl s_client -servername gisdata.seattle.gov -connect gisdata.seattle.gov:443 -echo $? - From 3265e8b40b86cf15cd60687cf3793a920e7420f6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:47:33 -0800 Subject: [PATCH 104/291] Clean up and change value to test --- bin/test_gis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index 67e59ab..f6cdc63 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -39,7 +39,7 @@ function test_url { echo "Test findAddressCandidates" findAddressCandidatesUrl="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates?Address=700+5th+Ave&City=Seattle&Region=WA&Postal=98101&f=pjson" -test_url "${findAddressCandidatesUrl}" ".candidates" 3 +test_url "${findAddressCandidatesUrl}" ".candidates" 4 echo "Test serviceArea" serviceAreaUrl="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query?geometryType=esriGeometryPoint&outFields=*&returnGeometry=false&f=json&inSR=2926&maxLocations=3&geometry={''x'':1271253,''y'':224277,''spatialReference'':2926}" From d6aa03a068ab59dbc9584badbdca6d5a0789f2ed Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:49:00 -0800 Subject: [PATCH 105/291] Test test back to passing --- bin/test_gis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index f6cdc63..67e59ab 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -39,7 +39,7 @@ function test_url { echo "Test findAddressCandidates" findAddressCandidatesUrl="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates?Address=700+5th+Ave&City=Seattle&Region=WA&Postal=98101&f=pjson" -test_url "${findAddressCandidatesUrl}" ".candidates" 4 +test_url "${findAddressCandidatesUrl}" ".candidates" 3 echo "Test serviceArea" serviceAreaUrl="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query?geometryType=esriGeometryPoint&outFields=*&returnGeometry=false&f=json&inSR=2926&maxLocations=3&geometry={''x'':1271253,''y'':224277,''spatialReference'':2926}" From a9ddba1e258cee3a2f5fbcd3dfddacbeb5ad9887 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 10:51:08 -0800 Subject: [PATCH 106/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index a4d8228..e63c5bd 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -1,20 +1,19 @@ name: Test GIS on: - workflow_dispatch: - - # schedule: - # - cron: '0 12 1/1 * *' + workflow_dispatch: {} + schedule: + - cron: '0 * * * *' permissions: {} jobs: - deploy: + test-gis: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 - - name: Run deployment with latest on ${{ env.ENVIRONMENT }} + - name: Run gis testing script run: bin/test_gis.sh From 5f11a8db81bee086cf9ea46fca1654630d089a04 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:31:24 -0800 Subject: [PATCH 107/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index e63c5bd..a51eb9e 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -17,3 +17,9 @@ jobs: - name: Run gis testing script run: bin/test_gis.sh + + - name: Send message to ms teams + uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 + with: + webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' + message: 'test message!' From 8bd19d3cdb1d96dc7993f3b2c30aa98cf5bc358b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:36:14 -0800 Subject: [PATCH 108/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index a51eb9e..afd25de 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -18,8 +18,9 @@ jobs: - name: Run gis testing script run: bin/test_gis.sh - - name: Send message to ms teams - uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 + - name: Send message to ms teams + if: failure() + uses: dhollerbach/actions.send-message-to-ms-teams@v3 with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' - message: 'test message!' + message: 'Testing GIS failed. There *may* be issues afoot. <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>' From dc3137a58d52c78dccf8e5a25a221ea86d0ac3ff Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:36:43 -0800 Subject: [PATCH 109/291] Update test_gis.sh --- bin/test_gis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index 67e59ab..f6cdc63 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -39,7 +39,7 @@ function test_url { echo "Test findAddressCandidates" findAddressCandidatesUrl="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates?Address=700+5th+Ave&City=Seattle&Region=WA&Postal=98101&f=pjson" -test_url "${findAddressCandidatesUrl}" ".candidates" 3 +test_url "${findAddressCandidatesUrl}" ".candidates" 4 echo "Test serviceArea" serviceAreaUrl="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query?geometryType=esriGeometryPoint&outFields=*&returnGeometry=false&f=json&inSR=2926&maxLocations=3&geometry={''x'':1271253,''y'':224277,''spatialReference'':2926}" From a8ce75fb550f045a7979798a4c283d65b164ddc5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:41:10 -0800 Subject: [PATCH 110/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index afd25de..44e2066 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -20,7 +20,7 @@ jobs: - name: Send message to ms teams if: failure() - uses: dhollerbach/actions.send-message-to-ms-teams@v3 + uses: dhollerbach/github-action-send-message-to-ms-teams@v3 with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' - message: 'Testing GIS failed. There *may* be issues afoot. <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>' + message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' From 652b6444ee092c8bb5c6415007694cb2ef0194fb Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:43:58 -0800 Subject: [PATCH 111/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index 44e2066..beae80b 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -19,8 +19,14 @@ jobs: run: bin/test_gis.sh - name: Send message to ms teams - if: failure() + if: success() uses: dhollerbach/github-action-send-message-to-ms-teams@v3 with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' + + - name: Send message to Microsoft Teams + uses: dhollerbach/github-action-send-message-to-ms-teams@v3 + with: + webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' + message: 'test!' From bdb198c1aa93232c6a3beb1bb3b297c7f0aeb2e0 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:46:55 -0800 Subject: [PATCH 112/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index beae80b..4c58a18 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -15,15 +15,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Run gis testing script - run: bin/test_gis.sh + #- name: Run gis testing script + # run: bin/test_gis.sh - - name: Send message to ms teams - if: success() - uses: dhollerbach/github-action-send-message-to-ms-teams@v3 - with: - webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' - message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' + #- name: Send message to ms teams + # if: success() + # uses: dhollerbach/github-action-send-message-to-ms-teams@v3 + # with: + # webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' + # message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' - name: Send message to Microsoft Teams uses: dhollerbach/github-action-send-message-to-ms-teams@v3 From 596b3ecdabd27175de5a7bc0c910649e5c7b276c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:50:12 -0800 Subject: [PATCH 113/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index 4c58a18..26bfefc 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -5,7 +5,7 @@ on: schedule: - cron: '0 * * * *' -permissions: {} +permissions: read-all jobs: test-gis: From dee1c397423298b4651011c59defeee37f5093c2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:52:34 -0800 Subject: [PATCH 114/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index 26bfefc..aa87d67 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -5,7 +5,7 @@ on: schedule: - cron: '0 * * * *' -permissions: read-all +permissions: {} jobs: test-gis: @@ -15,18 +15,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 - #- name: Run gis testing script - # run: bin/test_gis.sh + - name: Run gis testing script + run: bin/test_gis.sh - #- name: Send message to ms teams - # if: success() - # uses: dhollerbach/github-action-send-message-to-ms-teams@v3 - # with: - # webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' - # message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' - - - name: Send message to Microsoft Teams - uses: dhollerbach/github-action-send-message-to-ms-teams@v3 + - name: Send message to ms teams + if: success() + uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' - message: 'test!' + message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' From 40dfaee8c88d4e3a5f17e1a4f39a6217eefdb1cc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 11:55:35 -0800 Subject: [PATCH 115/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index aa87d67..627bab9 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -19,7 +19,7 @@ jobs: run: bin/test_gis.sh - name: Send message to ms teams - if: success() + if: failure() uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' From 4b84e8a6e8059312abad16f2b321b8eda608e044 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Jan 2024 12:11:10 -0800 Subject: [PATCH 116/291] Update test_gis.sh --- bin/test_gis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index f6cdc63..67e59ab 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -39,7 +39,7 @@ function test_url { echo "Test findAddressCandidates" findAddressCandidatesUrl="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates?Address=700+5th+Ave&City=Seattle&Region=WA&Postal=98101&f=pjson" -test_url "${findAddressCandidatesUrl}" ".candidates" 4 +test_url "${findAddressCandidatesUrl}" ".candidates" 3 echo "Test serviceArea" serviceAreaUrl="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query?geometryType=esriGeometryPoint&outFields=*&returnGeometry=false&f=json&inSR=2926&maxLocations=3&geometry={''x'':1271253,''y'':224277,''spatialReference'':2926}" From 7f119b77ceada65f2fd65260f7e8d723dd4ff5f1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 16 Jan 2024 07:20:55 -0800 Subject: [PATCH 117/291] Updating prod/test configs to use v1.46.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 816984e..bfcdb0c 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.45.0" +export CIVIFORM_VERSION="v1.46.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 3e75e28..a24f338 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.45.0" +export CIVIFORM_VERSION="v1.46.0" # REQUIRED # Version of the infrastructure to use. From 36b38d2ecc25d113d7e195756e1e9ff0ba5d28b9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 22 Jan 2024 09:11:05 -0800 Subject: [PATCH 118/291] Ignore tar files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3dd43bd..c665389 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store .idea *.log +*.tar tmp/ nuke.yaml # this file is created by developers when working on the deployment system. see https://docs.civiform.us/contributor-guide/developer-guide/deploy-system/prerequisites#setup-aws-nuke checkout/ From 4de3b7285382a58c89fe84c2b0e6bc2478578120 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 24 Jan 2024 11:29:12 -0800 Subject: [PATCH 119/291] Adding IDCS_DISCOVERY_URI --- civiform_config.staging.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 43a5987..2673b04 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -174,6 +174,7 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" +export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. From e74e79dfb63da0c9fbea72f81e57e183a226a493 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 24 Jan 2024 11:38:22 -0800 Subject: [PATCH 120/291] Updating staging auth location. Testing. --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 2673b04..dea66d9 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -174,7 +174,8 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" -export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" +#export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" +export IDCS_DISCOVERY_URI="https://idcs-3359adb31e35415e8c1729c5c8098c6d.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. From 0290bf7ca48aecd588ee5fd21ecddb05ccb02c73 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 24 Jan 2024 11:52:11 -0800 Subject: [PATCH 121/291] Adding IDCS_DISCOVERY_URI to deal with configuration issues --- civiform_config.prod.sh | 1 + civiform_config.staging.sh | 3 +-- civiform_config.test.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index bfcdb0c..23dd559 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -174,6 +174,7 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-3359adb31e35415e8c1729c5c8098c6d.identity.oraclecloud.com/.well-known/openid-configuration" +export IDCS_DISCOVERY_URI="https://idcs-3359adb31e35415e8c1729c5c8098c6d.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index dea66d9..2673b04 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -174,8 +174,7 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" -#export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" -export IDCS_DISCOVERY_URI="https://idcs-3359adb31e35415e8c1729c5c8098c6d.identity.oraclecloud.com/.well-known/openid-configuration" +export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index a24f338..0011ac8 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -174,6 +174,7 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" +export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. From 3509f74ff32690873f9314f136b248b3fcebbbb9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 24 Jan 2024 11:59:47 -0800 Subject: [PATCH 122/291] Updating to version v1.48.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 23dd559..37123bc 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.46.0" +export CIVIFORM_VERSION="v1.48.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 0011ac8..1f34dec 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.46.0" +export CIVIFORM_VERSION="v1.48.0" # REQUIRED # Version of the infrastructure to use. From a4e0e7253d0e24309a7af4254a72e78d2ab1e9c9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 24 Jan 2024 12:44:54 -0800 Subject: [PATCH 123/291] Removing IDCS_DISCOVERY_URI --- civiform_config.staging.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 2673b04..43a5987 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -174,7 +174,6 @@ export APPLICANT_OIDC_PROVIDER_NAME="OidcClient" # The discovery metadata URI provideded by the OIDC provider. # Usually ends in .well-known/openid-configuration export APPLICANT_OIDC_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" -export IDCS_DISCOVERY_URI="https://idcs-f582fefb879b4db5a88a370e8f2f6013.identity.oraclecloud.com/.well-known/openid-configuration" # OPTIONAL # The type of OIDC flow to execute, and how the data is encoded. From d2ba86bd3cb602679bcc8ceb0401307b1b39a4d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 22:09:43 +0000 Subject: [PATCH 124/291] Update slackapi/slack-github-action action to v1.25.0 --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/slack-notification-tester.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 69aeb5e..3cb7492 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,7 +53,7 @@ jobs: steps: - name: Notify Slack Start - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.25.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" @@ -101,7 +101,7 @@ jobs: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.25.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index 166ad4e..4da202f 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.25.0 with: channel-id: 'C03UXPUEXU4' slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" From c2f091b6340e09ee4f14bc221f3bc7444d766fe6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Jan 2024 08:44:59 -0800 Subject: [PATCH 125/291] Updating fargate min count --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 37123bc..20e7270 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -155,7 +155,7 @@ export POSTGRES_INSTANCE_CLASS="db.m5.large" export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and underscores export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" -export FARGATE_DESIRED_TASK_COUNT=1 +export FARGATE_DESIRED_TASK_COUNT=2 # REQUIRED # Which auth provider to use for applicants to login. From 34d4972932d301a7fbdd1c4e0bbb13f8d2a19161 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Jan 2024 09:54:34 -0800 Subject: [PATCH 126/291] Adding min scale target --- civiform_config.prod.sh | 1 + civiform_config.staging.sh | 1 + civiform_config.test.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 20e7270..09ace9f 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -156,6 +156,7 @@ export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and u export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" export FARGATE_DESIRED_TASK_COUNT=2 +export ECS_SCALE_TARGET_MIN_CAPACITY=2 # REQUIRED # Which auth provider to use for applicants to login. diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 43a5987..1cdabe5 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -156,6 +156,7 @@ export APP_PREFIX="cf-staging" # max 19 chars, only numbers, letters, dashes, an export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" export FARGATE_DESIRED_TASK_COUNT=1 +export ECS_SCALE_TARGET_MIN_CAPACITY=1 # REQUIRED # Which auth provider to use for applicants to login. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 1f34dec..2c804b9 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -156,6 +156,7 @@ export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and u export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" export FARGATE_DESIRED_TASK_COUNT=1 +export ECS_SCALE_TARGET_MIN_CAPACITY=1 # REQUIRED # Which auth provider to use for applicants to login. From b4c8c6a0d63c5a7dd298e636d4be4186b9150f94 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 1 Feb 2024 14:01:08 -0800 Subject: [PATCH 127/291] Setting staging retention days to 3 --- civiform_config.staging.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1cdabe5..c21639c 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -150,6 +150,10 @@ export AWS_REGION="us-west-2" # Database size export POSTGRES_INSTANCE_CLASS="db.t3.micro" +# OPTIONAL +# Number of days to keep backups +export POSTGRES_BACKUP_RETENTION_DAYS=3 + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-staging" # max 19 chars, only numbers, letters, dashes, and underscores From 90a769bec1ce47fee958d42db5f3f7a5d647f694 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 1 Feb 2024 14:09:26 -0800 Subject: [PATCH 128/291] Setting test db retention to 5 days. Add the default for prod. --- civiform_config.prod.sh | 4 ++++ civiform_config.test.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 09ace9f..f3c05ac 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -150,6 +150,10 @@ export AWS_REGION="us-west-2" # Database size export POSTGRES_INSTANCE_CLASS="db.m5.large" +# OPTIONAL +# Number of days to keep backups +export POSTGRES_BACKUP_RETENTION_DAYS=7 + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and underscores diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2c804b9..ef53c38 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -150,6 +150,10 @@ export AWS_REGION="us-west-2" # Database size export POSTGRES_INSTANCE_CLASS="db.t3.micro" +# OPTIONAL +# Number of days to keep backups +export POSTGRES_BACKUP_RETENTION_DAYS=5 + # REQUIRED # The name to prefix all resources with. export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and underscores From 840034a36fed7e6391b1f644b4549e05795ab25c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 6 Feb 2024 12:48:32 -0800 Subject: [PATCH 129/291] Update test civiform versio to v1.50.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index ef53c38..9348176 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.48.0" +export CIVIFORM_VERSION="v1.50.0" # REQUIRED # Version of the infrastructure to use. From 4b30bb4ab1e49d0da33c22bf17558924a0318b63 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 6 Feb 2024 13:12:40 -0800 Subject: [PATCH 130/291] Update prod civiform version to v1.50.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index f3c05ac..45b429a 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.48.0" +export CIVIFORM_VERSION="v1.50.0" # REQUIRED # Version of the infrastructure to use. From 4e8d9b9fe6e0229918b7205be0a88d82c3b46c2e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 15 Feb 2024 09:22:25 -0800 Subject: [PATCH 131/291] Fix name of support email variable --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 9348176..8f0aeda 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -76,7 +76,7 @@ export CIVIC_ENTITY_FULL_NAME="City of Seattle [TEST]" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export CIVIC_ENTITY_SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" +export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" # REQUIRED # A link to an image of the civic entity logo, to be used on the login page From 0148d1ca8b9f40cdfc6c6d6aca7fe66a012a34ab Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 22 Feb 2024 09:57:15 -0800 Subject: [PATCH 132/291] Enable metrics in Prod --- civiform_config.prod.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 45b429a..a2e510d 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -133,10 +133,10 @@ export CIVIFORM_TIME_ZONE_ID="America/Los_Angeles" # OPTIONAL # If enabled, allows exporting Prometheus server metrics over HTTP at "/metrics" # Defaults to false. -export CIVIFORM_SERVER_METRICS_ENABLED=false +export CIVIFORM_SERVER_METRICS_ENABLED=true # Don't deploy of Prometheus and Graphana -export MONITORING_STACK_ENABLED=false +export MONITORING_STACK_ENABLED=true ################################################# From 2ef427ede8a1dcf153fee7b60e9a1b0975906dc7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 22 Feb 2024 10:16:28 -0800 Subject: [PATCH 133/291] Updating flags --- civiform_config.prod.sh | 7 ++++--- civiform_config.staging.sh | 1 + civiform_config.test.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index a2e510d..7b44f87 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -272,7 +272,8 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true -export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=false -export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=false -export NEW_APPLICANT_URL_SCHEMA_ENABLED=false +export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true +export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true +export NEW_APPLICANT_URL_SCHEMA_ENABLED=true export UNIVERSAL_QUESTIONS=false +export PROGRAM_CARD_IMAGES=false diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c21639c..4ae912d 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -275,3 +275,4 @@ export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true export UNIVERSAL_QUESTIONS=true +export PROGRAM_CARD_IMAGES=true diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 8f0aeda..9167e8b 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -274,5 +274,6 @@ export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true -export NEW_APPLICANT_URL_SCHEMA_ENABLED=false -export UNIVERSAL_QUESTIONS=false +export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export UNIVERSAL_QUESTIONS=true +export PROGRAM_CARD_IMAGES=true From b911df92c9fa2a2159d1e0f85ac65d0f280996b8 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 22 Feb 2024 11:10:02 -0800 Subject: [PATCH 134/291] Update test staging hostname --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 9167e8b..fb551c9 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -122,7 +122,7 @@ export STAGING_ADD_NOINDEX_META_TAG=true # The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" export BASE_URL="https://civiformtest.seattle.gov" -export STAGING_HOSTNAME="civiformtest.seattle.gov" +export STAGING_HOSTNAME="civiformstage.seattle.gov" # OPTIONAL # The time zone to be used when rendering any times within the CiviForm From c6d1d0d15dfa3ef2ea424fa50254ad0382d03958 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 22 Feb 2024 11:11:32 -0800 Subject: [PATCH 135/291] Updating test civiform version --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index fb551c9..79c3712 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.50.0" +export CIVIFORM_VERSION="v1.52.0" # REQUIRED # Version of the infrastructure to use. From dd236a356afd0606b322f0613deaef03a69ae0c2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 22 Feb 2024 11:31:09 -0800 Subject: [PATCH 136/291] Updating prod version --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 7b44f87..ba02db5 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.50.0" +export CIVIFORM_VERSION="v1.52.0" # REQUIRED # Version of the infrastructure to use. From a9f9f48ea461ef005697e5181f4730783ae177b5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 27 Feb 2024 11:06:02 -0800 Subject: [PATCH 137/291] Update deploy.yml --- .github/workflows/deploy.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3cb7492..f1403d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -92,12 +92,28 @@ jobs: TEST_USER_DISPLAY_NAME: 'TEST, UATAPP' TEST_CIVIC_ENTITY_SHORT_NAME: '${{ vars.CIVIC_ENTITY_SHORT_NAME }}' BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' - uses: nick-fields/retry@v2 + run: bin/run-prober + + - name: Upload image diff outputs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: image diff output directory + path: browser-test/diff_output + + - name: Upload updated snapshots + if: failure() + uses: actions/upload-artifact@v4 + with: + name: updated snapshots output directory + path: browser-test/updated_snapshots + + - name: Upload test videos and traces on failure + if: failure() + uses: actions/upload-artifact@v4 with: - timeout_minutes: 70 - max_attempts: 1 - retry_wait_seconds: 30 - command: bin/run-prober + name: tests videos and traces + path: browser-test/tmp - name: Notify Slack Complete if: always() From 650d54b0fc428aaacb2bde587578dc1444a82485 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 29 Feb 2024 13:12:11 -0800 Subject: [PATCH 138/291] Updating ssl arn --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 4ae912d..10a5540 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -158,7 +158,7 @@ export POSTGRES_BACKUP_RETENTION_DAYS=3 # The name to prefix all resources with. export APP_PREFIX="cf-staging" # max 19 chars, only numbers, letters, dashes, and underscores -export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/c62046c2-ac1c-4131-8a1d-3c91d2b81a21" export FARGATE_DESIRED_TASK_COUNT=1 export ECS_SCALE_TARGET_MIN_CAPACITY=1 From 384ea4ff1a3db8bfdcddb7c9bcd1107705649eae Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 29 Feb 2024 13:25:43 -0800 Subject: [PATCH 139/291] Updating ssl cert arn and updated the version for test and prod. --- civiform_config.prod.sh | 4 ++-- civiform_config.test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index ba02db5..5cf2430 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.52.0" +export CIVIFORM_VERSION="v1.53.0" # REQUIRED # Version of the infrastructure to use. @@ -158,7 +158,7 @@ export POSTGRES_BACKUP_RETENTION_DAYS=7 # The name to prefix all resources with. export APP_PREFIX="cf-prod" # max 19 chars, only numbers, letters, dashes, and underscores -export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/c62046c2-ac1c-4131-8a1d-3c91d2b81a21" export FARGATE_DESIRED_TASK_COUNT=2 export ECS_SCALE_TARGET_MIN_CAPACITY=2 diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 79c3712..e81b856 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.52.0" +export CIVIFORM_VERSION="v1.53.0" # REQUIRED # Version of the infrastructure to use. @@ -158,7 +158,7 @@ export POSTGRES_BACKUP_RETENTION_DAYS=5 # The name to prefix all resources with. export APP_PREFIX="cf-test" # max 19 chars, only numbers, letters, dashes, and underscores -export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/fc9201c7-c715-4c8e-bd1f-a20ae1828e8f" +export SSL_CERTIFICATE_ARN="arn:aws:acm:us-west-2:405662711265:certificate/c62046c2-ac1c-4131-8a1d-3c91d2b81a21" export FARGATE_DESIRED_TASK_COUNT=1 export ECS_SCALE_TARGET_MIN_CAPACITY=1 From c2ef7837388c9163bdf5da7f803d6c03dadc5731 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 5 Mar 2024 14:18:16 -0800 Subject: [PATCH 140/291] Update artifact path --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f1403d8..f52762a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -99,21 +99,21 @@ jobs: uses: actions/upload-artifact@v4 with: name: image diff output directory - path: browser-test/diff_output + path: diff_output - name: Upload updated snapshots if: failure() uses: actions/upload-artifact@v4 with: name: updated snapshots output directory - path: browser-test/updated_snapshots + path: updated_snapshots - name: Upload test videos and traces on failure if: failure() uses: actions/upload-artifact@v4 with: name: tests videos and traces - path: browser-test/tmp + path: tmp - name: Notify Slack Complete if: always() From f0095ef6b43b3370c756fd3d882ee559e33f5cae Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 11 Mar 2024 07:57:57 -0700 Subject: [PATCH 141/291] Updating to v1.54.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 5cf2430..b869a18 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.53.0" +export CIVIFORM_VERSION="v1.54.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e81b856..53a803f 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.53.0" +export CIVIFORM_VERSION="v1.54.0" # REQUIRED # Version of the infrastructure to use. From a6b0d2bd9efd1cadd9d8e63418e84c945a2d6ef1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 15 Mar 2024 15:47:04 -0700 Subject: [PATCH 142/291] Mount test tmp volume --- bin/run-prober | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/run-prober b/bin/run-prober index dfb8bfe..11c3e9f 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -9,6 +9,7 @@ docker pull civiform/civiform-browser-test:latest export RECORD_VIDEO=0 docker run \ + -v "$(pwd)/tmp:/usr/src/civiform-browser-tests/tmp" \ -e BASE_URL="${BASE_URL}" \ -e RECORD_VIDEO="${RECORD_VIDEO}" \ -e TEST_USER_AUTH_STRATEGY="seattle-staging" \ From 77ec771fed4af35102c3aada7d4e7948b4c151c7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 20 Mar 2024 11:06:10 -0700 Subject: [PATCH 143/291] Update test/prod configs to v1.56.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index b869a18..34dd821 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.54.0" +export CIVIFORM_VERSION="v1.56.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 53a803f..d3fb260 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.54.0" +export CIVIFORM_VERSION="v1.56.0" # REQUIRED # Version of the infrastructure to use. From f3ff1c19018586f21dcc25b5ea10042dc9610588 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 26 Mar 2024 11:17:56 -0700 Subject: [PATCH 144/291] Update civiform_config.prod.sh --- civiform_config.prod.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 34dd821..5011878 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -275,5 +275,3 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export UNIVERSAL_QUESTIONS=false -export PROGRAM_CARD_IMAGES=false From 6c9015aea76469f890c94ba051514b482e65696f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 26 Mar 2024 11:18:18 -0700 Subject: [PATCH 145/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 10a5540..a29c379 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -274,5 +274,3 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export UNIVERSAL_QUESTIONS=true -export PROGRAM_CARD_IMAGES=true From 4f2be9c029a6975169f90ee8fe41f6f3a5b16efc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 26 Mar 2024 11:18:34 -0700 Subject: [PATCH 146/291] Update civiform_config.test.sh --- civiform_config.test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index d3fb260..e9cc335 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -275,5 +275,3 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export UNIVERSAL_QUESTIONS=true -export PROGRAM_CARD_IMAGES=true From 84120e7fa67f1495802e2180fbbaf017a50082f0 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 2 Apr 2024 14:29:45 -0400 Subject: [PATCH 147/291] update var name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f52762a..4ad5381 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: env: SKIP_CONFIRMATIONS: true - SKIP_TAG_CHECK: true + SKIP_USER_INPUT: true SLACK_CHANNEL: 'C03UXPUEXU4' # When run by the schedule github.event.inputs are not set. It's easier to normalize these here into environment variables # than to have the extra logic all over and duplicated. From e060cd751234b8e1505dceec7a42394f972571a3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Apr 2024 05:54:39 -0700 Subject: [PATCH 148/291] Don't run northstar tests --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index 11c3e9f..07899d2 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -20,4 +20,4 @@ docker run \ -e DISABLE_BROWSER_ERROR_WATCHER=true \ -e DISABLE_SCREENSHOTS=false \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test" + -c "npm install && npm test -- --grep-invert @northstar $@" From e8088435f2edfd4689c1d11736e9894c396cffec Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Apr 2024 07:04:32 -0700 Subject: [PATCH 149/291] Update test to v1.57 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e9cc335..e7b4348 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.56.0" +export CIVIFORM_VERSION="v1.57.0" # REQUIRED # Version of the infrastructure to use. From e330ccefb01bf68427ce1dd749b5b9897531da16 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Apr 2024 08:10:06 -0700 Subject: [PATCH 150/291] Set artifact retention and paths --- .github/workflows/deploy.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ad5381..22fb807 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -93,27 +93,16 @@ jobs: TEST_CIVIC_ENTITY_SHORT_NAME: '${{ vars.CIVIC_ENTITY_SHORT_NAME }}' BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' run: bin/run-prober - - - name: Upload image diff outputs - if: failure() - uses: actions/upload-artifact@v4 - with: - name: image diff output directory - path: diff_output - - - name: Upload updated snapshots - if: failure() - uses: actions/upload-artifact@v4 - with: - name: updated snapshots output directory - path: updated_snapshots - name: Upload test videos and traces on failure if: failure() uses: actions/upload-artifact@v4 with: name: tests videos and traces - path: tmp + retention-days: 3 + path: | + tmp/html-output/ + tmp/videos/ - name: Notify Slack Complete if: always() From 61bb7ffb5c3d0964969d46aff3499e90a49bcfa2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Apr 2024 08:12:15 -0700 Subject: [PATCH 151/291] Remove video flag --- bin/run-prober | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bin/run-prober b/bin/run-prober index 07899d2..79e8871 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -4,14 +4,9 @@ docker pull civiform/civiform-browser-test:latest -# Enable video recording on CI tests as it will be helpful to debug test -# failures. -export RECORD_VIDEO=0 - docker run \ -v "$(pwd)/tmp:/usr/src/civiform-browser-tests/tmp" \ -e BASE_URL="${BASE_URL}" \ - -e RECORD_VIDEO="${RECORD_VIDEO}" \ -e TEST_USER_AUTH_STRATEGY="seattle-staging" \ -e TEST_USER_LOGIN="${TEST_USER_LOGIN}" \ -e TEST_USER_PASSWORD="${TEST_USER_PASSWORD}" \ From ebc5b4addb173cdcec87b412daddd7e28be8ef7f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 4 Apr 2024 13:03:53 -0700 Subject: [PATCH 152/291] Update prod config to use v1.57.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 5011878..9f5ae67 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.56.0" +export CIVIFORM_VERSION="v1.57.0" # REQUIRED # Version of the infrastructure to use. From f8cc8ba1a4c706290bc01c209fe08555de94a5c9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Apr 2024 16:08:53 -0700 Subject: [PATCH 153/291] Temp. Set version to custom build --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index a29c379..7582500 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-d757633-gwen-find-address-multi-urls" # REQUIRED # Version of the infrastructure to use. From 0fbab5b9b87b65ed4d0fa75ac6bfb3206b47d066 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Apr 2024 16:16:29 -0700 Subject: [PATCH 154/291] Temp. Adding second url --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 7582500..6bce4eb 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -252,7 +252,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" From 5d38983fa7e236e6c8bc7fc10b6a479c0b937ed7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Apr 2024 17:51:44 -0700 Subject: [PATCH 155/291] Temp: Update tests version --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 6bce4eb..f057d18 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-d757633-gwen-find-address-multi-urls" +export CIVIFORM_VERSION="DEV-098cfb6-gwen-find-address-multi-urls" # REQUIRED # Version of the infrastructure to use. From c46643d759dee9e78183dd92c3172cbb98088159 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 10 Apr 2024 06:04:58 -0700 Subject: [PATCH 156/291] Staging config back to normal --- civiform_config.staging.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index f057d18..a29c379 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-098cfb6-gwen-find-address-multi-urls" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. @@ -252,7 +252,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" From 6d8c7f5ee0d37901619410654fa8ede9c1c48e48 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Apr 2024 10:13:51 -0700 Subject: [PATCH 157/291] Update to v1.59.0 --- civiform_config.test.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e7b4348..bd6ce97 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.57.0" +export CIVIFORM_VERSION="v1.59.0" # REQUIRED # Version of the infrastructure to use. @@ -242,9 +242,6 @@ export VERSION_CACHE_ENABLED=true export PROGRAM_CACHE_ENABLED=true export QUESTION_CACHE_ENABLED=true -# API -export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false - # Evolutions export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true From a71a59c430a0d0824f68e661e8e1c49b215a607a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 12 Apr 2024 10:25:41 -0700 Subject: [PATCH 158/291] Update prod to v1.59.0 --- civiform_config.prod.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 9f5ae67..0e89792 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.57.0" +export CIVIFORM_VERSION="v1.59.0" # REQUIRED # Version of the infrastructure to use. @@ -242,9 +242,6 @@ export VERSION_CACHE_ENABLED=true export PROGRAM_CACHE_ENABLED=true export QUESTION_CACHE_ENABLED=true -# API -export CIVIFORM_API_KEYS_BAN_GLOBAL_SUBNET=false - # Evolutions export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true From d048a9458db1bd6b82db59d14876e79502670de3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 18 Apr 2024 10:26:56 -0700 Subject: [PATCH 159/291] Enable arcgis --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index a29c379..1e50021 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -252,7 +252,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" From d2a6547993b8d77cce298682859e266edcc81341 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 03:53:10 +0000 Subject: [PATCH 160/291] Update slackapi/slack-github-action action to v1.26.0 --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/slack-notification-tester.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 22fb807..09f04da 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,7 +53,7 @@ jobs: steps: - name: Notify Slack Start - uses: slackapi/slack-github-action@v1.25.0 + uses: slackapi/slack-github-action@v1.26.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" @@ -106,7 +106,7 @@ jobs: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.25.0 + uses: slackapi/slack-github-action@v1.26.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index 4da202f..e72f904 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.25.0 + uses: slackapi/slack-github-action@v1.26.0 with: channel-id: 'C03UXPUEXU4' slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" From 4675bf5e96ceb8e3aca55eb3acf878fc134323ad Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 19 Apr 2024 12:10:36 -0700 Subject: [PATCH 161/291] Testing Play 2 --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1e50021..855ddf6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-6a9375d-play-2.9.0" # REQUIRED # Version of the infrastructure to use. From 96fdced400435b73837228047bd11ae7d5c229db Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 25 Apr 2024 07:20:31 -0700 Subject: [PATCH 162/291] Set staging deploy to latest --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 855ddf6..1e50021 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-6a9375d-play-2.9.0" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 47b1c47e6e5029044d86cccc2a6ab50ce0c694b6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 25 Apr 2024 08:00:25 -0700 Subject: [PATCH 163/291] Set cloud deploy version to match civiform version --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 0e89792..793d57e 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -34,7 +34,7 @@ export CIVIFORM_VERSION="v1.59.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# diff --git a/civiform_config.test.sh b/civiform_config.test.sh index bd6ce97..a33c83f 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -34,7 +34,7 @@ export CIVIFORM_VERSION="v1.59.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 78b2fd1408ff03ac4380e107d33d3fe6348ca164 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 29 Apr 2024 08:55:04 -0700 Subject: [PATCH 164/291] Adding script to cleanup pgadmin temp secrets --- bin/remove-pgadmin-temp-secrets.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 bin/remove-pgadmin-temp-secrets.sh diff --git a/bin/remove-pgadmin-temp-secrets.sh b/bin/remove-pgadmin-temp-secrets.sh new file mode 100755 index 0000000..9dd92d0 --- /dev/null +++ b/bin/remove-pgadmin-temp-secrets.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +pushd $(git rev-parse --show-toplevel) > /dev/null + +CONFIG="${1}" + +if [[ ! -f "${CONFIG}" ]]; then + echo "Add config file name" + exit 1 +fi + +source ${CONFIG} + +aws secretsmanager delete-secret --force-delete-without-recovery --secret-id "${APP_PREFIX}-cf-pgadmin-default-password" +aws secretsmanager delete-secret --force-delete-without-recovery --secret-id "${APP_PREFIX}-cf-pgadmin-default-username" From a43c2d6a4974663f5c8321f75d8caf5563bba424 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Apr 2024 14:47:00 -0700 Subject: [PATCH 165/291] testing play2 --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1e50021..c5d67f8 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-62e3e1d-play-2.9.0" # REQUIRED # Version of the infrastructure to use. From b570b3ad5bdb34cdf92325db5e8688e51e98957c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Apr 2024 15:10:18 -0700 Subject: [PATCH 166/291] Update test config to v1.61.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index a33c83f..be11528 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.59.0" +export CIVIFORM_VERSION="v1.61.0" # REQUIRED # Version of the infrastructure to use. From 385b954a6ec3655a15ff563328606a3414a4e586 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Apr 2024 15:10:48 -0700 Subject: [PATCH 167/291] Update prod config to v1.61.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 793d57e..efdd956 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.59.0" +export CIVIFORM_VERSION="v1.61.0" # REQUIRED # Version of the infrastructure to use. From 8a464834cd46a78dfc4c7e340fed20c8a5dcbc67 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Apr 2024 15:29:23 -0700 Subject: [PATCH 168/291] Set test to v1.62.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index be11528..2c8fa52 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.61.0" +export CIVIFORM_VERSION="v1.62.0" # REQUIRED # Version of the infrastructure to use. From d555ab1c376170ac42aef256995d6f8e923291a0 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Apr 2024 15:30:52 -0700 Subject: [PATCH 169/291] Set prod to v1.62.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index efdd956..c7b295a 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.61.0" +export CIVIFORM_VERSION="v1.62.0" # REQUIRED # Version of the infrastructure to use. From 2c5398dbe6872bd505c6e9d3b0cb5a4d93dfd828 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 1 May 2024 09:09:46 -0700 Subject: [PATCH 170/291] Staging play2.9 --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c5d67f8..ef339a6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-62e3e1d-play-2.9.0" +export CIVIFORM_VERSION="DEV-4de53c3-play-2.9.0" # REQUIRED # Version of the infrastructure to use. From 6a926fcc796d5d8aa6f3542cd970ef76b5a55dc6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 1 May 2024 09:12:57 -0700 Subject: [PATCH 171/291] Play2.9 Test on Test --- civiform_config.test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2c8fa52..77efb50 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.62.0" +export CIVIFORM_VERSION="DEV-4de53c3-play-2.9.0" # post v1.62.0 # REQUIRED # Version of the infrastructure to use. @@ -34,7 +34,8 @@ export CIVIFORM_VERSION="v1.62.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 83a1c21e18459b8f6b239fd021eda97bc3417470 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 7 May 2024 05:45:21 -0700 Subject: [PATCH 172/291] Disable probers on staging --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 09f04da..bdd49b6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ on: probers_enabled: type: boolean description: 'Runs probers when checked' - default: true + default: false required: true schedule: From 7191f16473f531308f2df19beddc52a23b2824ab Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 7 May 2024 05:46:37 -0700 Subject: [PATCH 173/291] Set staging version to latest --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index ef339a6..1e50021 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-4de53c3-play-2.9.0" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 6a53c23e224541226607be4224141fdb55e1dc9c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 7 May 2024 08:38:33 -0700 Subject: [PATCH 174/291] Adding color to output of gis test script --- bin/test_gis.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bin/test_gis.sh b/bin/test_gis.sh index 67e59ab..5be88d9 100755 --- a/bin/test_gis.sh +++ b/bin/test_gis.sh @@ -11,29 +11,32 @@ function test_url { local url="${1}" local jq_array_path="${2}" local expected_array_size="${3}" + local RED='\033[0;31m' + local GREEN='\033[0;32m' + local NC='\033[0m' response="$(curl \ --silent \ "${url}")" if ! jq --exit-status . >/dev/null 2>&1 <<<"${response}"; then - echo "Failed to parse response" + printf "${RED}Failed to parse response${NC}\n" echo "--------------------------------------------------------------------" echo "${response}" exit 1 - # else - # echo "Valid JSON" + else + printf "${GREEN}Valid JSON${NC}\n" fi actual_array_size="$(jq "${jq_array_path} | length" <<<"${response}")" if [[ "${expected_array_size}" != "${actual_array_size:0:1}" ]]; then - echo "Did not get the expected result count. Expected |${expected_array_size}|. Actual |${actual_array_size}|" + printf "${RED}Did not get the expected result count. Expected |${expected_array_size}|. Actual |${actual_array_size}|${NC}\n" echo "--------------------------------------------------------------------" echo "${response}" | jq exit 1 - # else - # echo "General array counts match" + else + printf "${GREEN}General array counts match${NC}\n" fi } @@ -48,3 +51,4 @@ test_url "${serviceAreaUrl}" ".fields" 8 echo "Test ssl certficate" echo | openssl s_client -servername gisdata.seattle.gov -connect gisdata.seattle.gov:443 +echo "" From fa785ce9c25a84f07ccf41061b744fad681a671f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 7 May 2024 15:22:41 -0700 Subject: [PATCH 175/291] update test to v 1.63.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 77efb50..0b5c094 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-4de53c3-play-2.9.0" # post v1.62.0 +export CIVIFORM_VERSION="v1.63.0" # REQUIRED # Version of the infrastructure to use. From 84bebe20881b3ed7af71843a975155db8e91fdcb Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 May 2024 02:33:36 -0700 Subject: [PATCH 176/291] Updating esri urls for test --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 0b5c094..694c41f 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -251,7 +251,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" From f22e8d44e30e9823396439f9770645ebfbbc67fc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 8 May 2024 02:33:48 -0700 Subject: [PATCH 177/291] Updating version and esri urls for prod --- civiform_config.prod.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index c7b295a..bb34867 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.62.0" +export CIVIFORM_VERSION="v1.63.0" # REQUIRED # Version of the infrastructure to use. @@ -250,7 +250,7 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI export ESRI_ADDRESS_CORRECTION_ENABLED=true -export ESRI_FIND_ADDRESS_CANDIDATES_URL="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates" +export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" From 37be4d5633b515f562c9495810b259a3c802b4d3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 15 May 2024 07:20:34 -0700 Subject: [PATCH 178/291] Disable automated probers --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bdd49b6..3e0833f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,7 +49,8 @@ jobs: DEPLOY_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.deploy_enabled == 'true') }} # Consider probers to be enabled if manually checked or if run from a schedule, but only run them on the staging site # beause we don't want to wipe test site data. - PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} + # PROBERS_ENABLED: ${{ (github.event.inputs == null || github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} + PROBERS_ENABLED: ${{ (github.event.inputs.probers_enabled == 'true') && ((github.event.inputs.environment || 'staging') == 'staging') }} steps: - name: Notify Slack Start From 4e22c55f778f299661061b8387c8ca7ec8add561 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 16 May 2024 05:35:29 -0700 Subject: [PATCH 179/291] Update civiform_config.test.sh --- civiform_config.test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 694c41f..3e3bb7e 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.63.0" +export CIVIFORM_VERSION="v2.0.0" # REQUIRED # Version of the infrastructure to use. @@ -34,8 +34,8 @@ export CIVIFORM_VERSION="v1.63.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 58687a49a87cc8817cf960065cf4dddae45322cf Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 22 May 2024 09:59:20 -0700 Subject: [PATCH 180/291] Removing settings that don't belong here --- civiform_config.staging.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1e50021..19ac959 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -66,25 +66,10 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # Deployment-specific Civiform configuration ################################################# -# REQUIRED -# The short name for the civic entity. Ex. "Rochester" -export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" - -# REQUIRED -# The full name for the civic entity. Ex. "City of Rochester" -export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle [STAGING]" - -# REQUIRED -# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" - # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# REQUIRED -export APPLICANT_PORTAL_NAME="Seattle" - # OPTIONAL # A link to an 16x16 of 32x32 pixel favicon of the civic entity, # in format .ico, .png, or .gif. @@ -251,26 +236,17 @@ export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI -export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" -# Common Intake -export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" -export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" - # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags -export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export APPLICATION_EXPORTABLE=true -export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true From dcd7f0b4bed41fd6ffdc78861e2cc101085d0ab2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 22 May 2024 10:11:04 -0700 Subject: [PATCH 181/291] Deploy specific version --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 19ac959..d05df51 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-d99e5be-1716244192" # REQUIRED # Version of the infrastructure to use. From 448f303b8b6a0fb811f14ec1418ae30298dde62b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 23 May 2024 00:12:45 -0700 Subject: [PATCH 182/291] Update to v2.0.1 --- civiform_config.test.sh | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 3e3bb7e..cee8777 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.0.0" +export CIVIFORM_VERSION="v2.0.1" # REQUIRED # Version of the infrastructure to use. @@ -67,25 +67,10 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # Deployment-specific Civiform configuration ################################################# -# REQUIRED -# The short name for the civic entity. Ex. "Rochester" -export CIVIC_ENTITY_SHORT_NAME="Seattle [TEST]" - -# REQUIRED -# The full name for the civic entity. Ex. "City of Rochester" -export CIVIC_ENTITY_FULL_NAME="City of Seattle [TEST]" - -# REQUIRED -# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" - # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# REQUIRED -export APPLICANT_PORTAL_NAME="Seattle" - # OPTIONAL # A link to an 16x16 of 32x32 pixel favicon of the civic entity, # in format .ico, .png, or .gif. @@ -250,26 +235,17 @@ export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI -export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" -# Common Intake -export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" -export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" - # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags -export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export APPLICATION_EXPORTABLE=true -export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true From c7ae6d34145e8f777c36879e9b6e9d85f6207e07 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 23 May 2024 00:13:54 -0700 Subject: [PATCH 183/291] Set staging back to latest --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index d05df51..19ac959 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-d99e5be-1716244192" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 721d50a27c3d5243fd16fdf71ce9f5adf823cdf5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 23 May 2024 00:21:54 -0700 Subject: [PATCH 184/291] Set to v2.0.1 --- civiform_config.prod.sh | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index bb34867..fa8c75a 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v1.63.0" +export CIVIFORM_VERSION="v2.0.1" # REQUIRED # Version of the infrastructure to use. @@ -66,25 +66,10 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # Deployment-specific Civiform configuration ################################################# -# REQUIRED -# The short name for the civic entity. Ex. "Rochester" -export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" - -# REQUIRED -# The full name for the civic entity. Ex. "City of Rochester" -export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" - -# REQUIRED -# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov -export SUPPORT_EMAIL_ADDRESS="CiviForm@seattle.gov" - # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" -# REQUIRED -export APPLICANT_PORTAL_NAME="Seattle" - # OPTIONAL # A link to an 16x16 of 32x32 pixel favicon of the civic entity, # in format .ico, .png, or .gif. @@ -249,26 +234,17 @@ export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI -export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" -# Common Intake -export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" -export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" - # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags -export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true -export APPLICATION_EXPORTABLE=true -export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true From 174c8f4d0b9a4fa9feed3d8e56b64914bc64412f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 23 May 2024 01:20:47 -0700 Subject: [PATCH 185/291] set wkid --- civiform_config.prod.sh | 1 + civiform_config.staging.sh | 1 + civiform_config.test.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index fa8c75a..12a309a 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -239,6 +239,7 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/se export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" +export ESRI_WELLKNOWN_ID_OVERRIDE="2926" # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 19ac959..1210cb0 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -241,6 +241,7 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/se export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" +export ESRI_WELLKNOWN_ID_OVERRIDE="2926" # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" diff --git a/civiform_config.test.sh b/civiform_config.test.sh index cee8777..0ebc517 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -240,6 +240,7 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/se export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" +export ESRI_WELLKNOWN_ID_OVERRIDE="2926" # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" From 99082bd3b059b6cf96f654d7d8ca69b29b694d78 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 28 May 2024 15:55:29 -0700 Subject: [PATCH 186/291] Update run-prober to set CI value --- bin/run-prober | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/run-prober b/bin/run-prober index 79e8871..cc73046 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -14,5 +14,6 @@ docker run \ -e TEST_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" \ -e DISABLE_BROWSER_ERROR_WATCHER=true \ -e DISABLE_SCREENSHOTS=false \ + -e CI=true \ civiform/civiform-browser-test:latest \ -c "npm install && npm test -- --grep-invert @northstar $@" From a9addc8d5f1de36cb181684846c074abfcee76d7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 5 Jun 2024 11:11:22 -0700 Subject: [PATCH 187/291] cleanup whitespace --- civiform_config.prod.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 12a309a..c448652 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -30,7 +30,7 @@ export CIVIFORM_VERSION="v2.0.1" # Needs to be either: # - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true # - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false -# - "latest" to use latest version of either docker image or code from the repo, +# - "latest" to use latest version of either docker image or code from the repo, # depending on USE_DOCKER flag. # # Using "latest" is recommended. @@ -44,7 +44,6 @@ export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # "aws" or "azure" export CIVIFORM_CLOUD_PROVIDER="aws" - # REQUIRED # The template directory for this deployment. # For aws, use "cloud/aws/templates/aws_oidc" @@ -98,9 +97,9 @@ export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" # OPTIONAL -# If this is a staging deployment and this variable is set to true, a robots -# noindex metadata tag is added to the CiviForm pages. This causes the staging -# site to not be listed on search engines. +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. export STAGING_ADD_NOINDEX_META_TAG=false # REQUIRED @@ -123,7 +122,6 @@ export CIVIFORM_SERVER_METRICS_ENABLED=true # Don't deploy of Prometheus and Graphana export MONITORING_STACK_ENABLED=true - ################################################# # Template variables for: aws_oidc ################################################# From c8314684eae9a0256c47e92920dd4a72d33a5c6d Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 5 Jun 2024 11:11:47 -0700 Subject: [PATCH 188/291] Set prod postgres version --- civiform_config.prod.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index c448652..806e4b2 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -36,6 +36,9 @@ export CIVIFORM_VERSION="v2.0.1" # Using "latest" is recommended. export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +# Lock to this postgres version so it doesn't update unexpectedly +export POSTGRESQL_VERSION="16.2" + # Terraform configuration ################################################# From 658844034a40545a0ef5e44da17b3d6ea191923c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 11:37:38 -0700 Subject: [PATCH 189/291] Update test and prod to v2.1.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 806e4b2..f2cc31c 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.0.1" +export CIVIFORM_VERSION="v2.1.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 0ebc517..f0cad94 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.0.1" +export CIVIFORM_VERSION="v2.1.0" # REQUIRED # Version of the infrastructure to use. From a6c189d72314ab80cb858ac6046fd61668d989b1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 11:37:55 -0700 Subject: [PATCH 190/291] fmt --- civiform_config.test.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index f0cad94..e994dd2 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -30,7 +30,7 @@ export CIVIFORM_VERSION="v2.1.0" # Needs to be either: # - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true # - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false -# - "latest" to use latest version of either docker image or code from the repo, +# - "latest" to use latest version of either docker image or code from the repo, # depending on USE_DOCKER flag. # # Using "latest" is recommended. @@ -45,7 +45,6 @@ export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # "aws" or "azure" export CIVIFORM_CLOUD_PROVIDER="aws" - # REQUIRED # The template directory for this deployment. # For aws, use "cloud/aws/templates/aws_oidc" @@ -99,9 +98,9 @@ export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" # OPTIONAL -# If this is a staging deployment and this variable is set to true, a robots -# noindex metadata tag is added to the CiviForm pages. This causes the staging -# site to not be listed on search engines. +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. export STAGING_ADD_NOINDEX_META_TAG=true # REQUIRED @@ -124,7 +123,6 @@ export CIVIFORM_SERVER_METRICS_ENABLED=false # Don't deploy of Prometheus and Graphana export MONITORING_STACK_ENABLED=false - ################################################# # Template variables for: aws_oidc ################################################# From 037d873212c96ba25056688a3eb42a18d73429a6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 11:38:55 -0700 Subject: [PATCH 191/291] fmt --- civiform_config.staging.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1210cb0..70bac03 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -30,7 +30,7 @@ export CIVIFORM_VERSION="latest" # Needs to be either: # - Label from https://hub.docker.com/r/civiform/civiform-cloud-deployment if USE_DOCKER=true # - Commit sha from https://github.com/civiform/cloud-deploy-infra if USE_DOCKER=false -# - "latest" to use latest version of either docker image or code from the repo, +# - "latest" to use latest version of either docker image or code from the repo, # depending on USE_DOCKER flag. # # Using "latest" is recommended. @@ -44,7 +44,6 @@ export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" # "aws" or "azure" export CIVIFORM_CLOUD_PROVIDER="aws" - # REQUIRED # The template directory for this deployment. # For aws, use "cloud/aws/templates/aws_oidc" @@ -98,9 +97,9 @@ export STAGING_TI_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" export STAGING_APPLICANT_NOTIFICATION_MAILING_LIST="civiform.staging@seattle.gov" # OPTIONAL -# If this is a staging deployment and this variable is set to true, a robots -# noindex metadata tag is added to the CiviForm pages. This causes the staging -# site to not be listed on search engines. +# If this is a staging deployment and this variable is set to true, a robots +# noindex metadata tag is added to the CiviForm pages. This causes the staging +# site to not be listed on search engines. export STAGING_ADD_NOINDEX_META_TAG=true # REQUIRED @@ -123,7 +122,6 @@ export CIVIFORM_SERVER_METRICS_ENABLED=false # Don't deploy of Prometheus and Graphana export MONITORING_STACK_ENABLED=false - ################################################# # Template variables for: aws_oidc ################################################# From 07af7243807061c85ab5856d93898aeeebcd0b60 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 11:39:25 -0700 Subject: [PATCH 192/291] Re-add settings needed for staging since it gets wiped all the time --- civiform_config.staging.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 70bac03..7bcbafb 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -65,10 +65,29 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # Deployment-specific Civiform configuration ################################################# +# REQUIRED +# The short name for the civic entity. Ex. "Rochester" +#export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" + +# REQUIRED +# The full name for the civic entity. Ex. "City of Rochester" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle [STAGING]" + +# REQUIRED +# The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov +export SUPPORT_EMAIL_ADDRESS="civiform.staging@seattle.gov" + +# OPTIONAL +export CIVIC_ENTITY_PRODUCTION_URL="https://civiform.seattle.gov" + # REQUIRED # A link to an image of the civic entity logo, to be used on the login page export CIVIC_ENTITY_SMALL_LOGO_URL="https://raw.githubusercontent.com/seattle-civiform/civiform-deploy-tf/main/logos/civiform-small-logo.png" +# REQUIRED +export APPLICANT_PORTAL_NAME="Seattle" + # OPTIONAL # A link to an 16x16 of 32x32 pixel favicon of the civic entity, # in format .ico, .png, or .gif. @@ -234,18 +253,28 @@ export DATABASE_APPLY_DESTRUCTIVE_CHANGES=true export MEASUREMENT_ID="G-HXM0Y35TGE" # ESRI +export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" export ESRI_WELLKNOWN_ID_OVERRIDE="2926" +# Common Intake +export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" +export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" + # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags +export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true +export APPLICATION_EXPORTABLE=true +export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true From 8bd79c6a1af2e11272f3639976b2332df93cf4fa Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 12:30:59 -0700 Subject: [PATCH 193/291] allow admin writeable from staging --- civiform_config.staging.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 7bcbafb..039adf7 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -271,6 +271,7 @@ export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" # Feature Flags +export ALLOW_ADMIN_WRITEABLE=true export ALLOW_CIVIFORM_ADMIN_ACCESS_PROGRAMS=true export APPLICATION_EXPORTABLE=true export API_GENERATED_DOCS_ENABLED=true From 152940d7678bf55730a650264b6129371b225a96 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 12:37:30 -0700 Subject: [PATCH 194/291] Set staging domain name for test --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e994dd2..7bda490 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -107,7 +107,7 @@ export STAGING_ADD_NOINDEX_META_TAG=true # The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" export BASE_URL="https://civiformtest.seattle.gov" -export STAGING_HOSTNAME="civiformstage.seattle.gov" +export STAGING_HOSTNAME="civiformtest.seattle.gov" # OPTIONAL # The time zone to be used when rendering any times within the CiviForm From a836d53ec2f57c2ebbca35c8e9c274a340bdc050 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 11 Jun 2024 12:43:17 -0700 Subject: [PATCH 195/291] Putting staging url back --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 7bda490..e994dd2 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -107,7 +107,7 @@ export STAGING_ADD_NOINDEX_META_TAG=true # The domain name for this CiviForm deployment, including the protocol. # E.g. "https://civiform.seattle.gov" export BASE_URL="https://civiformtest.seattle.gov" -export STAGING_HOSTNAME="civiformtest.seattle.gov" +export STAGING_HOSTNAME="civiformstage.seattle.gov" # OPTIONAL # The time zone to be used when rendering any times within the CiviForm From fd3e835d239cd15b72547056465a5a5ea24bdbf3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 12 Jun 2024 14:24:28 -0700 Subject: [PATCH 196/291] Update test to use bug fixed version --- civiform_config.test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e994dd2..fad33e6 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.1.0" +export CIVIFORM_VERSION="SNAPSHOT-5bd0208-1718226108" +# export CIVIFORM_VERSION="v2.1.0" # REQUIRED # Version of the infrastructure to use. @@ -34,8 +35,8 @@ export CIVIFORM_VERSION="v2.1.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 06bd32855c9b581a1e37dfa34f64c187797e60e0 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 12 Jun 2024 16:55:28 -0700 Subject: [PATCH 197/291] Updating for fix --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index fad33e6..5c80ca9 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-5bd0208-1718226108" +export CIVIFORM_VERSION="SNAPSHOT-f482ed1-1718235612" # export CIVIFORM_VERSION="v2.1.0" # REQUIRED From c870a6733f051802d10e8c9f38d309779975f609 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 12 Jun 2024 17:17:09 -0700 Subject: [PATCH 198/291] Set prod to use release with fix in it --- civiform_config.prod.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index f2cc31c..0abe80f 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.1.0" +export CIVIFORM_VERSION="SNAPSHOT-f482ed1-1718235612" +# export CIVIFORM_VERSION="v2.1.0" # REQUIRED # Version of the infrastructure to use. @@ -34,7 +35,8 @@ export CIVIFORM_VERSION="v2.1.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Lock to this postgres version so it doesn't update unexpectedly export POSTGRESQL_VERSION="16.2" From 3c5967a77da43f42f319445be3143194986188dc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 12:40:10 -0700 Subject: [PATCH 199/291] Adding api tests --- .gitignore | 1 + qa/.gitignore | 1 + qa/package-lock.json | 102 ++++++++++++++++++++++++++++++++++++++++ qa/package.json | 8 ++++ qa/playwright.config.ts | 15 ++++++ qa/tests/api.spec.ts | 48 +++++++++++++++++++ 6 files changed, 175 insertions(+) create mode 100644 qa/.gitignore create mode 100644 qa/package-lock.json create mode 100644 qa/package.json create mode 100644 qa/playwright.config.ts create mode 100644 qa/tests/api.spec.ts diff --git a/.gitignore b/.gitignore index c665389..5ab2b0f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ tmp/ nuke.yaml # this file is created by developers when working on the deployment system. see https://docs.civiform.us/contributor-guide/developer-guide/deploy-system/prerequisites#setup-aws-nuke checkout/ +node_modules/ diff --git a/qa/.gitignore b/qa/.gitignore new file mode 100644 index 0000000..51511d1 --- /dev/null +++ b/qa/.gitignore @@ -0,0 +1 @@ +test-results/ diff --git a/qa/package-lock.json b/qa/package-lock.json new file mode 100644 index 0000000..5bae1a0 --- /dev/null +++ b/qa/package-lock.json @@ -0,0 +1,102 @@ +{ + "name": "seattle-civiform-smoke-tests", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "seattle-civiform-smoke-tests", + "devDependencies": { + "@playwright/test": "1.44.1", + "@types/node": "20.14.2", + "typescript": "5.4.5" + } + }, + "node_modules/@playwright/test": { + "version": "1.44.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz", + "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==", + "dev": true, + "dependencies": { + "playwright": "1.44.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@types/node": { + "version": "20.14.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", + "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/playwright": { + "version": "1.44.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz", + "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==", + "dev": true, + "dependencies": { + "playwright-core": "1.44.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=16" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.44.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz", + "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==", + "dev": true, + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + } + } +} diff --git a/qa/package.json b/qa/package.json new file mode 100644 index 0000000..0526c01 --- /dev/null +++ b/qa/package.json @@ -0,0 +1,8 @@ +{ + "name": "seattle-civiform-smoke-tests", + "devDependencies": { + "@playwright/test": "1.44.1", + "@types/node": "20.14.2", + "typescript": "5.4.5" + } +} diff --git a/qa/playwright.config.ts b/qa/playwright.config.ts new file mode 100644 index 0000000..d1674d2 --- /dev/null +++ b/qa/playwright.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from '@playwright/test' + +export default defineConfig({ + timeout: 5000, + use: { + baseURL: process.env.BASE_URL || 'http://localhost:9000', + extraHTTPHeaders: { + 'Authorization': `Basic ${process.env.API_TOKEN}` + } + }, + reporter: [ + ['list', { printSteps: true }] + ], +}) + diff --git a/qa/tests/api.spec.ts b/qa/tests/api.spec.ts new file mode 100644 index 0000000..cd4156e --- /dev/null +++ b/qa/tests/api.spec.ts @@ -0,0 +1,48 @@ +import { test, expect } from '@playwright/test' + + +test.describe('smoke tests for program applications list api endpoint', () => { + const programSlugs = (process.env.PROGRAM_SLUGS || '').split(',') + + for (const programSlug of programSlugs) { + test(`program slug: ${programSlug}`, async ({ request }) => { + const response = await request.get(`/api/v1/admin/programs/${programSlug}/applications`, { + params: { + 'pageSize': 1 + } + }) + + expect(response).toBeOK() + + const result: ApiResult = await response.json() + + expect(result).not.toBeNull() + expect(result.payload.length).toBeLessThanOrEqual(1) + + if (result.payload.length > 0) { + expect(result.payload[0].application).not.toBeNull() + } + }) + } +}) + +interface ApiResult { + nextPageToken: string | null + payload: Payload[] +} + +interface Payload { + applicant_id: number + application_id: number + create_time: string + language: string + program_name: string + program_version_id: number + revision_state: string + status: string | null + submit_time: string + submitter_type: string + ti_email: string | null + ti_organization: string | null + application: any +} From b52d3db88b5197aa11a61f9661d6643cb8354952 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 13:00:52 -0700 Subject: [PATCH 200/291] Create test_api.yml --- .github/workflows/test_api.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/test_api.yml diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml new file mode 100644 index 0000000..8a49a6b --- /dev/null +++ b/.github/workflows/test_api.yml @@ -0,0 +1,27 @@ +name: Test API +run-name: Test API + +on: + workflow_dispatch: {} + +permissions: {} + +jobs: + test-api: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + run: | + cd qa + npm install + + - name: Run + env: + BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' + API_TOKEN: ${{ secrets.API_TOKEN }} + PROGRAM_SLUGS: ${{ secrets.PROGRAM_SLUGS }} + run: npx playwright test From fd10f2d8dadf278c4786d8ed0572219e03790737 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 13:02:50 -0700 Subject: [PATCH 201/291] Update test_api.yml --- .github/workflows/test_api.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml index 8a49a6b..bc3ba26 100644 --- a/.github/workflows/test_api.yml +++ b/.github/workflows/test_api.yml @@ -2,7 +2,12 @@ name: Test API run-name: Test API on: - workflow_dispatch: {} + workflow_dispatch: + inputs: + environment: + type: environment + default: staging + required: true permissions: {} From 2dc4615e45d17ab7f9d1e012d4cf123daffbbe94 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 13:06:05 -0700 Subject: [PATCH 202/291] Update test_api.yml --- .github/workflows/test_api.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml index bc3ba26..b1cfdc2 100644 --- a/.github/workflows/test_api.yml +++ b/.github/workflows/test_api.yml @@ -6,7 +6,7 @@ on: inputs: environment: type: environment - default: staging + default: test required: true permissions: {} @@ -29,4 +29,4 @@ jobs: BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' API_TOKEN: ${{ secrets.API_TOKEN }} PROGRAM_SLUGS: ${{ secrets.PROGRAM_SLUGS }} - run: npx playwright test + run: cd qa && npx playwright test From 42fa338bde0cb6faa539b00e3f32c3a1ba1eda34 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 13:10:06 -0700 Subject: [PATCH 203/291] Update test_api.yml --- .github/workflows/test_api.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml index b1cfdc2..d54e743 100644 --- a/.github/workflows/test_api.yml +++ b/.github/workflows/test_api.yml @@ -20,9 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Setup - run: | - cd qa - npm install + run: cd qa && npm install - name: Run env: @@ -30,3 +28,14 @@ jobs: API_TOKEN: ${{ secrets.API_TOKEN }} PROGRAM_SLUGS: ${{ secrets.PROGRAM_SLUGS }} run: cd qa && npx playwright test + + - name: On Failure + if: failure() + run: echo "FAILED" + + # - name: Send message to ms teams + # if: failure() + # uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 + # with: + # webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' + # message: 'Testing API failed. There *may* be issues with the API. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' From 4b3f0d0fe656b599a292bda983764b239ad65a9e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 13 Jun 2024 13:54:48 -0700 Subject: [PATCH 204/291] Update test_api.yml --- .github/workflows/test_api.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml index d54e743..dacac9b 100644 --- a/.github/workflows/test_api.yml +++ b/.github/workflows/test_api.yml @@ -14,6 +14,10 @@ permissions: {} jobs: test-api: runs-on: ubuntu-latest + environment: ${{ github.event.inputs.environment || 'staging' }} + + env: + ENVIRONMENT: ${{ github.event.inputs.environment || 'staging' }} steps: - name: Checkout From 3b5e45ef8e88451f0df734344dc246719abb7911 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:41:25 +0000 Subject: [PATCH 205/291] Update dependency typescript to v5.5.3 --- qa/package-lock.json | 9 +++++---- qa/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index 5bae1a0..c066a9f 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -8,7 +8,7 @@ "devDependencies": { "@playwright/test": "1.44.1", "@types/node": "20.14.2", - "typescript": "5.4.5" + "typescript": "5.5.3" } }, "node_modules/@playwright/test": { @@ -80,10 +80,11 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/qa/package.json b/qa/package.json index 0526c01..f4cbc72 100644 --- a/qa/package.json +++ b/qa/package.json @@ -3,6 +3,6 @@ "devDependencies": { "@playwright/test": "1.44.1", "@types/node": "20.14.2", - "typescript": "5.4.5" + "typescript": "5.5.3" } } From a38de25157db27e489de89e3d92ee426d2542cf5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Jul 2024 12:51:06 -0700 Subject: [PATCH 206/291] Update version to v2.4.0 --- civiform_config.test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 5c80ca9..b412781 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-f482ed1-1718235612" -# export CIVIFORM_VERSION="v2.1.0" +export CIVIFORM_VERSION="v2.4.0" # REQUIRED # Version of the infrastructure to use. From 3036ec7995f981969aa7b4287aa17ba128630dc4 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 9 Jul 2024 14:57:50 -0700 Subject: [PATCH 207/291] Updating config files version --- civiform_config.prod.sh | 3 +-- civiform_config.test.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 0abe80f..570b437 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-f482ed1-1718235612" -# export CIVIFORM_VERSION="v2.1.0" +export CIVIFORM_VERSION="v2.4.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index b412781..535483b 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.4.0" +# export CIVIFORM_VERSION="v2.4.0" +export CIVIFORM_VERSION="SNAPSHOT-8db0e82-1720559543" # REQUIRED # Version of the infrastructure to use. From 14d91fcddfefadfeab9c0a2bf1ca97e0d7589ff6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 15:06:32 +0000 Subject: [PATCH 208/291] Update dependency @playwright/test to v1.45.2 --- qa/package-lock.json | 33 ++++++++++++++++++--------------- qa/package.json | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index 5bae1a0..1206941 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -6,24 +6,25 @@ "": { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.44.1", + "@playwright/test": "1.45.2", "@types/node": "20.14.2", "typescript": "5.4.5" } }, "node_modules/@playwright/test": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz", - "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==", + "version": "1.45.2", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz", + "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright": "1.44.1" + "playwright": "1.45.2" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@types/node": { @@ -50,33 +51,35 @@ } }, "node_modules/playwright": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz", - "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==", + "version": "1.45.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz", + "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.44.1" + "playwright-core": "1.45.2" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { "fsevents": "2.3.2" } }, "node_modules/playwright-core": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz", - "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==", + "version": "1.45.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz", + "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/typescript": { diff --git a/qa/package.json b/qa/package.json index 0526c01..9188adc 100644 --- a/qa/package.json +++ b/qa/package.json @@ -1,7 +1,7 @@ { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.44.1", + "@playwright/test": "1.45.2", "@types/node": "20.14.2", "typescript": "5.4.5" } From b902d225b17413e1d7ce4f5054e89073c4a1a7c3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 16 Jul 2024 11:45:23 -0700 Subject: [PATCH 209/291] Use specific version --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 039adf7..d944f8a 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +# export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-977de5a-1721145371" # REQUIRED # Version of the infrastructure to use. From 41be8a6202dcbb22051e8b227be4b8f82079c2d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:19:19 +0000 Subject: [PATCH 210/291] Update dependency @types/node to v20.14.11 --- qa/package-lock.json | 9 +++++---- qa/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index e6a6850..53196d2 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -7,7 +7,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.45.2", - "@types/node": "20.14.2", + "@types/node": "20.14.11", "typescript": "5.5.3" } }, @@ -28,10 +28,11 @@ } }, "node_modules/@types/node": { - "version": "20.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", - "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", + "version": "20.14.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", + "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } diff --git a/qa/package.json b/qa/package.json index 46a5334..a4ccb10 100644 --- a/qa/package.json +++ b/qa/package.json @@ -2,7 +2,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.45.2", - "@types/node": "20.14.2", + "@types/node": "20.14.11", "typescript": "5.5.3" } } From b4991d6615c6f3d373f767460b205346929cc3db Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 17 Jul 2024 06:27:31 -0700 Subject: [PATCH 211/291] Update version --- civiform_config.test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 535483b..e46c038 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -# export CIVIFORM_VERSION="v2.4.0" -export CIVIFORM_VERSION="SNAPSHOT-8db0e82-1720559543" +export CIVIFORM_VERSION="v2.4.1" # REQUIRED # Version of the infrastructure to use. From 96ddc9e13f7b6f396c522cf590510e387ca51ee9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 17 Jul 2024 06:28:56 -0700 Subject: [PATCH 212/291] Set staging back to latest --- civiform_config.staging.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index d944f8a..039adf7 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -# export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-977de5a-1721145371" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 8271b3bf584a9a8f69bbd75263cd59b89bd6b937 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:32:57 -0700 Subject: [PATCH 213/291] Update civiform_config.test.sh changing version --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e46c038..6e342a3 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.4.1" +export CIVIFORM_VERSION="v2.4.2" # REQUIRED # Version of the infrastructure to use. From 6fd8a3baa96df8c4ef6a7111dd0871874b6a592b Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:33:30 -0700 Subject: [PATCH 214/291] Update civiform_config.prod.sh Changing version --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 570b437..b257d9e 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.4.0" +export CIVIFORM_VERSION="v2.4.2" # REQUIRED # Version of the infrastructure to use. From 4a70b17626f0ad10b1a1576aa87bf07de3dfbcbd Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 19 Jul 2024 09:43:15 -0700 Subject: [PATCH 215/291] Testing applicant oidc email attribute --- civiform_config.staging.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 039adf7..6df7fbd 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -14,6 +14,8 @@ # Global variables for all CiviForm deployments ################################################# +export APPLICANT_OIDC_EMAIL_ATTRIBUTE="email" + # REQUIRED # One of prod, staging, or dev. export CIVIFORM_MODE="staging" From 90668f37af5ec8581b00fabc4b4d4e0834b02457 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 19 Jul 2024 10:52:54 -0700 Subject: [PATCH 216/291] Testing OIDC email --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 6df7fbd..fa6ed70 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -25,7 +25,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +# export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-da38f0f-gwen-idcs-email-attr" # REQUIRED # Version of the infrastructure to use. From 36d1830faaa5f20e809698b161db30a45402666e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 19 Jul 2024 15:03:20 -0700 Subject: [PATCH 217/291] done testing idcs for now --- civiform_config.staging.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index fa6ed70..039adf7 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -14,8 +14,6 @@ # Global variables for all CiviForm deployments ################################################# -export APPLICANT_OIDC_EMAIL_ATTRIBUTE="email" - # REQUIRED # One of prod, staging, or dev. export CIVIFORM_MODE="staging" @@ -25,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -# export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="DEV-da38f0f-gwen-idcs-email-attr" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From d39849bb10760431b65eb55bcedd451ed7c38f98 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Jul 2024 14:20:23 -0700 Subject: [PATCH 218/291] Update staging whitelabel settings --- civiform_config.staging.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 039adf7..430a7ac 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -67,12 +67,11 @@ export CIVIFORM_APPLICANT_AUTH_PROTOCOL="oidc" # REQUIRED # The short name for the civic entity. Ex. "Rochester" -#export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" -export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle" +export WHITELABEL_CIVIC_ENTITY_SHORT_NAME="Seattle [STAGING]" # REQUIRED # The full name for the civic entity. Ex. "City of Rochester" -export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle [STAGING]" +export WHITELABEL_CIVIC_ENTITY_FULL_NAME="City of Seattle" # REQUIRED # The email address to contact for support with using Civiform. Ex. "Civiform@CityOfRochester.gov From 64cb9aa2ce3a73d497c0a7ff35546fbadc74a25c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Jul 2024 14:20:56 -0700 Subject: [PATCH 219/291] Update test conf to v2.5.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 6e342a3..b0cfccc 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.4.2" +export CIVIFORM_VERSION="v2.5.0" # REQUIRED # Version of the infrastructure to use. From 86ee6f04eb9746042a6855ff14087ff0a4db824d Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 30 Jul 2024 14:23:29 -0700 Subject: [PATCH 220/291] Update prod config to v2.5.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index b257d9e..e6dc23b 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.4.2" +export CIVIFORM_VERSION="v2.5.0" # REQUIRED # Version of the infrastructure to use. From 1661ba022a6330192c7863377f6f90597f7a7c9e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 6 Aug 2024 09:32:55 -0700 Subject: [PATCH 221/291] Set version for release testing --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 430a7ac..d18b236 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +#export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-1df2cb1-1722878128" # REQUIRED # Version of the infrastructure to use. From d0ce5068edc2c5476ca7e42135172e84cf2ef8aa Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 7 Aug 2024 09:13:12 -0700 Subject: [PATCH 222/291] Testing branch --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index d18b236..1a85ca6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -24,7 +24,7 @@ export CIVIFORM_MODE="staging" # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". #export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-1df2cb1-1722878128" +export CIVIFORM_VERSION="DEV-bf32fa2-gwen-jobs" # REQUIRED # Version of the infrastructure to use. From 380a3e54c2ba98844ef60b15ce82cb1c86f0ab17 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 7 Aug 2024 09:35:54 -0700 Subject: [PATCH 223/291] Put staging back to using latest --- civiform_config.staging.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 1a85ca6..430a7ac 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -#export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="DEV-bf32fa2-gwen-jobs" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From 96f4b174246d861de85ee6bcdf0fdffe30e21543 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 13 Aug 2024 09:28:02 -0700 Subject: [PATCH 224/291] staging use SNAPSHOT-1b284bf-1723565229 --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 430a7ac..fa55d9e 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +# export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-1b284bf-1723565229" # REQUIRED # Version of the infrastructure to use. From f63a5a9a859f80ab1d2d659f790f08f968bcf427 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 13 Aug 2024 14:56:06 -0700 Subject: [PATCH 225/291] Testing tests --- .github/workflows/deploy.yml | 2 +- civiform_config.staging.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3e0833f..54c2686 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -93,7 +93,7 @@ jobs: TEST_USER_DISPLAY_NAME: 'TEST, UATAPP' TEST_CIVIC_ENTITY_SHORT_NAME: '${{ vars.CIVIC_ENTITY_SHORT_NAME }}' BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' - run: bin/run-prober + run: bin/run-prober admin_application_statuses.test.ts - name: Upload test videos and traces on failure if: failure() diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index fa55d9e..526ab82 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -278,4 +278,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true +export SHOW_NOT_PRODUCTION_BANNER_ENABLED=false From db3d4d72a8ae8e746f74e8afac83b310174214a4 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 13 Aug 2024 15:23:45 -0700 Subject: [PATCH 226/291] Revert last testing changes --- .github/workflows/deploy.yml | 2 +- civiform_config.staging.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 54c2686..3e0833f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -93,7 +93,7 @@ jobs: TEST_USER_DISPLAY_NAME: 'TEST, UATAPP' TEST_CIVIC_ENTITY_SHORT_NAME: '${{ vars.CIVIC_ENTITY_SHORT_NAME }}' BASE_URL: 'https://${{ vars.SUBDOMAIN }}.seattle.gov' - run: bin/run-prober admin_application_statuses.test.ts + run: bin/run-prober - name: Upload test videos and traces on failure if: failure() diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 526ab82..430a7ac 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -# export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-1b284bf-1723565229" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. @@ -278,4 +277,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export SHOW_NOT_PRODUCTION_BANNER_ENABLED=false +export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true From 944134b0211f954f721e36e3f08c43b01f3460ea Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 20 Aug 2024 07:19:24 -0700 Subject: [PATCH 227/291] v2.7.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index b0cfccc..e0fc3d5 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.5.0" +export CIVIFORM_VERSION="v2.7.0" # REQUIRED # Version of the infrastructure to use. From 39ba5c05b5d451ceb23d9e2642a3983b1bc882e0 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 20 Aug 2024 07:45:34 -0700 Subject: [PATCH 228/291] Update to v2.7.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index e6dc23b..617a5de 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.5.0" +export CIVIFORM_VERSION="v2.7.0" # REQUIRED # Version of the infrastructure to use. From 452fb165eb7f759d632684c667b6cec4e8931810 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 20 Aug 2024 15:20:35 -0700 Subject: [PATCH 229/291] update to v2.8.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 617a5de..b9dd7d1 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.7.0" +export CIVIFORM_VERSION="v2.8.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index e0fc3d5..7b5514b 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.7.0" +export CIVIFORM_VERSION="v2.8.0" # REQUIRED # Version of the infrastructure to use. From bb9a740c74814ca29090a6177e311dd309628ec6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 27 Aug 2024 10:37:34 -0700 Subject: [PATCH 230/291] update --- civiform_config.staging.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 430a7ac..986d960 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +#export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-ff80632-1724423779" # REQUIRED # Version of the infrastructure to use. From 043c36778703c0df7abd6e41ae7d7fbab635c7c1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 27 Aug 2024 13:13:42 -0700 Subject: [PATCH 231/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 986d960..0cd312e 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -24,7 +24,7 @@ export CIVIFORM_MODE="staging" # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". #export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-ff80632-1724423779" +export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" # REQUIRED # Version of the infrastructure to use. From 43bdb5ef7a1486ad4432d3e4d0df3beb1467aa8c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 27 Aug 2024 14:15:34 -0700 Subject: [PATCH 232/291] Set staging back to latest --- civiform_config.staging.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 0cd312e..659f9f9 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -#export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" +export CIVIFORM_VERSION="latest" +#export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" # REQUIRED # Version of the infrastructure to use. From cca58cdad75a11195ed4547c015a1180a001b9ac Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 27 Aug 2024 14:16:20 -0700 Subject: [PATCH 233/291] Update test to v2.9.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 7b5514b..128aefd 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.8.0" +export CIVIFORM_VERSION="v2.9.0" # REQUIRED # Version of the infrastructure to use. From 6e40f1cbece9c86a15da2a836211e98eb547a443 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 28 Aug 2024 07:36:23 -0700 Subject: [PATCH 234/291] set prod to v2.9.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index b9dd7d1..79abb30 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.8.0" +export CIVIFORM_VERSION="v2.9.0" # REQUIRED # Version of the infrastructure to use. From 71a4e583a35d49e34ed2cfd85fab7ffcc31c6de6 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 28 Aug 2024 10:54:21 -0700 Subject: [PATCH 235/291] CSP --- civiform_config.staging.sh | 5 +++-- civiform_config.test.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 659f9f9..9663715 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" -#export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" +export CIVIFORM_VERSION="latest" +#export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" # REQUIRED # Version of the infrastructure to use. @@ -279,3 +279,4 @@ export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true +export CSP_REPORT_ONLY=false diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 128aefd..bf18987 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -248,3 +248,4 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export CSP_REPORT_ONLY=false From 392d62f55ad44f9a6906c02c9627125953f6a475 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:53:00 +0000 Subject: [PATCH 236/291] Update slackapi/slack-github-action action to v1.27.0 --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/slack-notification-tester.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3e0833f..985eb53 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Notify Slack Start - uses: slackapi/slack-github-action@v1.26.0 + uses: slackapi/slack-github-action@v1.27.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" @@ -107,7 +107,7 @@ jobs: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.26.0 + uses: slackapi/slack-github-action@v1.27.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index e72f904..134e359 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.26.0 + uses: slackapi/slack-github-action@v1.27.0 with: channel-id: 'C03UXPUEXU4' slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" From b2b5fa01f478f963404ce9c6cd9bc38a2afd2ff2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 11 Sep 2024 06:50:11 -0700 Subject: [PATCH 237/291] Set test to v2.11.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index bf18987..f1d7c18 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.9.0" +export CIVIFORM_VERSION="v2.11.0" # REQUIRED # Version of the infrastructure to use. From bf011d339e26d38908e3aad4c19685f4ae73e480 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 11 Sep 2024 10:53:10 -0700 Subject: [PATCH 238/291] Updating to v2.11.0 --- civiform_config.prod.sh | 7 ++++--- civiform_config.test.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 79abb30..bc42b83 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.9.0" +export CIVIFORM_VERSION="v2.11.0" # REQUIRED # Version of the infrastructure to use. @@ -34,8 +34,8 @@ export CIVIFORM_VERSION="v2.9.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Lock to this postgres version so it doesn't update unexpectedly export POSTGRESQL_VERSION="16.2" @@ -251,3 +251,4 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +# export CSP_REPORT_ONLY=false diff --git a/civiform_config.test.sh b/civiform_config.test.sh index f1d7c18..2280977 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -34,8 +34,8 @@ export CIVIFORM_VERSION="v2.11.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 6a9b657f03d355600e58270f4cb0ca535f504dfd Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 11 Sep 2024 11:42:47 -0700 Subject: [PATCH 239/291] Enforce CSP --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index bc42b83..da3513e 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -251,4 +251,4 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -# export CSP_REPORT_ONLY=false +export CSP_REPORT_ONLY=false From 7b292c120d3078d3fb23e63ea5d33a39177f120f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 17 Sep 2024 03:20:02 -0700 Subject: [PATCH 240/291] Adding more service area examples --- civiform_config.staging.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 9663715..7e0d53a 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -256,10 +256,10 @@ export MEASUREMENT_ID="G-HXM0Y35TGE" export ESRI_ADDRESS_CORRECTION_ENABLED=true export ESRI_FIND_ADDRESS_CANDIDATES_URLS="https://gisdata.seattle.gov/cosgis/rest/services/locators/AddressPoints/GeocodeServer/findAddressCandidates, https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ENABLED=true -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" -export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_URLS="https://gisdata.seattle.gov/server/rest/services/COS/Seattle_City_Limits/MapServer/1/query, https://gisdata.kingcounty.gov/arcgis/rest/services/OpenDataPortal/property__parcel_address_area/MapServer/1722/query, https://gisdata.kingcounty.gov/arcgis/rest/services/OpenDataPortal/property__parcel_address_area/MapServer/1722/query" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_LABELS="Seattle, IsSmt_PropName, IsSmt_SiteId" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle, SEATTLE MUNICIPAL TOWER, {8761A355-5251-49DB-90D3-4B3A885FBF40}" +export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME, PROP_NAME, SITEID" export ESRI_WELLKNOWN_ID_OVERRIDE="2926" # Common Intake From 6230ece792bc39adee517dd0a4f9df72474aac08 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 17 Sep 2024 06:16:10 -0700 Subject: [PATCH 241/291] Pushing test img to staging --- civiform_config.staging.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 7e0d53a..a860bf3 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" -#export CIVIFORM_VERSION="SNAPSHOT-fc2a8a6-1724710776" +#export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-c0532da-gwen-esri-addr-test" # REQUIRED # Version of the infrastructure to use. From d6bcca5e5f19a70aac98d75b708d619c9f6657d5 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 17 Sep 2024 06:24:53 -0700 Subject: [PATCH 242/291] Push specific snapshot to staging --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index a860bf3..39f1fe4 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -24,7 +24,7 @@ export CIVIFORM_MODE="staging" # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". #export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="DEV-c0532da-gwen-esri-addr-test" +export CIVIFORM_VERSION="SNAPSHOT-d79716b-1726535107" # REQUIRED # Version of the infrastructure to use. From 8916e6365ecbe0c59b3dd3440a5a517c853bf93b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 17 Sep 2024 14:00:44 -0700 Subject: [PATCH 243/291] Set test to v2.12 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2280977..86b4d74 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.11.0" +export CIVIFORM_VERSION="v2.12.0" # REQUIRED # Version of the infrastructure to use. From a33933a12c90917a04cbbb0a2054a4f64c010a5f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 18 Sep 2024 07:32:08 -0700 Subject: [PATCH 244/291] Updating prod to v2.12 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index da3513e..a090176 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.11.0" +export CIVIFORM_VERSION="v2.12.0" # REQUIRED # Version of the infrastructure to use. From 7eeb8b1778ec780b0f7485e592ec13cd86eae600 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 23 Sep 2024 14:07:40 -0700 Subject: [PATCH 245/291] Set staging back to latest release --- civiform_config.staging.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 39f1fe4..a1ad0b2 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -#export CIVIFORM_VERSION="latest" -export CIVIFORM_VERSION="SNAPSHOT-d79716b-1726535107" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From d99833e02a5741b4fe6e4da9ef255315f3f0a505 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 24 Sep 2024 14:49:45 -0700 Subject: [PATCH 246/291] Set test to v2.13 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 86b4d74..510b24e 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.12.0" +export CIVIFORM_VERSION="v2.13.0" # REQUIRED # Version of the infrastructure to use. From fb6c1733bded10155234776218c037512c79314e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 9 Oct 2024 15:33:34 -0700 Subject: [PATCH 247/291] Updating test and prod to v2.15 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index a090176..f35fee1 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.12.0" +export CIVIFORM_VERSION="v2.15.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 510b24e..0d8c20e 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.13.0" +export CIVIFORM_VERSION="v2.15.0" # REQUIRED # Version of the infrastructure to use. From 61a99629ab4a4f473eccbdfd94788cdce6fa07b7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 10 Oct 2024 16:43:38 -0700 Subject: [PATCH 248/291] Update test version to use snapshot with bug fix --- civiform_config.test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 0d8c20e..8a5f2ff 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.15.0" +#export CIVIFORM_VERSION="v2.15.0" +export CIVIFORM_VERSION="SNAPSHOT-15270eb-1728593055" # REQUIRED # Version of the infrastructure to use. @@ -34,8 +35,8 @@ export CIVIFORM_VERSION="v2.15.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +#export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration ################################################# From 788772cbb74d04894fa56ba7a05b4fb513cb4964 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 10 Oct 2024 16:58:01 -0700 Subject: [PATCH 249/291] Update postgres version --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index f35fee1..bc1933d 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -38,7 +38,7 @@ export CIVIFORM_VERSION="v2.15.0" export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Lock to this postgres version so it doesn't update unexpectedly -export POSTGRESQL_VERSION="16.2" +export POSTGRESQL_VERSION="16.3" # Terraform configuration ################################################# From 84259c3cf241393286728d24397dd8c1e6c00dbc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 10 Oct 2024 16:59:10 -0700 Subject: [PATCH 250/291] Update prod to use snapshot with bug fix --- civiform_config.prod.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index bc1933d..f359c62 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,8 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.15.0" +# export CIVIFORM_VERSION="v2.15.0" +export CIVIFORM_VERSION="SNAPSHOT-15270eb-1728593055" # REQUIRED # Version of the infrastructure to use. @@ -34,8 +35,8 @@ export CIVIFORM_VERSION="v2.15.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Lock to this postgres version so it doesn't update unexpectedly export POSTGRESQL_VERSION="16.3" From 178540b130fc6357699381abf7e51729c28fcfc2 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 17 Oct 2024 08:18:18 -0700 Subject: [PATCH 251/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index 627bab9..86195a1 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -1,7 +1,14 @@ name: Test GIS on: - workflow_dispatch: {} + workflow_dispatch: + inputs: + force_send_teams_message: + type: boolean + description: 'Message Teams anyway' + default: false + required: false + schedule: - cron: '0 * * * *' @@ -11,6 +18,9 @@ jobs: test-gis: runs-on: ubuntu-latest + env: + FORCE_SEND_TEAMS_MESSAGE: ${{ (github.event.inputs == null || github.event.inputs.force_send_teams_message == 'true') }} + steps: - name: Checkout uses: actions/checkout@v4 @@ -24,3 +34,10 @@ jobs: with: webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' message: 'Testing GIS failed. There *may* be issues afoot. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' + + - name: Force send test message to ms teams + if: (env.FORCE_SEND_TEAMS_MESSAGE == 'true') + uses: dhollerbach/actions.send-message-to-ms-teams@1.0.10 + with: + webhook: '${{ secrets.MICROSOFT_TEAMS_WEBHOOK_URI }}' + message: 'Nothing is wrong. Just testing the teams connection.' From 0eefbd3d4ad9598b73987434ef77cb92f954c655 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 17 Oct 2024 11:29:32 -0700 Subject: [PATCH 252/291] Update test_gis.yml --- .github/workflows/test_gis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gis.yml b/.github/workflows/test_gis.yml index 86195a1..78e1ff1 100644 --- a/.github/workflows/test_gis.yml +++ b/.github/workflows/test_gis.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest env: - FORCE_SEND_TEAMS_MESSAGE: ${{ (github.event.inputs == null || github.event.inputs.force_send_teams_message == 'true') }} + FORCE_SEND_TEAMS_MESSAGE: ${{ (github.event.inputs != null && github.event.inputs.force_send_teams_message == 'true') }} steps: - name: Checkout From 94e131ee47cedddb78b35e0dc5c7716783c31744 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 17 Oct 2024 13:55:19 -0700 Subject: [PATCH 253/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index a1ad0b2..757a4fe 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -265,6 +265,9 @@ export ESRI_WELLKNOWN_ID_OVERRIDE="2926" export COMMON_INTAKE_MORE_RESOURCES_LINK_TEXT="Affordable Seattle" export COMMON_INTAKE_MORE_RESOURCES_LINK_HREF="https://www.affordableseattle.org" +# Additional Customization +export FILE_UPLOAD_ALLOWED_FILE_TYPE_SPECIFIERS="image/*,.pdf,.xlsx" + # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" From 62ffb4d8df23017371a5e0684f772466941ad10e Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 21 Oct 2024 18:43:00 -0700 Subject: [PATCH 254/291] Remove old CSP feature flag --- civiform_config.staging.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 757a4fe..4a65f55 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -281,4 +281,3 @@ export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true -export CSP_REPORT_ONLY=false From 190d5fa50537fa189a6f114786e0d0646c39a3e7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 21 Oct 2024 19:40:34 -0700 Subject: [PATCH 255/291] Update run-prober --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index cc73046..74e65ff 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -16,4 +16,4 @@ docker run \ -e DISABLE_SCREENSHOTS=false \ -e CI=true \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test -- --grep-invert @northstar $@" + -c "npm install && npm test -- --grep-invert @northstar admin_api_keys.test.ts:96 $@" From 12f1b27ca659854628ee118d0f64838908e68fab Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 21 Oct 2024 19:44:10 -0700 Subject: [PATCH 256/291] Update run-prober --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index 74e65ff..8c9204e 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -16,4 +16,4 @@ docker run \ -e DISABLE_SCREENSHOTS=false \ -e CI=true \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test -- --grep-invert @northstar admin_api_keys.test.ts:96 $@" + -c "npm install && npm test -- --grep-invert @northstar admin_api_keys.test.ts $@" From 8a986fea7364856d04ffdb8f92950279c63e96ae Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 21 Oct 2024 20:49:51 -0700 Subject: [PATCH 257/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 4a65f55..c788640 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -280,4 +280,4 @@ export API_GENERATED_DOCS_ENABLED=true export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export SHOW_NOT_PRODUCTION_BANNER_ENABLED=true +export SHOW_NOT_PRODUCTION_BANNER_ENABLED=false From e87dd100ede223f268e802b3fb4e4fc99cad0884 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 04:13:05 +0000 Subject: [PATCH 258/291] Update dependency @types/node to v20.16.14 --- qa/package-lock.json | 19 ++++++++++--------- qa/package.json | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index 53196d2..d9edaa0 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -7,7 +7,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.45.2", - "@types/node": "20.14.11", + "@types/node": "20.16.14", "typescript": "5.5.3" } }, @@ -28,13 +28,13 @@ } }, "node_modules/@types/node": { - "version": "20.14.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", - "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", + "version": "20.16.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.14.tgz", + "integrity": "sha512-vtgGzjxLF7QT88qRHtXMzCWpAAmwonE7fwgVjFtXosUva2oSpnIEc3gNO9P7uIfOxKnii2f79/xtOnfreYtDaA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/fsevents": { @@ -98,10 +98,11 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" } } } diff --git a/qa/package.json b/qa/package.json index a4ccb10..318ca4f 100644 --- a/qa/package.json +++ b/qa/package.json @@ -2,7 +2,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.45.2", - "@types/node": "20.14.11", + "@types/node": "20.16.14", "typescript": "5.5.3" } } From 15275b49ee432321c5fe2091bb15973488308ac7 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 21 Oct 2024 21:33:05 -0700 Subject: [PATCH 259/291] Update run-prober --- bin/run-prober | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-prober b/bin/run-prober index 8c9204e..cc73046 100755 --- a/bin/run-prober +++ b/bin/run-prober @@ -16,4 +16,4 @@ docker run \ -e DISABLE_SCREENSHOTS=false \ -e CI=true \ civiform/civiform-browser-test:latest \ - -c "npm install && npm test -- --grep-invert @northstar admin_api_keys.test.ts $@" + -c "npm install && npm test -- --grep-invert @northstar $@" From b01f0829d69104bc661477c04c93902f3f2ea5fc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:33:58 +0000 Subject: [PATCH 260/291] Update dependency @playwright/test to v1.48.1 --- qa/package-lock.json | 24 ++++++++++++------------ qa/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index d9edaa0..4564f60 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -6,19 +6,19 @@ "": { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.45.2", + "@playwright/test": "1.48.1", "@types/node": "20.16.14", "typescript": "5.5.3" } }, "node_modules/@playwright/test": { - "version": "1.45.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz", - "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==", + "version": "1.48.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz", + "integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.45.2" + "playwright": "1.48.1" }, "bin": { "playwright": "cli.js" @@ -52,13 +52,13 @@ } }, "node_modules/playwright": { - "version": "1.45.2", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz", - "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==", + "version": "1.48.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz", + "integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.45.2" + "playwright-core": "1.48.1" }, "bin": { "playwright": "cli.js" @@ -71,9 +71,9 @@ } }, "node_modules/playwright-core": { - "version": "1.45.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz", - "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==", + "version": "1.48.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz", + "integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/qa/package.json b/qa/package.json index 318ca4f..01dbbba 100644 --- a/qa/package.json +++ b/qa/package.json @@ -1,7 +1,7 @@ { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.45.2", + "@playwright/test": "1.48.1", "@types/node": "20.16.14", "typescript": "5.5.3" } From 3b8cda7a095c7c22d022d1be14139b7717453347 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:34:05 +0000 Subject: [PATCH 261/291] Update dependency typescript to v5.6.3 --- qa/package-lock.json | 8 ++++---- qa/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index d9edaa0..cdf086a 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -8,7 +8,7 @@ "devDependencies": { "@playwright/test": "1.45.2", "@types/node": "20.16.14", - "typescript": "5.5.3" + "typescript": "5.6.3" } }, "node_modules/@playwright/test": { @@ -84,9 +84,9 @@ } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/qa/package.json b/qa/package.json index 318ca4f..c0e3ce2 100644 --- a/qa/package.json +++ b/qa/package.json @@ -3,6 +3,6 @@ "devDependencies": { "@playwright/test": "1.45.2", "@types/node": "20.16.14", - "typescript": "5.5.3" + "typescript": "5.6.3" } } From ae566ec267b963504678107df40b6e02fe54c851 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 22 Oct 2024 14:51:41 -0700 Subject: [PATCH 262/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c788640..e85a8f6 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="SNAPSHOT-ff1f74e-1729627495" # REQUIRED # Version of the infrastructure to use. From 6394520639cdfc89be5d293650cae27cbee9c968 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 28 Oct 2024 09:17:51 -0700 Subject: [PATCH 263/291] Update test to v2.17.0 --- civiform_config.test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 8a5f2ff..15825d9 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -#export CIVIFORM_VERSION="v2.15.0" -export CIVIFORM_VERSION="SNAPSHOT-15270eb-1728593055" +export CIVIFORM_VERSION="v2.17.0" # REQUIRED # Version of the infrastructure to use. From f639eb6717eb237a4ef4e9e28cac65446889b1a4 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 28 Oct 2024 09:18:23 -0700 Subject: [PATCH 264/291] Set staging to latest --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index e85a8f6..c788640 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-ff1f74e-1729627495" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From bb1cb2e90aa9678b58cdc9b7f2882c9ee25882a8 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 29 Oct 2024 09:20:20 -0700 Subject: [PATCH 265/291] Add xlsx file types --- civiform_config.test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 15825d9..49e647f 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -240,6 +240,9 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" export ESRI_WELLKNOWN_ID_OVERRIDE="2926" +# Additional Customization +export FILE_UPLOAD_ALLOWED_FILE_TYPE_SPECIFIERS="image/*,.pdf,.xlsx" + # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" From d75dcd53e7022521b14841465b52cb291bbc207f Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Tue, 29 Oct 2024 09:22:44 -0700 Subject: [PATCH 266/291] Set prod to v2.17.0 --- civiform_config.prod.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index f359c62..e8b575e 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,8 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -# export CIVIFORM_VERSION="v2.15.0" -export CIVIFORM_VERSION="SNAPSHOT-15270eb-1728593055" +export CIVIFORM_VERSION="v2.17.0" # REQUIRED # Version of the infrastructure to use. @@ -248,6 +247,9 @@ export ESRI_WELLKNOWN_ID_OVERRIDE="2926" export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" +# Additional Customization +export FILE_UPLOAD_ALLOWED_FILE_TYPE_SPECIFIERS="image/*,.pdf,.xlsx" + # Feature Flags export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true From 321c868ed8c066d5bf531c03fa680cb8132576fc Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 30 Oct 2024 08:46:01 -0700 Subject: [PATCH 267/291] Updates to config versions for v2.18.0 --- civiform_config.prod.sh | 9 ++++----- civiform_config.test.sh | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index e8b575e..e88e2a8 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.17.0" +export CIVIFORM_VERSION="v2.18.0" # REQUIRED # Version of the infrastructure to use. @@ -243,15 +243,14 @@ export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_IDS="Seattle" export ESRI_ADDRESS_SERVICE_AREA_VALIDATION_ATTRIBUTES="CITYNAME" export ESRI_WELLKNOWN_ID_OVERRIDE="2926" +# Additional Customization +export FILE_UPLOAD_ALLOWED_FILE_TYPE_SPECIFIERS="image/*,.pdf,.xlsx" + # Language Settings export CIVIFORM_SUPPORTED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl, vi" -# Additional Customization -export FILE_UPLOAD_ALLOWED_FILE_TYPE_SPECIFIERS="image/*,.pdf,.xlsx" - # Feature Flags export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export CSP_REPORT_ONLY=false diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 49e647f..82e5c53 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.17.0" +export CIVIFORM_VERSION="v2.18.0" # REQUIRED # Version of the infrastructure to use. @@ -251,4 +251,3 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export CSP_REPORT_ONLY=false From b9feffc2f15554de2969f49df7f11e3a8d905697 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:03:16 +0000 Subject: [PATCH 268/291] Update dependency @types/node to v22 --- qa/package-lock.json | 10 +++++----- qa/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index e7d2d7c..596f72a 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -7,7 +7,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.48.1", - "@types/node": "20.16.14", + "@types/node": "22.8.5", "typescript": "5.6.3" } }, @@ -28,13 +28,13 @@ } }, "node_modules/@types/node": { - "version": "20.16.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.14.tgz", - "integrity": "sha512-vtgGzjxLF7QT88qRHtXMzCWpAAmwonE7fwgVjFtXosUva2oSpnIEc3gNO9P7uIfOxKnii2f79/xtOnfreYtDaA==", + "version": "22.8.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.5.tgz", + "integrity": "sha512-5iYk6AMPtsMbkZqCO1UGF9W5L38twq11S2pYWkybGHH2ogPUvXWNlQqJBzuEZWKj/WRH+QTeiv6ySWqJtvIEgA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~6.19.8" } }, "node_modules/fsevents": { diff --git a/qa/package.json b/qa/package.json index 4c8af16..456272d 100644 --- a/qa/package.json +++ b/qa/package.json @@ -2,7 +2,7 @@ "name": "seattle-civiform-smoke-tests", "devDependencies": { "@playwright/test": "1.48.1", - "@types/node": "20.16.14", + "@types/node": "22.8.5", "typescript": "5.6.3" } } From 25582a455a81cbb07ab2cab301f747cee1a47f5a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 31 Oct 2024 08:30:01 -0700 Subject: [PATCH 269/291] Set test to SNAPSHOT-5daf1c1-1730319184 for testing --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 82e5c53..2a693ab 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.18.0" +export CIVIFORM_VERSION="SNAPSHOT-5daf1c1-1730319184" # REQUIRED # Version of the infrastructure to use. From 57de39d8a71a84741c55865f1ce3545b67b72901 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:31:34 +0000 Subject: [PATCH 270/291] Update dependency @playwright/test to v1.48.2 --- qa/package-lock.json | 24 ++++++++++++------------ qa/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qa/package-lock.json b/qa/package-lock.json index 596f72a..c87ce79 100644 --- a/qa/package-lock.json +++ b/qa/package-lock.json @@ -6,19 +6,19 @@ "": { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.48.1", + "@playwright/test": "1.48.2", "@types/node": "22.8.5", "typescript": "5.6.3" } }, "node_modules/@playwright/test": { - "version": "1.48.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz", - "integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==", + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.2.tgz", + "integrity": "sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.48.1" + "playwright": "1.48.2" }, "bin": { "playwright": "cli.js" @@ -52,13 +52,13 @@ } }, "node_modules/playwright": { - "version": "1.48.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz", - "integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==", + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.2.tgz", + "integrity": "sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.48.1" + "playwright-core": "1.48.2" }, "bin": { "playwright": "cli.js" @@ -71,9 +71,9 @@ } }, "node_modules/playwright-core": { - "version": "1.48.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz", - "integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==", + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.2.tgz", + "integrity": "sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/qa/package.json b/qa/package.json index 456272d..2af155c 100644 --- a/qa/package.json +++ b/qa/package.json @@ -1,7 +1,7 @@ { "name": "seattle-civiform-smoke-tests", "devDependencies": { - "@playwright/test": "1.48.1", + "@playwright/test": "1.48.2", "@types/node": "22.8.5", "typescript": "5.6.3" } From 0ee94e080b3adf18bdb96f3531552a3de4085f52 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Mon, 4 Nov 2024 08:17:22 -0800 Subject: [PATCH 271/291] Delete CODEOWNERS --- CODEOWNERS | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index 29851f8..0000000 --- a/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -@civiform/developers From 9ed7db498bce853278c6791133467cb917276b7c Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 7 Nov 2024 09:49:42 -0800 Subject: [PATCH 272/291] Updat test to v2.19.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 2a693ab..b10776c 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="SNAPSHOT-5daf1c1-1730319184" +export CIVIFORM_VERSION="v2.19.0" # REQUIRED # Version of the infrastructure to use. From f82777cbac738b4c5b419e07712f8d2bb304a094 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:57:51 -0800 Subject: [PATCH 273/291] Update civiform_config.prod.sh Change CiviForm version for release on 11/7/2024 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index e88e2a8..ec429c9 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.18.0" +export CIVIFORM_VERSION="v2.19.0" # REQUIRED # Version of the infrastructure to use. From 2f9212e9963afc2515b2c1475b90531da0f181fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:44:36 +0000 Subject: [PATCH 274/291] Update slackapi/slack-github-action action to v2 --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/slack-notification-tester.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 985eb53..fdcf4d7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Notify Slack Start - uses: slackapi/slack-github-action@v1.27.0 + uses: slackapi/slack-github-action@v2.0.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" @@ -107,7 +107,7 @@ jobs: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.27.0 + uses: slackapi/slack-github-action@v2.0.0 with: channel-id: ${{ env.SLACK_CHANNEL }} slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index 134e359..f2e0e63 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Notify Slack Complete if: always() - uses: slackapi/slack-github-action@v1.27.0 + uses: slackapi/slack-github-action@v2.0.0 with: channel-id: 'C03UXPUEXU4' slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" From 105d85fe5475c83d8dd297768dbcfac65ebf301a Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 21 Nov 2024 07:32:54 -0800 Subject: [PATCH 275/291] Updating to v2.20.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index ec429c9..5dc17e6 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.19.0" +export CIVIFORM_VERSION="v2.20.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index b10776c..abf0211 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.19.0" +export CIVIFORM_VERSION="v2.20.0" # REQUIRED # Version of the infrastructure to use. From b0986d247baaeb8bde01ecbc912fcd377bd6122b Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Thu, 21 Nov 2024 07:48:40 -0800 Subject: [PATCH 276/291] Updating to v2.21.0 --- civiform_config.prod.sh | 2 +- civiform_config.test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 5dc17e6..16f60f3 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.20.0" +export CIVIFORM_VERSION="v2.21.0" # REQUIRED # Version of the infrastructure to use. diff --git a/civiform_config.test.sh b/civiform_config.test.sh index abf0211..5555be2 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.20.0" +export CIVIFORM_VERSION="v2.21.0" # REQUIRED # Version of the infrastructure to use. From c0a1f924a1b0041ef03f066c21987a24303e7030 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Fri, 22 Nov 2024 08:56:57 -0800 Subject: [PATCH 277/291] Setting staging to use custom image --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c788640..7f72e63 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="latest" +export CIVIFORM_VERSION="DEV-7e6b8e6-gwen-enable-mfu-job" # REQUIRED # Version of the infrastructure to use. From d880989b087d6ce2832cb428e33c3a0533f4adf3 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 27 Nov 2024 12:31:13 -0800 Subject: [PATCH 278/291] Update slack-notification-tester.yml --- .github/workflows/slack-notification-tester.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/slack-notification-tester.yml b/.github/workflows/slack-notification-tester.yml index f2e0e63..4c44d3b 100644 --- a/.github/workflows/slack-notification-tester.yml +++ b/.github/workflows/slack-notification-tester.yml @@ -13,8 +13,11 @@ jobs: if: always() uses: slackapi/slack-github-action@v2.0.0 with: - channel-id: 'C03UXPUEXU4' - slack-message: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" + method: chat.postMessage + token: ${{ secrets.SLACK_BOT_TOKEN }} + payload: | + channel: ${{ env.CHANNEL_ID }} + text: ":space-needle: Test Message from Seattle Staging Deploy: \n${{ job.status }} ${{ env.ICON }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }} TEST>" env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + CHANNEL_ID: C03UXPUEXU4 ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 5c68419ab59c64bab90cae2f18f50ed71cf850e9 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 11:40:55 -0800 Subject: [PATCH 279/291] Update civiform_config.staging.sh --- civiform_config.staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index 7f72e63..c788640 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="DEV-7e6b8e6-gwen-enable-mfu-job" +export CIVIFORM_VERSION="latest" # REQUIRED # Version of the infrastructure to use. From e6702482b808d600dc625af1dbc58b6ea981b639 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 16:22:29 -0800 Subject: [PATCH 280/291] Update slack --- .github/workflows/deploy.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fdcf4d7..f6e8870 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,10 +56,13 @@ jobs: - name: Notify Slack Start uses: slackapi/slack-github-action@v2.0.0 with: - channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" + method: chat.postMessage + token: ${{ secrets.SLACK_BOT_TOKEN }} + payload: | + channel: ${{ env.CHANNEL_ID }} + text: ":space-needle: Starting Seattle Deploy\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + CHANNEL_ID: C03UXPUEXU4 - name: Checkout uses: actions/checkout@v4 @@ -109,8 +112,11 @@ jobs: if: always() uses: slackapi/slack-github-action@v2.0.0 with: - channel-id: ${{ env.SLACK_CHANNEL }} - slack-message: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" + method: chat.postMessage + token: ${{ secrets.SLACK_BOT_TOKEN }} + payload: | + channel: ${{ env.SLACK_CHANNEL }} + text: ":space-needle: ${{ env.STATUS_ICON }} Completed Seattle Deploy <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ job.status }}>\nVersion: ${{ env.LATEST_SNAPSHOT_TAG }}\nEnv: ${{ env.ENVIRONMENT }}\nDeploy: ${{ env.DEPLOY_ENABLED }}\nProbers: ${{ env.PROBERS_ENABLED }}" env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + CHANNEL_ID: C03UXPUEXU4 STATUS_ICON: ${{fromJSON('[":no_entry:", ":white_check_mark:"]')[job.status == 'success']}} From 8a293f45524b720643d9ee4f5ebca8b14f100e77 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 16:23:48 -0800 Subject: [PATCH 281/291] update ubuntu --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f6e8870..3aa9524 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,7 +34,7 @@ concurrency: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 environment: ${{ github.event.inputs.environment || 'staging' }} env: From dabda73dfafc5f53a7f8c0d44b2f0ff5cc16ca84 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 16:28:04 -0800 Subject: [PATCH 282/291] Update to ubuntu 24.04 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3aa9524..a138af9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,7 +34,7 @@ concurrency: jobs: deploy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: ${{ github.event.inputs.environment || 'staging' }} env: From e92143a7d05cad24678a020a6dc73fdf7ad23afa Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 16:34:31 -0800 Subject: [PATCH 283/291] Add terraform install --- .github/workflows/deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a138af9..850db52 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -67,6 +67,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Install terraform cli + uses: hashicorp/setup-terraform@v3 + with: + terraform_wrapper: false + - name: Resolve Latest Snapshot Tag run: source bin/resolve-latest-snapshot-tag From a1a79d3ccc78296656b5086ac5c9fb6215268940 Mon Sep 17 00:00:00 2001 From: Gwendolyn Goetz Date: Wed, 4 Dec 2024 16:39:17 -0800 Subject: [PATCH 284/291] Set back to latest ubuntu --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 850db52..bb39073 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,7 +34,7 @@ concurrency: jobs: deploy: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest environment: ${{ github.event.inputs.environment || 'staging' }} env: From 4b6633ed1c4520eff414412a0d4e01f809e854be Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:17:36 -0800 Subject: [PATCH 285/291] Update civiform_config.test.sh Updating version to v2.23.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 5555be2..41c64d8 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.21.0" +export CIVIFORM_VERSION="v2.23.0" # REQUIRED # Version of the infrastructure to use. From 7a0ece4c8b52a77b4487d306a2a9484c7bdc3ad3 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:27:33 -0800 Subject: [PATCH 286/291] Update civiform_config.prod.sh Updating version to v2.23.0 --- civiform_config.prod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 16f60f3..3734fe6 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="prod" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.21.0" +export CIVIFORM_VERSION="v2.23.0" # REQUIRED # Version of the infrastructure to use. From f646c2c28d618d9e4a74539677957c52a16887f0 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:37:52 -0800 Subject: [PATCH 287/291] Update civiform_config.staging.sh Enable bulk status update in staging --- civiform_config.staging.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/civiform_config.staging.sh b/civiform_config.staging.sh index c788640..80f0640 100644 --- a/civiform_config.staging.sh +++ b/civiform_config.staging.sh @@ -281,3 +281,4 @@ export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true export SHOW_NOT_PRODUCTION_BANNER_ENABLED=false +export BULK_STATUS_UPDATE_ENABLED=true From bbfdfcc3aecd50ed2036fe9ee6ed2ab7b8973a36 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:38:37 -0800 Subject: [PATCH 288/291] Update civiform_config.test.sh Enable bulk status update on test --- civiform_config.test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 41c64d8..f9ec50a 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -251,3 +251,4 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true +export BULK_STATUS_UPDATE_ENABLED=true From a56e5b84d12b5abd2ba2c9c5d45c4e76f0e9a423 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:33:23 -0800 Subject: [PATCH 289/291] Update civiform_config.test.sh Updating to latest version v2.26.0 --- civiform_config.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index f9ec50a..61dd9a2 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -23,7 +23,7 @@ export CIVIFORM_MODE="staging" # # For dev and staging civiform modes, can be "latest". For prod, must be a version from # https://github.com/civiform/civiform/releases, for example "v1.2.3". -export CIVIFORM_VERSION="v2.23.0" +export CIVIFORM_VERSION="v2.26.0" # REQUIRED # Version of the infrastructure to use. From c028929e28a2d7c06844b1118f253085d48567f0 Mon Sep 17 00:00:00 2001 From: Swathi Murthi <101214724+swatkat1@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:50:12 -0800 Subject: [PATCH 290/291] Update civiform_config.test.sh Removing bulk status flag from Test config --- civiform_config.test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 61dd9a2..245cd5a 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -251,4 +251,3 @@ export CIVIFORM_APPLICANT_ENABLED_LANGUAGES="en-US, am, zh-TW, ko, so, es-US, tl export ADMIN_OIDC_ENHANCED_LOGOUT_ENABLED=true export APPLICANT_OIDC_ENHANCED_LOGOUT_ENABLED=true export NEW_APPLICANT_URL_SCHEMA_ENABLED=true -export BULK_STATUS_UPDATE_ENABLED=true From 76fdba02a5146850268eb4d3b367e8d28d5233fe Mon Sep 17 00:00:00 2001 From: swatkat1 Date: Thu, 30 Jan 2025 15:38:43 -0800 Subject: [PATCH 291/291] update --- civiform_config.prod.sh | 4 ++-- civiform_config.test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/civiform_config.prod.sh b/civiform_config.prod.sh index 3734fe6..24c0f91 100644 --- a/civiform_config.prod.sh +++ b/civiform_config.prod.sh @@ -34,8 +34,8 @@ export CIVIFORM_VERSION="v2.23.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -# export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +#export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Lock to this postgres version so it doesn't update unexpectedly export POSTGRESQL_VERSION="16.3" diff --git a/civiform_config.test.sh b/civiform_config.test.sh index 245cd5a..f0c4f7b 100644 --- a/civiform_config.test.sh +++ b/civiform_config.test.sh @@ -34,8 +34,8 @@ export CIVIFORM_VERSION="v2.26.0" # depending on USE_DOCKER flag. # # Using "latest" is recommended. -export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" -#export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" +#export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="latest" +export CIVIFORM_CLOUD_DEPLOYMENT_VERSION="${CIVIFORM_VERSION}" # Terraform configuration #################################################