jperson1 commented 2 weeks ago

Search - Fix Major Program Display

In advanced search, the major program choice does not carry over after the search has been made. The search behavior is unaffected. But a user could potentially make a search with this filter and make a new one without re-selecting the major program choice, which would be confusing.

Change:

Use the proper key in major program form fields

How to test:

Verify on main that the major program choice does not carry over after making a search.
Switch to this branch and run normally.
Verify that the major program choice carries over properly.

PR Checklist: Submitter

[ ] Link to an issue if possible. If there’s no issue, describe what your branch does. Even if there is an issue, a brief description in the PR is still useful.
[x] List any special steps reviewers have to follow to test the PR. For example, adding a local environment variable, creating a local test file, etc.
[ ] For extra credit, submit a screen recording like this one.
[x] Make sure you’ve merged main into your branch shortly before creating the PR. (You should also be merging main into your branch regularly during development.)
[ ] Make sure you’ve accounted for any migrations. When you’re about to create the PR, bring up the application locally and then run git status | grep migrations. If there are any results, you probably need to add them to the branch for the PR. Your PR should have only one new migration file for each of the component apps, except in rare circumstances; you may need to delete some and re-run python manage.py makemigrations to reduce the number to one. (Also, unless in exceptional circumstances, your PR should not delete any migration files.)
[ ] Make sure that whatever feature you’re adding has tests that cover the feature. This includes test coverage to make sure that the previous workflow still works, if applicable.
[ ] Make sure the full-submission.cy.js Cypress test passes, if applicable.
[ ] Do manual testing locally. Our tests are not good enough yet to allow us to skip this step. If that’s not applicable for some reason, check this box.
[ ] Verify that no Git surgery was necessary, or, if it was necessary at any point, repeat the testing after it’s finished.
[ ] Once a PR is merged, keep an eye on it until it’s deployed to dev, and do enough testing on dev to verify that it deployed successfully, the feature works as expected, and the happy path for the broad feature area (such as submission) still works.
[ ] Ensure that prior to merging, the working branch is up to date with main and the terraform plan is what you expect.

PR Checklist: Reviewer

[ ] Pull the branch to your local environment and run make docker-clean; make docker-first-run && docker compose up; then run docker compose exec web /bin/bash -c "python manage.py test"
[ ] Manually test out the changes locally, or check this box to verify that it wasn’t applicable in this case.
[ ] Check that the PR has appropriate tests. Look out for changes in HTML/JS/JSON Schema logic that may need to be captured in Python tests even though the logic isn’t in Python.
[ ] Verify that no Git surgery is necessary at any point (such as during a merge party), or, if it was, repeat the testing after it’s finished.

The larger the PR, the stricter we should be about these points.

Pre Merge Checklist: Merger

[ ] Ensure that prior to approving, the terraform plan is what we expect it to be. -/+ resource "null_resource" "cors_header" should be destroying and recreating its self and ~ resource "cloudfoundry_app" "clamav_api" might be updating its sha256 for the fac-file-scanner and fac-av-${ENV} by default.
[ ] Ensure that the branch is up to date with main.
[ ] Ensure that a terraform plan has been recently generated for the pull request.

github-actions[bot] commented 2 weeks ago

Terraform plan for meta

No changes. Your infrastructure matches the configuration.

``` No changes. Your infrastructure matches the configuration. Terraform has compared your real infrastructure against your configuration and found no differences, so no changes are needed. Warning: Argument is deprecated with module.s3-backups.cloudfoundry_service_instance.bucket, on /tmp/terraform-data-dir/modules/s3-backups/s3/main.tf line 14, in resource "cloudfoundry_service_instance" "bucket": 14: recursive_delete = var.recursive_delete Since CF API v3, recursive delete is always done on the cloudcontroller side. This will be removed in future releases ```

:white_check_mark: Plan applied in Deploy to Development and Management Environment #858

github-actions[bot] commented 2 weeks ago

Terraform plan for dev

Plan: 1 to add, 0 to change, 1 to destroy.

```diff Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement Terraform will perform the following actions: # module.dev.module.cors.null_resource.cors_header must be replaced -/+ resource "null_resource" "cors_header" { !~ id = "*******************" -> (known after apply) !~ triggers = { # forces replacement !~ "always_run" = "2024-11-08T19:24:07Z" -> (known after apply) } } Plan: 1 to add, 0 to change, 1 to destroy. Warning: Argument is deprecated with module.dev-backups-bucket.cloudfoundry_service_instance.bucket, on /tmp/terraform-data-dir/modules/dev-backups-bucket/s3/main.tf line 14, in resource "cloudfoundry_service_instance" "bucket": 14: recursive_delete = var.recursive_delete Since CF API v3, recursive delete is always done on the cloudcontroller side. This will be removed in future releases (and 6 more similar warnings elsewhere) ```

:white_check_mark: Plan applied in Deploy to Development and Management Environment #858

github-actions[bot] commented 1 week ago

Terraform plan for meta

Plan: 8 to add, 0 to change, 0 to destroy.

```diff Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create Terraform will perform the following actions: # module.environments["dev"].local_file.initialization_script will be created + resource "local_file" "initialization_script" { + content = <<-EOT #!/bin/bash # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. set -e terraform init \ --backend-config=../shared/config/backend.tfvars \ --backend-config=key=terraform.tfstate.$(basename $(pwd)) EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0755" + filename = "./../dev/init.sh" + id = (known after apply) } # module.environments["dev"].local_file.providers-tf will be created + resource "local_file" "providers-tf" { + content = <<-EOT # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. terraform { required_version = "~> 1.0" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" version = "~>0.51.3" } } backend "s3" { # The rest of the backend parameters must be supplied when you initialize: # terraform init --backend-config=../shared/config/backend.tfvars \ # --backend-config=key=terraform.tfstate.$(basename $(pwd)) # # For more info, see: # https://developer.hashicorp.com/terraform/language/settings/backends/configuration#partial-configuration encrypt = "true" } } provider "cloudfoundry" { api_url = "https://api.fr.cloud.gov" user = var.cf_user password = var.cf_password } EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0644" + filename = "./../dev/providers-managed.tf" + id = (known after apply) } # module.environments["preview"].local_file.initialization_script will be created + resource "local_file" "initialization_script" { + content = <<-EOT #!/bin/bash # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. set -e terraform init \ --backend-config=../shared/config/backend.tfvars \ --backend-config=key=terraform.tfstate.$(basename $(pwd)) EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0755" + filename = "./../preview/init.sh" + id = (known after apply) } # module.environments["preview"].local_file.providers-tf will be created + resource "local_file" "providers-tf" { + content = <<-EOT # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. terraform { required_version = "~> 1.0" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" version = "~>0.51.3" } } backend "s3" { # The rest of the backend parameters must be supplied when you initialize: # terraform init --backend-config=../shared/config/backend.tfvars \ # --backend-config=key=terraform.tfstate.$(basename $(pwd)) # # For more info, see: # https://developer.hashicorp.com/terraform/language/settings/backends/configuration#partial-configuration encrypt = "true" } } provider "cloudfoundry" { api_url = "https://api.fr.cloud.gov" user = var.cf_user password = var.cf_password } EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0644" + filename = "./../preview/providers-managed.tf" + id = (known after apply) } # module.environments["production"].local_file.initialization_script will be created + resource "local_file" "initialization_script" { + content = <<-EOT #!/bin/bash # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. set -e terraform init \ --backend-config=../shared/config/backend.tfvars \ --backend-config=key=terraform.tfstate.$(basename $(pwd)) EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0755" + filename = "./../production/init.sh" + id = (known after apply) } # module.environments["production"].local_file.providers-tf will be created + resource "local_file" "providers-tf" { + content = <<-EOT # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. terraform { required_version = "~> 1.0" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" version = "~>0.51.3" } } backend "s3" { # The rest of the backend parameters must be supplied when you initialize: # terraform init --backend-config=../shared/config/backend.tfvars \ # --backend-config=key=terraform.tfstate.$(basename $(pwd)) # # For more info, see: # https://developer.hashicorp.com/terraform/language/settings/backends/configuration#partial-configuration encrypt = "true" } } provider "cloudfoundry" { api_url = "https://api.fr.cloud.gov" user = var.cf_user password = var.cf_password } EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0644" + filename = "./../production/providers-managed.tf" + id = (known after apply) } # module.environments["staging"].local_file.initialization_script will be created + resource "local_file" "initialization_script" { + content = <<-EOT #!/bin/bash # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. set -e terraform init \ --backend-config=../shared/config/backend.tfvars \ --backend-config=key=terraform.tfstate.$(basename $(pwd)) EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0755" + filename = "./../staging/init.sh" + id = (known after apply) } # module.environments["staging"].local_file.providers-tf will be created + resource "local_file" "providers-tf" { + content = <<-EOT # The content of this file is managed by Terraform. If you modify it, it may # be reverted the next time Terraform runs. If you want to make changes, do it # in ../meta/bootstrap-env/templates. terraform { required_version = "~> 1.0" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" version = "~>0.51.3" } } backend "s3" { # The rest of the backend parameters must be supplied when you initialize: # terraform init --backend-config=../shared/config/backend.tfvars \ # --backend-config=key=terraform.tfstate.$(basename $(pwd)) # # For more info, see: # https://developer.hashicorp.com/terraform/language/settings/backends/configuration#partial-configuration encrypt = "true" } } provider "cloudfoundry" { api_url = "https://api.fr.cloud.gov" user = var.cf_user password = var.cf_password } EOT + content_base64sha256 = (known after apply) + content_base64sha512 = (known after apply) + content_md5 = (known after apply) + content_sha1 = (known after apply) + content_sha256 = (known after apply) + content_sha512 = (known after apply) + directory_permission = "0777" + file_permission = "0644" + filename = "./../staging/providers-managed.tf" + id = (known after apply) } Plan: 8 to add, 0 to change, 0 to destroy. Warning: Argument is deprecated with module.s3-backups.cloudfoundry_service_instance.bucket, on /tmp/terraform-data-dir/modules/s3-backups/s3/main.tf line 14, in resource "cloudfoundry_service_instance" "bucket": 14: recursive_delete = var.recursive_delete Since CF API v3, recursive delete is always done on the cloudcontroller side. This will be removed in future releases ```

:memo: Plan generated in Pull Request Checks #3916

github-actions[bot] commented 1 week ago

Package	Line Rate	Branch Rate	Health
.	100%	100%	✔
api	98%	90%	✔
audit	97%	87%	✔
audit.cross_validation	98%	86%	✔
audit.fixtures	84%	50%	❌
audit.intakelib	90%	81%	➖
audit.intakelib.checks	92%	85%	➖
audit.intakelib.common	98%	82%	✔
audit.intakelib.transforms	100%	94%	✔
audit.management.commands	78%	17%	❌
audit.migrations	100%	100%	✔
audit.models	93%	75%	➖
audit.templatetags	100%	100%	✔
audit.views	61%	41%	❌
census_historical_migration	96%	65%	✔
census_historical_migration.migrations	100%	100%	✔
census_historical_migration.sac_general_lib	92%	84%	➖
census_historical_migration.transforms	95%	90%	✔
census_historical_migration.workbooklib	68%	69%	❌
config	78%	17%	❌
curation	100%	100%	✔
curation.curationlib	57%	100%	❌
curation.migrations	100%	100%	✔
dissemination	91%	72%	➖
dissemination.migrations	97%	25%	✔
dissemination.searchlib	74%	64%	❌
dissemination.templatetags	100%	100%	✔
djangooidc	53%	38%	❌
djangooidc.tests	100%	94%	✔
report_submission	93%	88%	➖
report_submission.migrations	100%	100%	✔
report_submission.templatetags	74%	100%	❌
support	95%	78%	✔
support.management.commands	96%	100%	✔
support.migrations	100%	100%	✔
support.models	97%	83%	✔
tools	98%	50%	✔
users	98%	100%	✔
users.fixtures	100%	83%	✔
users.management	100%	100%	✔
users.management.commands	100%	100%	✔
users.migrations	100%	100%	✔
Summary	91% (17131 / 18906)	77% (2116 / 2764)	➖

GSA-TTS / FAC