Skip to content

2025-04-16 | MAIN --> PROD | DEV (9d96b89) --> STAGING#4906

Merged
asteel-gsa merged 2 commits into
prodfrom
main
Apr 16, 2025
Merged

2025-04-16 | MAIN --> PROD | DEV (9d96b89) --> STAGING#4906
asteel-gsa merged 2 commits into
prodfrom
main

Conversation

@asteel-gsa
Copy link
Copy Markdown
Contributor

This is an auto-generated pull request to merge main into prod for a staging release on 2025-04-16 with the last commit being merged as 9d96b89

rnovak338 and others added 2 commits April 16, 2025 11:26
* Reference audit_year instead of audit.audit_year

* Report ID generation fix

- Now using SQL to get the next ID.
- We are now getting this ID in every instance where we generate a SAC, and pass it as the `id` for the new SAC object.
- Audits currently pull the ID directly from the SAC. Once we deprecate the SAC, we will make the same adjustments for the Audit.

* Linting and test fixes

* Create constant for sequence names
* Initial UEI waiver automation exploration

Per ADR.

* Checking migrations... interim commit.

* Adds validation waiver

I really don't know what we want to put for the name of the entity. It
might be better to leave blank. I'm going to move this to a draft PR for
others to put eyes on.

* Minor email address edit

* Adding ADR and tests

* Improving test

Adding a check to see the waiver was granted/generated.

* Adding shape validation into UEI checkups

Because we allow a 403/404, we need to make sure we match the schema
here.

* Fixing tests for new validation process

* Fixing linting.

* Update ADR to fit format

* Only grant waivers if none exist

Add logging as well.

* Fixed test case with multiple submissions
@asteel-gsa asteel-gsa added autogenerated Automated pull request creation automerge Used for automated deployments labels Apr 16, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 16, 2025

Terraform plan for staging

Error: External Program Execution Failed
Error: External Program Execution Failed

  with module.staging.module.cg-logshipper.data.external.logshipperzip,
  on ../shared/modules/cg-logshipper/cg-logshipper.tf line 75, in data "external" "logshipperzip":
  75:   program     = ["/bin/sh", "prepare-logshipper.sh"]

The data source received an unexpected error while attempting to execute the
program.

Program: /bin/sh
Error Message: warning: safe.directory has multiple values

State: exit status 5

Error: External Program Execution Failed

  with module.staging.module.fac-file-scanner.data.external.scannerzip,
  on ../shared/modules/scanner/scanner.tf line 21, in data "external" "scannerzip":
  21:   program     = ["/bin/sh", "prepare-scanner.sh"]

The data source received an unexpected error while attempting to execute the
program.

Program: /bin/sh
Error Message: warning: safe.directory has multiple values

State: exit status 5

❌ Plan not applied in Deploy to Staging Environment #351 (Plan has changed)

@github-actions
Copy link
Copy Markdown
Contributor

Terraform plan for production

Plan: 1 to add, 6 to change, 1 to destroy.
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
!~  update in-place
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # module.domain.cloudfoundry_route.origin_route_connected[0] will be updated in-place
!~  resource "cloudfoundry_route" "origin_route_connected" {
!~      destinations = [
-           {
-               app_id           = "5dac166f-2fb0-4e72-8d4d-4359191bf284" -> null
-               app_process_type = "web" -> null
-               id               = "1017be0d-b11c-4241-a150-3a9abcc0dff4" -> null
-               port             = 8080 -> null
-               protocol         = "http1" -> null
            },
+           {
+               app_id           = "************************************"
+               app_process_type = (known after apply)
+               id               = (known after apply)
+               port             = (known after apply)
+               protocol         = (known after apply)
            },
        ]
        id           = "e83a78c3-6efc-4cf3-b5be-064693423601"
#        (7 unchanged attributes hidden)
    }

  # module.production.cloudfoundry_app.postgrest will be updated in-place
!~  resource "cloudfoundry_app" "postgrest" {
!~      environment                     = (sensitive value)
        id                              = "70ac44be-3507-4867-a75f-c2d1ab12ee89"
!~      id_bg                           = "************************************" -> (known after apply)
        name                            = "postgrest"
#        (16 unchanged attributes hidden)

#        (2 unchanged blocks hidden)
    }

  # module.production.cloudfoundry_network_policy.app-network-policy will be updated in-place
!~  resource "cloudfoundry_network_policy" "app-network-policy" {
        id = "41e96938-1383-c2ce-3157-af85063feaa3"

-       policy {
-           destination_app = "ae5cd101-195d-4ca1-8a26-58b6a08a1fdb" -> null
-           port            = "61443" -> null
-           protocol        = "tcp" -> null
-           source_app      = "15290fef-8636-4e27-9b57-c86318f85cc8" -> null
        }
-       policy {
-           destination_app = "ae5cd101-195d-4ca1-8a26-58b6a08a1fdb" -> null
-           port            = "61443" -> null
-           protocol        = "tcp" -> null
-           source_app      = "5dac166f-2fb0-4e72-8d4d-4359191bf284" -> null
        }
+       policy {
+           destination_app = (known after apply)
+           port            = "61443"
+           protocol        = "tcp"
+           source_app      = "15290fef-8636-4e27-9b57-c86318f85cc8"
        }
+       policy {
+           destination_app = (known after apply)
+           port            = "61443"
+           protocol        = "tcp"
+           source_app      = "5dac166f-2fb0-4e72-8d4d-4359191bf284"
        }
    }

  # module.production.cloudfoundry_network_policy.clamav-network-policy will be updated in-place
!~  resource "cloudfoundry_network_policy" "clamav-network-policy" {
        id = "bffa4f44-73e2-295d-6c7e-2809a21406d6"

-       policy {
-           destination_app = "5e81ca8b-99cf-41f8-ae42-76652d51a44c" -> null
-           port            = "61443" -> null
-           protocol        = "tcp" -> null
-           source_app      = "99ba1218-5b6e-42fc-9484-00eebde48eda" -> null
        }
-       policy {
-           destination_app = "5e81ca8b-99cf-41f8-ae42-76652d51a44c" -> null
-           port            = "61443" -> null
-           protocol        = "tcp" -> null
-           source_app      = "ae5cd101-195d-4ca1-8a26-58b6a08a1fdb" -> null
        }
+       policy {
+           destination_app = "5e81ca8b-99cf-41f8-ae42-76652d51a44c"
+           port            = "61443"
+           protocol        = "tcp"
+           source_app      = (known after apply)
        }
+       policy {
+           destination_app = "5e81ca8b-99cf-41f8-ae42-76652d51a44c"
+           port            = "61443"
+           protocol        = "tcp"
+           source_app      = (known after apply)
        }
    }

  # module.production.module.clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
+       buildpacks                      = (known after apply)
!~      created_at                      = "2025-03-14T15:36:41Z" -> (known after apply)
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:296c46bb74c5a29e4b71aa0d46a8518dd379b4410026a9a3ab97b0ea8fc7b4bd" -> "ghcr.io/gsa-tts/fac/clamav@sha256:4e61d8d6f87c27e7f81bf0b3eb4834b38a7eb827d5f6498cce1d2192f5d2c95a"
!~      health_check_type               = "port" -> (known after apply)
!~      id                              = "************************************" -> (known after apply)
!~      log_rate_limit_per_second       = "-1" -> (known after apply)
        name                            = "fac-av-production"
!~      readiness_health_check_type     = "process" -> (known after apply)
!~      stack                           = null -> (known after apply)
!~      updated_at                      = "2025-04-02T17:24:26Z" -> (known after apply)
#        (9 unchanged attributes hidden)
    }

  # module.production.module.cors.null_resource.cors_header must be replaced
-/+ resource "null_resource" "cors_header" {
!~      id       = "*******************" -> (known after apply)
!~      triggers = { # forces replacement
!~          "always_run" = "2025-04-02T17:35:54Z" -> (known after apply)
        }
    }

  # module.production.module.file_scanner_clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
+       buildpacks                      = (known after apply)
!~      created_at                      = "2025-03-14T15:36:41Z" -> (known after apply)
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:296c46bb74c5a29e4b71aa0d46a8518dd379b4410026a9a3ab97b0ea8fc7b4bd" -> "ghcr.io/gsa-tts/fac/clamav@sha256:4e61d8d6f87c27e7f81bf0b3eb4834b38a7eb827d5f6498cce1d2192f5d2c95a"
!~      health_check_type               = "port" -> (known after apply)
!~      id                              = "************************************" -> (known after apply)
!~      log_rate_limit_per_second       = "-1" -> (known after apply)
        name                            = "fac-av-production-fs"
!~      readiness_health_check_type     = "process" -> (known after apply)
!~      stack                           = null -> (known after apply)
!~      updated_at                      = "2025-04-02T17:24:26Z" -> (known after apply)
#        (9 unchanged attributes hidden)
    }

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

📝 Plan generated in Pull Request Checks #4654

@github-actions
Copy link
Copy Markdown
Contributor

Code Coverage

Package Line Rate Branch Rate Health
. 100% 100%
api 98% 86%
api.serializers 97% 88%
api.views 91% 100%
audit 95% 80%
audit.cross_validation 97% 85%
audit.fixtures 84% 50%
audit.intakelib 89% 83%
audit.intakelib.checks 92% 85%
audit.intakelib.common 98% 82%
audit.intakelib.transforms 100% 95%
audit.management.commands 78% 17%
audit.migrations 100% 100%
audit.models 91% 59%
audit.templatetags 100% 100%
audit.views 74% 55%
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 80% 37%
curation 100% 100%
curation.curationlib 93% 100%
curation.migrations 100% 100%
dissemination 91% 69%
dissemination.migrations 97% 25%
dissemination.report_generation 29% 0%
dissemination.report_generation.excel 32% 0%
dissemination.searchlib 59% 41%
dissemination.templatetags 100% 100%
dissemination.views 76% 55%
djangooidc 53% 38%
djangooidc.tests 100% 94%
report_submission 100% 95%
report_submission.migrations 100% 100%
report_submission.templatetags 74% 100%
report_submission.views 77% 63%
support 93% 74%
support.migrations 100% 100%
support.models 90% 50%
tools 98% 50%
users 95% 86%
users.fixtures 100% 83%
users.management 100% 100%
users.management.commands 100% 100%
users.migrations 100% 100%
Summary 89% (20089 / 22533) 71% (2439 / 3458)

@asteel-gsa asteel-gsa merged commit d413504 into prod Apr 16, 2025
49 of 50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autogenerated Automated pull request creation automerge Used for automated deployments

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants