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-10-03 main -> prod #2375

Merged
merged 3 commits into from
Oct 3, 2023
Merged

2023-10-03 main -> prod #2375

merged 3 commits into from
Oct 3, 2023

Conversation

tadhg-ohiggins
Copy link
Contributor

Forms, bugs, dates, oh my.
So when these branches are live,
It will all be fine.


Move the tribal consent, workbook validation fixes, and fac_accepted_date branches into production.

jperson1 and others added 3 commits October 3, 2023 16:55
* Tribal audit consent form, first pass

* What is code without linting?

* Rename files/classes. Update to match Figma.

* no-late-changes id change.

* Djlint autoformat tribal data release

* Title, not date.

* Name/title side by side. Title moved out of grey box

* Fix grey box boundary. Underline grey box title

* We out here, linting python files

* Validate against schema on upload. Copy updates

* Checklist tribal data release description

* add function for tribal audit form+add to full sub

* tribal data consent cross-val

* Grey box encompasses all questions

* Remove-old-wkbks-edit tri-audit-form+gen-info.js

* tribal data consent cross-val (#2283)

* add two functions for tribal audi public & private

* Submission Progress Check - Tribal Data Release (#2310)

* Submission progress check - tribal data release

* Edit link for tribal data release.

* Tribal release above validation

* Don't err if no auditee certifier is found.

* remove is_public from audit model (#2319)

* Cypress - New Report ID Format and Tribal Fix (#2366)

* Remove pre-release instructions from prod deploy notes (#2328)

* Resume mocking SAM.gov call (#2360)

We meant to mock this and when we changed to using requests.session
we missed updating the mock call in api/test_views.py.
This wasn't detected because the actual call to SAM.gov would
work—until this week, when the larger volume of SAM.gov API calls
from actual users as well as our tests pushed us past the rate limit.

Co-authored-by: Tadhg O'Higgins <[email protected]>

* Tribal - sign out/in as auditee, then as auditor

* Cypress - New regex for report_ids

* Oops, committed a local JWT.

* Change tribal audit to private and not in API

---------

Co-authored-by: Dan Swick <[email protected]>
Co-authored-by: Tadhg O'Higgins <[email protected]>
Co-authored-by: Edward Zapata <[email protected]>

---------

Co-authored-by: Edward Zapata <[email protected]>
Co-authored-by: danswick <[email protected]>
Co-authored-by: Tadhg O'Higgins <[email protected]>
* #2282 Fixed schema validation bug for federal awards section

* #2282 Updated FederalAward schema to allow negative numbers and applied jsonnet formatting
* Adding fac_accepted_date with migration

* Adding api version

* Removing null

* Bumping API version

* Adding comment

* Checking for None

* Adding SubmissionEvent migration

* Fixing duplicate /general results

* Adding fac_accepted_date/disseminated

* Updating instructions

* Lint

* Lint

* Adding two step migration

* Fixing test_post_redirect

* Fixing test_submission

* Migration fixes

* Comment

---------

Co-authored-by: Phil Dominguez <“[email protected]”>
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to production October 3, 2023 21:17 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to staging October 3, 2023 21:17 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

Terraform plan for staging

Plan: 0 to add, 1 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.cloudfoundry_app.postgrest will be updated in-place
  ~ resource "cloudfoundry_app" "postgrest" {
      ~ environment                     = (sensitive value)
        id                              = "db50e549-24c7-4dcf-b30e-e9dee3512be8"
      ~ id_bg                           = "************************************" -> (known after apply)
        name                            = "postgrest"
        # (14 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

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

Warning: Argument is deprecated

  with module.staging.module.database.cloudfoundry_service_instance.rds,
  on /tmp/terraform-data-dir/modules/staging.database/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 2 more similar warnings elsewhere)

✅ Plan applied in Deploy to Staging Environment #57

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

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.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"
        # (14 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # 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:4b7513597a0e3cb7e71a1109e6fd63d53476ebf453928b23649176609b3ee0f7" -> "ghcr.io/gsa-tts/fac/clamav@sha256:8b88cea585056d4a67026a0fc5db8ba802a494ffae2a6959ddaceeb59e055a9b"
        id                              = "5d0afa4f-527b-472a-8671-79a60335417f"
        name                            = "fac-av-production"
        # (15 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 3 more similar warnings elsewhere)

✅ Plan applied in Deploy to Production Environment #17

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

File Coverage Missing
All files 88%
api/serializers.py 90% 125-126 131 136
api/test_views.py 96% 105
api/uei.py 96% 17-18 107-108
api/views.py 97% 196-197 204-205 226 362-363
audit/excel.py 85% 402 418 424 429 434 456-457 469 546 548 550 552 554 710-711 720-726 736 756
audit/forms.py 47% 22-29 142-149
audit/intake_to_dissemination.py 92% 67-68 197-203 253
audit/models.py 84% 57 59 64 66 213 246 417 435-436 444 466 542-543 547 555 564 570 573-579
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/utils.py 76% 13 21 38
audit/validators.py 96% 287-288 303-304 514-523
audit/views.py 42% 87-108 131-132 206-207 252-253 264-265 267-271 318-331 334-348 353-366 383-389 394-414 441-445 450-479 522-526 531-551 578-582 587-616 659-663 668-680 683-693 698-710 737-738 743-792 795-835 838-855
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 68% 178-182
audit/cross_validation/submission_progress_check.py 85% 62 77-80
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 79% 156 232-241
audit/management/commands/load_fixtures.py 46% 39-45
audit/viewlib/submission_progress_view.py 90% 171-172
audit/viewlib/tribal_data_consent.py 34% 23-41 44-79
audit/viewlib/upload_report_view.py 30% 32-35 44 91-115 118-186
cms/views.py 57% 11-16 29-30
config/urls.py 71% 87
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 49% 9-10 13 34 37 74 77 82 89-95 98-100 103-104 107-108
support/cog_over.py 90% 30-33 86 93 145
support/signals.py 66% 23-24 31-32
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/auth.py 95% 40-41
users/fixtures/user_fixtures.py 91%

Minimum allowed coverage is 90%

Generated by 🐒 cobertura-action against 8a04b52

Copy link
Contributor

@danswick danswick left a comment

Choose a reason for hiding this comment

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

🎬

@tadhg-ohiggins tadhg-ohiggins merged commit 63cd97a into prod Oct 3, 2023
29 checks passed
@asteel-gsa asteel-gsa temporarily deployed to staging October 4, 2023 09:00 — with GitHub Actions Inactive
@eazapata23 eazapata23 temporarily deployed to staging October 4, 2023 14:29 — with GitHub Actions Inactive
@eazapata23 eazapata23 temporarily deployed to staging October 4, 2023 14:29 — with GitHub Actions Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants