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

2023-11-29 | MAIN --> PROD | DEV (6bb2530) --> STAGING #2892

Merged
merged 5 commits into from
Nov 29, 2023
Merged

2023-11-29 | MAIN --> PROD | DEV (6bb2530) --> STAGING #2892

merged 5 commits into from
Nov 29, 2023

Conversation

jadudm
Copy link
Contributor

@jadudm jadudm commented Nov 29, 2023

This is an auto-generated pull request to merge main into prod for a staging release on 2023-11-29 with the last commit being merged as 6bb2530

sambodeme and others added 5 commits November 28, 2023 13:02
* #2861 Update model mappings tfor federal awards worbook creation

* #Refactor code to make it more re-usable

* #2861 Code improvement

* #2861 More util functions and tests

* #2861 Generate workbooks to ensure the updated code is still working as expected

* Linting

* #2861 Regenerated workbooks to only include dbkeys that are available in census table

* #2861 Regenerated workbooks to only include dbkeys that are available in census tables

* #2861 Improved logic in light of data discoveries

* Added to commit by mistake

* #2861 Moved shared logic to a common area

* Update backend/census_historical_migration/test_excel_creation.py

Co-authored-by: Dan Swick <[email protected]>

* Linting

* Fix for failing test

---------

Co-authored-by: Dan Swick <[email protected]>
* Slicing last 2 year digits for dynamic_import

* Adding new command

* Renaming command to run_migration_for_year

* Renaming load_data to load_historic_data_for_year

* Renaming loader to historic_data_loader

* Lint

* Docstrings

* Teaking user creation

* Utilizing results dict

* Lint

* Fixing historic_data_migrator

---------

Co-authored-by: Phil Dominguez <“[email protected]”>
* Added FAILED_SACS and CHANGE_RECORDS models

* Routing CHANGE_RECORDS to fac db

* Initial commit

* Migration for FAILED_SACS, CHANGE_RECORDS tables

* Registering ELECAUDITHEADER, FAILED_SACS, CHANGE_RECORDS models

* Test cases for ELECAUDITHEADER, FAILED_SACS, CHANGE_RECORDS models

* Formatted with black

* Modified FailedSacs and ChangeRecords table per JMM's request

* Modified FailedSacs and ChangeRecords table per JMM's request

* Modified FailedSacs and ChangeRecords table per JMM's request

* Modified FailedSacs and ChangeRecords table per JMM's request

* Modified FailedSacs and ChangeRecords table per JMM's request

* Modified FailedSacs and ChangeRecords table per JMM's request

* Updating migrations

* Updating migrations

* Updating migrations

* Updated migrations

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on meeting

* Modifications based on ADR

* Modifications based on ADR

* Modifications based on ADR

* Modifications based on ADR

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Implemented changes per ADR review

* Fixed lint issue

* Redid migrations

* Replaced sac with record_id

* Replaced sac with record_id

* Registering all models

* Update backend/dissemination/models.py

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

* Redid migrations

* Renamed record_id as report_id

* Renamed record_id as report_id

* Added databases to route to census-to-gsafac db

---------

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

* #2861 Update model mappings tfor federal awards worbook creation

* #Refactor code to make it more re-usable

* #2861 Code improvement

* #2861 More util functions and tests

* #2861 Generate workbooks to ensure the updated code is still working as expected

* Linting

* #2861 Regenerated workbooks to only include dbkeys that are available in census table

* #2861 Regenerated workbooks to only include dbkeys that are available in census tables

* #2861 Improved logic in light of data discoveries

* Added to commit by mistake

* #2861 Moved shared logic to a common area

* #2880 Updated logic to use census models

* #2880 Regenerated workbooks to ensure logic works as intended

* Updated migrator command to use or create default user

* Updated wrong mapping

* More update to improve the api test
@jadudm jadudm added autogenerated Automated pull request creation automerge Used for automated deployments labels Nov 29, 2023
Copy link
Contributor

github-actions bot commented Nov 29, 2023

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.database-c2g.cloudfoundry_service_instance.rds,
  on /tmp/terraform-data-dir/modules/staging.database-c2g/database/main.tf line 14, in resource "cloudfoundry_service_instance" "rds":
  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 #95

Copy link
Contributor

Terraform plan for production

Plan: 2 to add, 0 to change, 0 to destroy.
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.production.module.database-c2g.cloudfoundry_service_instance.rds will be created
  + resource "cloudfoundry_service_instance" "rds" {
      + id                             = (known after apply)
      + name                           = "fac-c2g-db"
      + replace_on_params_change       = false
      + replace_on_service_plan_change = false
      + service_plan                   = "c1ddc2d6-983b-4ced-9995-064d9dde07aa"
      + space                          = "5593dba8-7023-49a5-bdbe-e809fe23edf9"
    }

  # module.production.module.s3-c2g.cloudfoundry_service_instance.bucket will be created
  + resource "cloudfoundry_service_instance" "bucket" {
      + id                             = (known after apply)
      + name                           = "fac-c2g-s3"
      + replace_on_params_change       = false
      + replace_on_service_plan_change = false
      + service_plan                   = "021bb2a3-7e11-4fc2-b06b-d9f5938cd806"
      + space                          = "5593dba8-7023-49a5-bdbe-e809fe23edf9"
    }

Plan: 2 to add, 0 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 #1769

Copy link
Contributor

File Coverage Missing
All files 86%
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% 195-196 334-335
audit/file_downloads.py 73% 35-53 81-83
audit/forms.py 47% 22-29 142-149
audit/intake_to_dissemination.py 92% 67-68 201-207 257
audit/test_commands.py 87%
audit/test_mixins.py 90% 112-113 117-119 184-185 189-191
audit/test_validators.py 95% 436 440 608-609 848 855 862 869
audit/test_views.py 95% 410-442 451-482 491-519
audit/test_workbooks_should_fail.py 88% 56 83-84 88
audit/test_workbooks_should_pass.py 90% 56 71
audit/utils.py 70% 13 21 33-35 38
audit/validators.py 92% 137 189 283-292 299-308 486-490 495-499 515-524
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 90%
audit/cross_validation/check_ref_number_in_findings_text.py 90%
audit/cross_validation/errors.py 78% 30 69
audit/cross_validation/naming.py 93% 182
audit/cross_validation/submission_progress_check.py 95% 79
audit/cross_validation/tribal_data_sharing_consent.py 81% 33 36 40
audit/cross_validation/validate_general_information.py 93% 28-29
audit/fixtures/single_audit_checklist.py 55% 146-183 229-238
audit/intakelib/exceptions.py 71% 7-9 12
audit/intakelib/intermediate_representation.py 91% 27-28 73 91 129 162 200-203 212-213
audit/intakelib/mapping_audit_findings.py 97% 53
audit/intakelib/mapping_audit_findings_text.py 97% 52
audit/intakelib/mapping_federal_awards.py 93% 95
audit/intakelib/mapping_util.py 81% 21 25 29 99 104-105 114-120 130 145 150
audit/intakelib/checks/check_all_unique_award_numbers.py 79% 24
audit/intakelib/checks/check_cluster_total.py 85% 49 65
audit/intakelib/checks/check_finding_prior_references_pattern.py 73% 33 43-44
audit/intakelib/checks/check_findings_grid_validation.py 84% 58
audit/intakelib/checks/check_has_all_the_named_ranges.py 84% 52
audit/intakelib/checks/check_is_a_workbook.py 69% 20
audit/intakelib/checks/check_loan_balance_entries.py 78% 22 39-40
audit/intakelib/checks/check_loan_balance_present.py 76% 27 36
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 76% 21 30
audit/intakelib/checks/check_other_cluster_names.py 81% 24 34
audit/intakelib/checks/check_passthrough_name_when_no_direct.py 88% 9 47
audit/intakelib/checks/check_sequential_award_numbers.py 76% 14 22
audit/intakelib/checks/check_show_ir.py 70% 8-14
audit/intakelib/checks/check_start_and_end_rows_of_all_columns_are_same.py 89% 14
audit/intakelib/checks/check_state_cluster_names.py 65% 23-24 34
audit/intakelib/checks/check_version_number.py 73% 21 31-32
audit/intakelib/checks/runners.py 95% 129
audit/intakelib/common/util.py 89% 21 38
audit/intakelib/transforms/xform_reformat_prior_references.py 55% 12-17
audit/intakelib/transforms/xform_rename_additional_notes_sheet.py 81% 14
audit/management/commands/load_fixtures.py 46% 39-45
audit/models/models.py 82% 57 59 64 66 216 228-231 249 422 440-441 449 471 560-561 565 573 582 588
audit/views/submission_progress_view.py 89% 111 171-172
audit/views/tribal_data_consent.py 34% 23-41 44-79
audit/views/unlock_after_certification.py 57% 28-47 69-83
audit/views/upload_report_view.py 26% 32-35 44 91-117 120-170 178-209
audit/views/views.py 31% 80-101 124-125 199-200 245-246 257-258 260-264 311-324 327-341 346-359 376-382 387-407 410-438 443-472 475-519 524-544 547-575 580-609 612-656 661-673 676-686 691-703 730-731 736-785 788-828 831-848
census_historical_migration/base_field_maps.py 93% 29-30
census_historical_migration/exception_utils.py 75% 5-6
census_historical_migration/sac_general_lib/report_id_generator.py 68% 11-18 27-28
census_historical_migration/sac_general_lib/utils.py 23% 11-32 36-56 62-64
census_historical_migration/transforms/xform_string_to_bool.py 11% 4-14
census_historical_migration/transforms/xform_string_to_date.py 22% 6-15
census_historical_migration/transforms/xform_string_to_int.py 55% 4 6 13-14
census_historical_migration/transforms/xform_string_to_string.py 60% 6 8
census_historical_migration/workbooklib/excel_creation_utils.py 47% 130-135 140-142 147-151 155-170 180-187 194-198 202-232 236
config/test_settings.py 90% 21-22 39-40 55-56
config/urls.py 71% 83
dissemination/models.py 99% 461
dissemination/search.py 59% 55-83 90-100
dissemination/views.py 82% 106 108-110 135 187 189 191
dissemination/migrations/0002_general_fac_accepted_date.py 47% 10-12
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 80% 22 43 114
djangooidc/tests/common.py 96%
report_submission/forms.py 92% 35
report_submission/views.py 76% 83 215-216 218 240-241 260-261 287-396 399-409
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% 30-33 93 145
support/models.py 89% 103-104
support/test_cog_over.py 98% 134-135 224
support/management/commands/seed_cog_baseline.py 98% 20-21
tools/update_program_data.py 89% 96
users/admin.py 98% 25
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 6bb2530

@jadudm jadudm merged commit c4835e3 into prod Nov 29, 2023
42 of 43 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.

5 participants