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

Update cross-val logic for tribal data consent form #2283

Merged
merged 1 commit into from
Sep 29, 2023

Conversation

danswick
Copy link
Contributor

closes #2103

PR checklist: submitters

  • Link to an issue if possible. If there’s no issue, describe what your branch does. Even if there is an issue, a brief description in the PR is still useful.
  • List any special steps reviewers have to follow to test the PR. For example, adding a local environment variable, creating a local test file, etc.
  • For extra credit, submit a screen recording like this one.
  • Make sure you’ve merged main into your branch shortly before creating the PR. (You should also be merging main into your branch regularly during development.)
  • Make sure that whatever feature you’re adding has tests that cover the feature. This includes test coverage to make sure that the previous workflow still works, if applicable.
  • Do manual testing locally. Our tests are not good enough yet to allow us to skip this step. If that’s not applicable for some reason, check this box.
  • Verify that no Git surgery was necessary, or, if it was necessary at any point, repeat the testing after it’s finished.
  • Once a PR is merged, keep an eye on it until it’s deployed to dev, and do enough testing on dev to verify that it deployed successfully, the feature works as expected, and the happy path for the broad feature area (such as submission) still works.

PR checklist: reviewers

  • Pull the branch to your local environment and run make docker-clean; make docker-first-run && docker compose up; then run docker compose exec web /bin/bash -c "python manage.py test"
  • Manually test out the changes locally, or check this box to verify that it wasn’t applicable in this case.
  • Check that the PR has appropriate tests. Look out for changes in HTML/JS/JSON Schema logic that may need to be captured in Python tests even though the logic isn’t in Python.
  • Verify that no Git surgery is necessary at any point (such as during a merge party), or, if it was, repeat the testing after it’s finished.

The larger the PR, the stricter we should be about these points.

@danswick danswick temporarily deployed to dev September 27, 2023 22:14 — with GitHub Actions Inactive
@danswick danswick temporarily deployed to meta September 27, 2023 22:14 — with GitHub Actions Inactive
@danswick danswick marked this pull request as ready for review September 27, 2023 22:14
@github-actions
Copy link
Contributor

Terraform plan for meta

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.s3-backups.cloudfoundry_service_instance.bucket,
  on /tmp/terraform-data-dir/modules/s3-backups/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

📝 Plan generated in Pull Request Checks #1126

@github-actions
Copy link
Contributor

Terraform plan for dev

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.dev.module.database.cloudfoundry_service_instance.rds,
  on /tmp/terraform-data-dir/modules/dev.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 generated in Pull Request Checks #1126

@github-actions
Copy link
Contributor

File Coverage Missing
All files 89%
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 87% 402 418 424 429 434 456-457 469 670-671 680-686 696 716
audit/forms.py 56% 22-29
audit/intake_to_dissemination.py 92% 70-71 200-206 256
audit/models.py 87% 185 218 389 407-408 416 438 514-515 519 527 536 540 546 549-555
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% 298-299 314-315 525-534
audit/views.py 42% 86-107 130-131 205-206 251-252 263-264 266-270 317-330 333-347 352-365 382-388 393-413 440-444 449-478 521-525 530-550 577-581 586-615 658-662 667-679 682-692 697-709 732-733 738-787 790-830 833-850
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 96% 158-159
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
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% 84 216-217 219 241-242 261-262 288-398 401-411
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 29-30
support/test_cog_over.py 98% 134-135 224
tools/update_program_data.py 89% 96
users/auth.py 95% 39-40
users/fixtures/user_fixtures.py 91%

Minimum allowed coverage is 90%

Generated by 🐒 cobertura-action against f8cb148

@danswick danswick changed the base branch from main to jppd/tribal-consent-form September 29, 2023 00:24
@danswick danswick merged commit b8250b4 into jppd/tribal-consent-form Sep 29, 2023
@danswick danswick deleted the ds-tribal-cross-val branch September 29, 2023 21:02
github-merge-queue bot pushed a commit that referenced this pull request Oct 3, 2023
* 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 <2626258+tadhg-ohiggins@users.noreply.github.com>

* 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 <daniel.swick@gsa.gov>
Co-authored-by: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
Co-authored-by: Edward Zapata <edward.zapata@gsa.gov>

---------

Co-authored-by: Edward Zapata <edward.zapata@gsa.gov>
Co-authored-by: danswick <daniel.swick@gsa.gov>
Co-authored-by: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
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.

Update cross-val logic to handle the new form
2 participants