test merge to prod

[asteel-gsa]

PR checklist: submitters

• [ ] 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.
• [ ] 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.
• [ ] 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.

PR checklist: reviewers

• [ ] 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.

[github-actions[bot]]

Terraform plan for staging

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.staging.module.cg-logshipper.module.s3-logshipper-storage.cloudfoundry_service_instance.bucket, on /tmp/terraform-data-dir/modules/staging.cg-logshipper.s3-logshipper-storage/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 4 more similar warnings elsewhere) ```

:memo: Plan generated in Pull Request Checks #3027

[github-actions[bot]]

Terraform plan for production

Plan: 4 to add, 3 to change, 2 to destroy.

```diff Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create !~ update in-place -/+ destroy and then create replacement <= read (data resources) Terraform will perform the following actions: # module.production.cloudfoundry_network_policy.scanner-network-policy will be updated in-place !~ resource "cloudfoundry_network_policy" "scanner-network-policy" { id = "65fbd285-0a4b-cfbe-3445-d40cc279c621" + policy { + destination_app = "5e81ca8b-99cf-41f8-ae42-76652d51a44c" + port = "61443" + protocol = "tcp" + source_app = (known after apply) } } # module.production.module.fac-file-scanner.cloudfoundry_app.scanner_app will be created + resource "cloudfoundry_app" "scanner_app" { + buildpack = "https://github.com/cloudfoundry/python-buildpack" + disk_quota = 512 + enable_ssh = (known after apply) + environment = (sensitive value) + health_check_http_endpoint = (known after apply) + health_check_invocation_timeout = (known after apply) + health_check_timeout = (known after apply) + health_check_type = "port" + id = (known after apply) + id_bg = (known after apply) + instances = 1 + memory = 512 + name = "fac-file-scanner" + path = "../shared/modules/scanner/scanner.zip" + ports = (known after apply) + space = "5593dba8-7023-49a5-bdbe-e809fe23edf9" + stack = (known after apply) + stopped = false + strategy = "rolling" + timeout = 180 + routes { + port = (known after apply) + route = (known after apply) } + service_binding { + service_instance = "593e554d-fab4-4dc0-bf84-f4f9c39b5620" } + service_binding { + service_instance = "ac8bf271-4c6d-4ee0-bd36-1415b839a93c" } + service_binding { + service_instance = "ca564d14-b89a-4944-a43f-033dca62ab30" } + service_binding { + service_instance = "0eca29d3-e963-49e6-8c9e-c53b7aa8482e" } } # module.production.module.fac-file-scanner.cloudfoundry_route.scanner_route will be created + resource "cloudfoundry_route" "scanner_route" { + domain = "26df58ef-0c0d-4997-b68b-8defb7b3998b" + endpoint = (known after apply) + hostname = "fac-file-scanner-production" + id = (known after apply) + port = (known after apply) + space = "5593dba8-7023-49a5-bdbe-e809fe23edf9" } # module.production.module.file_scanner_clamav.data.cloudfoundry_app.app will be read during apply # (config refers to values not yet known) <= data "cloudfoundry_app" "app" { + buildpack = (known after apply) + command = (known after apply) + disk_quota = (known after apply) + enable_ssh = (known after apply) + environment = (sensitive value) + health_check_http_endpoint = (known after apply) + health_check_timeout = (known after apply) + health_check_type = (known after apply) + id = (known after apply) + instances = (known after apply) + memory = (known after apply) + name = (known after apply) + name_or_id = "****************" + space = (known after apply) + stack = (known after apply) + state = (known after apply) } # module.production.module.file_scanner_clamav.data.cloudfoundry_domain.internal will be read during apply # (depends on a resource or a module with changes pending) <= data "cloudfoundry_domain" "internal" { + domain = (known after apply) + id = (known after apply) + internal = (known after apply) + name = "apps.internal" + org = (known after apply) } # module.production.module.file_scanner_clamav.data.cloudfoundry_space.space will be read during apply # (depends on a resource or a module with changes pending) <= data "cloudfoundry_space" "space" { + id = (known after apply) + name = "production" + org = (known after apply) + org_name = "gsa-tts-oros-fac" + quota = (known after apply) } # module.production.module.file_scanner_clamav.cloudfoundry_app.clamav_api must be replaced -/+ resource "cloudfoundry_app" "clamav_api" { + buildpack = (known after apply) !~ enable_ssh = true -> (known after apply) + health_check_http_endpoint = (known after apply) !~ health_check_invocation_timeout = 0 -> (known after apply) !~ health_check_timeout = 0 -> (known after apply) !~ id = "************************************" -> (known after apply) !~ id_bg = "************************************" -> (known after apply) !~ instances = 2 -> 4 - labels = {} -> null name = "fac-av-production-fs" !~ ports = [] -> (known after apply) !~ space = "5593dba8-7023-49a5-bdbe-e809fe23edf9" # forces replacement -> (known after apply) # forces replacement + stack = (known after apply) # (8 unchanged attributes hidden) - routes { - port = 0 -> null - route = "3d584a52-c592-4879-8de9-11198d2f625d" -> null } + routes { + port = (known after apply) + route = (known after apply) } } # module.production.module.file_scanner_clamav.cloudfoundry_network_policy.clamav_routing will be updated in-place !~ resource "cloudfoundry_network_policy" "clamav_routing" { id = "22404581-6620-4dc7-9fbb-207db75b10be" + policy { + destination_app = (known after apply) + port = "61443" + protocol = "tcp" + source_app = (known after apply) } } # module.production.module.file_scanner_clamav.cloudfoundry_route.clamav_route must be replaced -/+ resource "cloudfoundry_route" "clamav_route" { !~ domain = "26df58ef-0c0d-4997-b68b-8defb7b3998b" # forces replacement -> (known after apply) # forces replacement !~ endpoint = "fac-av-production-fs.apps.internal" -> (known after apply) !~ id = "************************************" -> (known after apply) + port = (known after apply) !~ space = "5593dba8-7023-49a5-bdbe-e809fe23edf9" # forces replacement -> (known after apply) # forces replacement # (2 unchanged attributes hidden) } # module.production.module.https-proxy.cloudfoundry_app.egress_app will be updated in-place !~ resource "cloudfoundry_app" "egress_app" { id = "5e81ca8b-99cf-41f8-ae42-76652d51a44c" name = "https-proxy" !~ source_code_hash = "48b2f5eba8d1f35c0fbc2f90c2ec87cab180f5f19e7e34b16b9190fe5c5ca09a" -> "e246274fca627d48afccde010de949371f24b6c9974c48aa91044acd36654fa8" # (21 unchanged attributes hidden) # (1 unchanged block hidden) } Plan: 4 to add, 3 to change, 2 to destroy. Warning: Argument is deprecated with module.domain.cloudfoundry_service_instance.external_domain_instance, on /tmp/terraform-data-dir/modules/domain/domain/main.tf line 45, in resource "cloudfoundry_service_instance" "external_domain_instance": 45: 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 5 more similar warnings elsewhere) ```

:memo: Plan generated in Pull Request Checks #3027