Skip to content

2025-04-03 | MAIN --> PROD | DEV (7b57a86) --> STAGING#4850

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

2025-04-03 | MAIN --> PROD | DEV (7b57a86) --> STAGING#4850
asteel-gsa merged 3 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-03 with the last commit being merged as 7b57a86

Matthew Jadud and others added 3 commits April 2, 2025 13:01
* Removes spaces from prior reference numbers

The code previously removed spaces before the comma; we want to remove
spaces entirely.

That is, regardless of whether we have

2023-001 ,2022-004

or

2023-001, 2022-004

or

2023-001 , 2022-004

they should all become

2023-001,2022-004

We already trim() the strings; this makes sure there are no internal
spaces whatsoever.

* Adding unit test

No spaces should remain in the `prior_references` field after this
transform is complete.

* Removing unneeded import

* Need to explicitly ignore a Flake8 warning

We're trying to test the space at the end of a line...

* Remove a whitespace?

* Does this pass the linter?

I really want the whitespace...
Co-authored-by: James Person <james.person@gsa.gov>
* Trimming prior reference strings

This is a partner to a previous fix.

When we pull prior reference strings, they might look like:

* "2022-001"
* "2022-001,2021-003"
* "2022-001, 2021-003"
* "2022-001 ,2021-003"
* " 2022-001,2021-003"
* ...

We were splitting on a comma, but we could then be left with substrings
that have whitespace at the beginning and/or end.

This adds a `map()` that does a `trim()` on every string. This
guarantees that there is no whitespace in the prior reference strings,
and should eliminate some lookup/validation errors.

* `strip()`, not `trim()`

---------

Co-authored-by: James Person <jperson1@umbc.edu>
Co-authored-by: James Person <james.person@gsa.gov>
@asteel-gsa asteel-gsa added autogenerated Automated pull request creation automerge Used for automated deployments labels Apr 3, 2025
@asteel-gsa asteel-gsa requested a review from a team as a code owner April 3, 2025 10:26
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2025

Terraform plan for staging

Plan: 1 to add, 0 to change, 1 to destroy.
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.staging.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-01T10:53:47Z" -> (known after apply)
        }
    }

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

✅ Plan applied in Deploy to Staging Environment #344

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2025

Terraform plan for production

Plan: 1 to add, 1 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.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)
        }
    }

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

📝 Plan generated in Pull Request Checks #4536

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2025

Code Coverage

Package Line Rate Branch Rate Health
. 100% 100%
api 98% 90%
audit 97% 87%
audit.cross_validation 98% 88%
audit.fixtures 84% 50%
audit.intakelib 88% 82%
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 94% 73%
audit.templatetags 100% 100%
audit.views 72% 54%
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 77% 37%
curation 100% 100%
curation.curationlib 93% 100%
curation.migrations 100% 100%
dissemination 92% 72%
dissemination.migrations 97% 25%
dissemination.searchlib 76% 66%
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 91% 66%
support.migrations 100% 100%
support.models 96% 50%
tools 98% 50%
users 95% 92%
users.fixtures 100% 83%
users.management 100% 100%
users.management.commands 100% 100%
users.migrations 100% 100%
Summary 91% (18519 / 20286) 77% (2281 / 2966)

@asteel-gsa asteel-gsa merged commit 687c83f into prod Apr 3, 2025
71 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.

3 participants