Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024-06-05 | MAIN --> PROD | DEV (b25ed53) --> STAGING #3934

Merged
merged 34 commits into from
Jun 5, 2024
Merged

2024-06-05 | MAIN --> PROD | DEV (b25ed53) --> STAGING #3934

merged 34 commits into from
Jun 5, 2024

Conversation

jadudm
Copy link
Contributor

@jadudm jadudm commented Jun 5, 2024

This is an auto-generated pull request to merge main into prod for a staging release on 2024-06-05 with the last commit being merged as b25ed53

sambodeme and others added 30 commits May 16, 2024 20:46
… ids (#3833)

* #3713 Updated logic to handle cases where number of passthrough ids is greater than passthrough names

* Updating test cases
* Added InvalidAuditRecord and IssueDescriptionRecord django models

* Added InvalidAuditRecord and IssueDescriptionRecord django models

* Updated IssueDescriptionRecord per ADR change

* Updated IssueDescriptionRecord per ADR change
* Disable the schedule for daily staging deploy

* Change the comments so the file isn't invalid

* Disable deploy to production
* Updating handling of empty passthrough awards

* Removing _v2

* Fixing tests

* Lint

* Updating validation

* Fixing check_gsa
* fix type requirement copy

* fix comment
* Helper for recording invalid reports

* #3856 Updated invalid record class

* #3856 Added test case

* Added tracker for invalid record

* #3856 Added remaining sections
* Processing blank policies and rate note contents before usage

* Update

* Linting

* Update

* Transformations

* Test cases for Transformations

* Added accounting_policies

* Linting

* Linting

* Add rate_explained

Co-authored-by: Hassan D. M. Sambo <[email protected]>

---------

Co-authored-by: Hassan D. M. Sambo <[email protected]>
* A11y - Install Cypress Axe, new test file

* A11y - Allow SAC/home access if DISABLE_AUTH =true

* A11y - load_fixtures for new SACs, dummy dissem

* Linting, remove unused file.

* A11y - HTML and SCSS changes for accessibility

* A11y - Docs update for new workflow

* Add accessibility tests to testing-from-ghcr.yml

* Cypress - Update report upload page input ids

* Lint - Unused imports

* Lint - Various black changes, not a11y related

* Lint - Reformat new cypress files

* Re-linting - Whoops, wrong version of black

* GHA - upload screenshots, use dc-web, spaces

* Testing with just a11y workflow

* Testing with a historical data load

* Try changing the operating user for permissions

* A hail mary of sorts - user 1001 in docker compose

* ... Try user root on the a11y tests

* ... Try non-root user with specific cypress image

* Remove the user switch.

* Once more: non-root user, node 18 cypress image

* Attempt a11y tests in GHCR with node 20

* Try root user on a11y runner

* Revert testing-from-gchr.yml changes

* Add `npm i` to testing doc.

* Strike "TESTING" from e2e TSTDAT generator command

* Remove references to pa11y

* Remove references to lighthouse

* Include an a11y command in package.json

* Remove a11y reference from staging deploy yml
* add cross val for no fed awards

* add new test to bandit exclude dirs
* #3696 Code improvement

* #3696  More code improvement

* #3696 Updated logic to ignore historical audit report with duplicate reference number

* #3696 Allowed cross validation functions to access dat source

* Update logic to track and record invalid report records

* #3696 Django migration

* #3696 Added test case

* #3696 Fixed failing tests
* Removed hist_models

* Using dissemination models

* Using dissemination models

* Using dissemination models

* Removed hist_models

* Removed hist_models

* Removed hist_models

* Using dissemination models

* Removed hist_models

* Using dissemination models

* Using dissemination models

* Using dissemination models

* Using dissemination models

* Format with Black

* Format with Black

* Tested cog/over test cases

* Renamed get_dbkey to get_reportid_dbkey

* Tested cog_over

* Tested test cases

* Tested test cases

* Tested test cases

* Tested test cases

* Tested test cases

* Tested test cases

* run2022_23 command details

* Pass year as parameter

* Renamed run_2022.py to run_2022_23.py

* Merged with main and update migrations

* Merged with main and update migrations

* Update

* Allowing 2022 through 2024

* Reformat

* Update

* Renamed run_2022_23.py to check_cog_over_for_year.py

* Renamed run_2022_23.py to check_cog_over_for_year.py

* Updates to descriptions

* Updates to descriptions

* Updates to descriptions

* Updates to descriptions

* Updates to descriptions

* Updates to descriptions

* Merged with main and updated migrations

* Merged with main and updated migrations
* #3696 Code improvement

* #3696  More code improvement

* #3696 Updated logic to ignore historical audit report with duplicate reference number

* #3696 Allowed cross validation functions to access dat source

* Update logic to track and record invalid report records

* #3696 Django migration

* #3696 Added test case

* Added EXTRA_FINDING_REFERENCE_NUMBERS_IN_CAPTEXT

* Handle invalid audit record

* Handle invalid audit record

* Handle invalid audit record

* Create invalid audit record when captext findingrefnums is not present in findings

* Create invalid audit record when captext findingrefnums is not present in findings

* Testing

* Testing

* Testing

* Testing

* Tested

* Tested

* Merged with origin/3696-address-historical-awards-with-repeated-references

* Fixed merge issues

* Fixed merge issues

* Fixed merge issues, linting

* Fixed merge issues, linting

* Fixed merge issues, linting

* Rename test

* Rename test

* Fixed merge issue

* Linting

* Update

* Update

* Update

* Update

* Update

* Update

* Update

---------

Co-authored-by: Hassan D. M. Sambo <[email protected]>
)

* #3688 Added logic to retrieve range values

* #3688 Added logic to track invalid federal program total

* #3688 Added test case

* #3688 Code improvement

* Captured all necessary fields in record tracking

* Code improvement

* Bug fix
* Search - add search timing to results count

* Remove gitignore lighthouseci

* Remove a redundant line

* Add time display to advanced search, and _lint_

* Test updates to cover the new results format
* Creating xform_missing_cluster_total_v2

* Using xform_missing_cluster_total_v2 in tests

* Adding unit test

* Lint

* Lint

* Lint

* Fixing run_all_checks

* Simplifying checks_with_special_args

* Tracking for all invalid totals

* Lint

* Lint

* Removing is_data_migration for total cluster check

* Lint

* Lint

* Lint

* Invalid tracking fix

* Fixing unit test

* Lint
* Handle extra findings text references

* Handle extra findings text references

* Handle extra findings text references

* Handle extra findings text references

* Handle extra findings text references

* Resolved merge conflict
* Search - `distinct` call compatible with cog/over

* Search tests: Add a basic sort test for cog/over

* Cog/over test - put initial data very out of order

* Cog/over sort - alphabetical with column values
* add search test data+pageobjects

* modified search-tests.cy.js + searchPage.js

* add plugin downloadfile to devDependencies+addCommands.js require cypress-dpwnloadfile+addSumReport to searchPage.js+methods+searchTests

* remove search-audit-reports.cy.js + add modified search-tests.cy.js + modified searchPage.js

* Comment out adv search + singleAuditBtn + SumReportDownload

* Gen-Info POM changes

* Gen-Info POM changes

* modified general-info.js + modified genInfoData json files to be just one file with all data

* fix format on general-info.js

* update cypress version

* update package-lock.json

* rename files

* merged main into branch & changed uswds to 3.7.0

* merged main into branch & changed uswds to 3.7.0

* modified search-tests.cy.js,login-go.js,initialize-audit.js,search-page.js,gen-info.js,added new file search_data.json & deleted individual search page data json files

* Oops - Duplicate package entries

* rename search it blocks, remove empty spaces & add semicolons to files in cypress test suite

* refactor search-tests.cy.js & search-page.js & restore support files

* Remove comments/ old code from search-tests.cy.js

* Remove old functions from search-page.js

* change import from generalinfoform to testvalidgeneralinfo in create-new-audit.cy.js

* add reset button function, element and test and rearrange search tests

* fix spacing in search-tests.cy.js

* update npm

* revert a11y test ID changes

---------

Co-authored-by: Purvin <[email protected]>
Co-authored-by: James Person <[email protected]>
Co-authored-by: Daniel Swick <[email protected]>
… section (#3919)

* #3917 Added logic to handle missing values in findings section for historical reports

* #3917 Added logic to bypass validation when neeeded for historical data

* #3917 Updated schema and blocked gsa_migration key from normal intakes

* Bug fix
* Handling non-USA audits

* Cleaning up zip handling

* Fixing unit tests

* Adding country test

* Non-US check tweak

* Fixing unit tests
* Undo the workflow changes

* verbiage fix

* remove dispatch entirely
Use the autogenerated tag for bpmn render PRs to clean up seldom-used labels.
@jadudm jadudm requested a review from a team as a code owner June 5, 2024 17:50
@jadudm jadudm added autogenerated Automated pull request creation automerge Used for automated deployments labels Jun 5, 2024
* Bug: "Test Site" Banner on Production Error Pages (#3573)

* Add error handlers for other standard error pages

* Add error handlers for other standard error pages

* Reset file upload timeout to 30s. Oops.

* back to 8 (#3579)

---------

Co-authored-by: James Person <[email protected]>
Copy link
Contributor

github-actions bot commented Jun 5, 2024

Terraform plan for staging

Plan: 0 to add, 2 to change, 0 to destroy.
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
!~  update in-place

Terraform will perform the following actions:

  # module.staging.module.clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:a6b645538b565528a5dba563be597d5d7c8fe162a4924b14048d50d117450cf8" -> "ghcr.io/gsa-tts/fac/clamav@sha256:189736dbbb892c4bd7e7337b3850b767f05136b583e5e9574b74cc8f7a2b6731"
        id                              = "d1bea029-d2d3-4b68-b16d-b216bcaea573"
        name                            = "fac-av-staging"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

  # module.staging.module.file_scanner_clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:a6b645538b565528a5dba563be597d5d7c8fe162a4924b14048d50d117450cf8" -> "ghcr.io/gsa-tts/fac/clamav@sha256:189736dbbb892c4bd7e7337b3850b767f05136b583e5e9574b74cc8f7a2b6731"
        id                              = "28008a8e-f85b-4320-aedf-8522a2371bec"
        name                            = "fac-av-staging-fs"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

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

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)

✅ Plan applied in Deploy to Staging Environment #218

Copy link
Contributor

github-actions bot commented Jun 5, 2024

Terraform plan for production

Plan: 0 to add, 2 to change, 0 to destroy.
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
!~  update in-place

Terraform will perform the following actions:

  # module.production.module.clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:a6b645538b565528a5dba563be597d5d7c8fe162a4924b14048d50d117450cf8" -> "ghcr.io/gsa-tts/fac/clamav@sha256:189736dbbb892c4bd7e7337b3850b767f05136b583e5e9574b74cc8f7a2b6731"
        id                              = "5d0afa4f-527b-472a-8671-79a60335417f"
        name                            = "fac-av-production"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

  # module.production.module.file_scanner_clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:a6b645538b565528a5dba563be597d5d7c8fe162a4924b14048d50d117450cf8" -> "ghcr.io/gsa-tts/fac/clamav@sha256:189736dbbb892c4bd7e7337b3850b767f05136b583e5e9574b74cc8f7a2b6731"
        id                              = "a14bb29f-8276-4967-9754-cf9c4187ebe3"
        name                            = "fac-av-production-fs"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

Plan: 0 to add, 2 to change, 0 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)

📝 Plan generated in Pull Request Checks #3148

Copy link
Contributor

@tadhg-ohiggins tadhg-ohiggins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub is not showing any conflicts as of 2024-06-05 14:00.

Copy link
Contributor

github-actions bot commented Jun 5, 2024

File Coverage Missing
All files 87%
api/serializers.py 88% 177-178 183 188
api/test_views.py 95% 103
api/uei.py 88% 87 118-119 163 167-168
api/views.py 98% 198-199 337-338
audit/forms.py 60% 31-38 109-116
audit/intake_to_dissemination.py 88% 57-62 264 308-316
audit/mixins.py 96% 28
audit/test_commands.py 91%
audit/test_intakelib.py 88% 154-158
audit/test_manage_submission_access_view.py 98% 15 19
audit/test_mixins.py 90% 159-160 164-166 254-255 259-261
audit/test_validators.py 95% 439 443 611-612 851 858 865 872 1117-1118 1149-1150 1175-1180
audit/test_views.py 98% 132
audit/test_workbooks_should_fail.py 88% 58 87-88 92
audit/test_workbooks_should_pass.py 87% 59 74-76
audit/utils.py 86% 9 19 60-62 65
audit/validators.py 93% 138 190 272 412-413 428-429 512-513 615-619 624-628 644-653
audit/cross_validation/additional_ueis.py 93% 33
audit/cross_validation/check_award_ref_declaration.py 90%
audit/cross_validation/check_award_reference_uniqueness.py 93%
audit/cross_validation/check_certifying_contacts.py 87%
audit/cross_validation/check_findings_count_consistency.py 91%
audit/cross_validation/check_ref_number_in_cap.py 91%
audit/cross_validation/check_ref_number_in_findings_text.py 91%
audit/cross_validation/errors.py 78% 30 77
audit/cross_validation/naming.py 93% 229
audit/cross_validation/submission_progress_check.py 91% 83 126 174 182-183
audit/cross_validation/tribal_data_sharing_consent.py 81% 33 36 40
audit/cross_validation/validate_general_information.py 65% 77 81-84 96 99
audit/fixtures/dissemination.py 71% 38
audit/fixtures/single_audit_checklist.py 55% 160-197 245-254
audit/intakelib/exceptions.py 71% 7-9 12
audit/intakelib/intermediate_representation.py 91% 27-28 73 91 129 200-203 212-213 283-284
audit/intakelib/mapping_audit_findings.py 97% 55
audit/intakelib/mapping_audit_findings_text.py 97% 54
audit/intakelib/mapping_federal_awards.py 93% 92
audit/intakelib/mapping_util.py 79% 21 25 29 63 99 104-105 114-120 130 145 150
audit/intakelib/checks/check_all_unique_award_numbers.py 79% 24
audit/intakelib/checks/check_cluster_names.py 75% 20-25
audit/intakelib/checks/check_cluster_total.py 95% 99
audit/intakelib/checks/check_finding_reference_pattern.py 73% 31 41-42
audit/intakelib/checks/check_findings_grid_validation.py 89% 59
audit/intakelib/checks/check_has_all_the_named_ranges.py 95% 66
audit/intakelib/checks/check_is_a_workbook.py 69% 20
audit/intakelib/checks/check_loan_balance_entries.py 83% 28
audit/intakelib/checks/check_look_for_empty_rows.py 91% 18
audit/intakelib/checks/check_no_major_program_no_type.py 76% 18 27
audit/intakelib/checks/check_no_repeat_findings.py 88% 21
audit/intakelib/checks/check_other_cluster_names.py 81% 23 33
audit/intakelib/checks/check_passthrough_name_when_no_direct.py 83% 11 49 58
audit/intakelib/checks/check_sequential_award_numbers.py 82% 25 35
audit/intakelib/checks/check_start_and_end_rows_of_all_columns_are_same.py 89% 14
audit/intakelib/checks/check_state_cluster_names.py 81% 23 33
audit/intakelib/checks/check_version_number.py 73% 30 40-41
audit/intakelib/checks/runners.py 95% 187 217
audit/intakelib/common/util.py 90% 22 39
audit/intakelib/transforms/xform_rename_additional_notes_sheet.py 81% 14
audit/management/commands/load_fixtures.py 47% 40-46
audit/models/models.py 85% 58 60 65 67 209 215 227 239-242 260 437 455-456 464 486 584-585 589 597 606 612
audit/views/audit_info_form_view.py 27% 25-74 77-117 120-137
audit/views/manage_submission.py 86% 73-80
audit/views/manage_submission_access.py 98% 113-114
audit/views/pre_dissemination_download_view.py 78% 15-16 21-22 29-39
audit/views/submission_progress_view.py 89% 117 182-183
audit/views/tribal_data_consent.py 34% 23-41 44-79
audit/views/unlock_after_certification.py 57% 28-51 73-87
audit/views/upload_report_view.py 26% 32-35 44 91-117 120-170 178-209
audit/views/views.py 53% 74 81-100 123-124 198-199 220-230 257 268-269 280-281 283-287 329-342 345-359 364-377 394-400 405-425 452-456 461-490 533-537 542-562 589-593 598-627 670-674 679-691 694-704 709-721 754-768
census_historical_migration/change_record.py 98% 30
census_historical_migration/end_to_end_core.py 26% 56-88 92-110 115-153 159-185 243-255 260 270-304
census_historical_migration/invalid_record.py 94% 50 54 58 62 66
census_historical_migration/migration_result.py 75% 17 21 25 29 33-42 46
census_historical_migration/test_federal_awards_xforms.py 99% 216-217
census_historical_migration/sac_general_lib/audit_information.py 92% 24 78
census_historical_migration/sac_general_lib/cognizant_oversight.py 68% 11
census_historical_migration/sac_general_lib/general_information.py 86% 166-167 177-178 186-187 195-200 233-255 354
census_historical_migration/sac_general_lib/sac_creator.py 90% 34
census_historical_migration/sac_general_lib/utils.py 83% 33 60-69
census_historical_migration/transforms/xform_remove_hyphen_and_pad_zip.py 92% 18
census_historical_migration/transforms/xform_retrieve_uei.py 67% 10
census_historical_migration/transforms/xform_string_to_bool.py 87% 17
census_historical_migration/workbooklib/additional_eins.py 84% 58-60 67-77
census_historical_migration/workbooklib/additional_ueis.py 77% 27-29 36-46
census_historical_migration/workbooklib/corrective_action_plan.py 54% 49-51 91-111 120-139
census_historical_migration/workbooklib/excel_creation_utils.py 69% 110 119-124 129-136 140-158 171-175 189-192
census_historical_migration/workbooklib/federal_awards.py 74% 132-135 213-252 438 479-487 497-522 546-547 809-910
census_historical_migration/workbooklib/findings.py 69% 81-86 154-174 179-199 216-218 329-353
census_historical_migration/workbooklib/findings_text.py 54% 50-51 95-115 124-146
census_historical_migration/workbooklib/notes_to_sefa.py 66% 34-38 101-102 104-105 107-108 136-143 152-160 168-170 279-326
census_historical_migration/workbooklib/post_upload_utils.py 21% 22-35 66-83 89-111
census_historical_migration/workbooklib/secondary_auditors.py 90% 128-130 162-180
census_historical_migration/workbooklib/workbook_builder.py 38% 14-17 26-41
census_historical_migration/workbooklib/workbook_builder_loader.py 41% 18-30
config/error_handlers.py 94% 22
config/test_settings.py 92% 33-34 49-50
config/urls.py 72% 88
dissemination/file_downloads.py 81% 43-61 91-93
dissemination/forms.py 87% 135 144 255
dissemination/search.py 88% 113 115 119 127-128
dissemination/summary_reports.py 78% 274 300-302 306-310 421 438 459 511-575 603 638-640 664-672
dissemination/test_search.py 93% 51-66 473-474 579-596 608-632 644-669 677-693
dissemination/test_summary_reports.py 98%
dissemination/views.py 75% 134 140-142 159-225 268 298 300 336 387 389 391 469-474
dissemination/migrations/0002_general_fac_accepted_date.py 47% 10-12
dissemination/searchlib/search_alns.py 37% 44-58 78-110 115-177 184-187
dissemination/searchlib/search_direct_funding.py 86% 21-22
dissemination/searchlib/search_findings.py 76% 18-24 34 36 38
dissemination/searchlib/search_general.py 96% 138
dissemination/searchlib/search_passthrough_name.py 35% 21-31
djangooidc/backends.py 78% 32 57-63
djangooidc/exceptions.py 66% 19 21 23 28
djangooidc/oidc.py 16% 32-35 45-51 64-70 92-149 153-199 203-226 230-275 280-281 286
djangooidc/views.py 81% 22 43 109-110 117
djangooidc/tests/common.py 97%
report_submission/forms.py 92% 35
report_submission/test_views.py 98% 796
report_submission/views.py 77% 90 235 259-260 265-266 306-476 479-489 548 584-586 594-595 598-600
report_submission/templatetags/get_attr.py 76% 8 11-14 18
support/admin.py 88% 76 79 84 91-97 100-102
support/cog_over.py 91% 29-32 92 116-120 156
support/test_admin_api.py 81% 23 147-148 237-238 317-318
support/test_cog_over.py 98% 174-175 264
support/management/commands/seed_cog_baseline.py 98% 20-21
support/models/cog_over.py 89% 103-104
tools/update_program_data.py 89% 96
users/admin.py 99% 27
users/auth.py 96% 58-59
users/models.py 96% 18 74-75
users/fixtures/user_fixtures.py 91%

Minimum allowed coverage is 85%

Generated by 🐒 cobertura-action against d07c579

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.

9 participants