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-08-19 | MAIN --> PROD | DEV (320894f) --> STAGING #1882

Merged
merged 23 commits into from
Aug 21, 2023
Merged

2023-08-19 | MAIN --> PROD | DEV (320894f) --> STAGING #1882

merged 23 commits into from
Aug 21, 2023

Conversation

jadudm
Copy link
Contributor

@jadudm jadudm commented Aug 19, 2023

This is an auto-generated pull request to merge main into prod for a staging release on 2023-08-19 with the last commit being merged as 320894f

sambodeme and others added 17 commits August 17, 2023 19:47
Closes #1580

In this PR:
Adding steps to the full-submission test to include the audit report PDF upload
Removing the disabling of the upload button, since incomplete forms are already handled and it messed with the Cypress test

Testing: Cypress tests should pass and PDF uploading should still work locally.

---------

Co-authored-by: Phil Dominguez <“philip.dominguez@gsa.gov”>
* Coverage

Attempt to setup Coverage Reports on PRs

* Temporarily disable PR Checks

* Set tests to run on Pull Requests

Testing Only

* add -i flag

* Testing Coverage XML Generate

* Move Coverage Back

* Testing a different action

* Test compose cp

* test relative path on container

* Test docker cp

* set relative path

* Seperate copy command

* add gh token and set permissions on job

* add optional inputs and set values

* Re-enable PR Checks

* disable invocation of tests seperately

* Finalize changes to optional args

* reformat from build to match from gchr

* Add show missing coverage

* Add link to missing lines

* remove `show_missing_links`
* Updated cog_over_assignment per feedback

* TestCase for cog_over_assignment function

* Tested Django TestCase

* Fixed formatting with black

* WIP - Cog assignment using 2019 data

* WIP cog over

* WIP 2019 baseline implementation for cog / over

* WIP Using 2019 data for cog_over_assignment

* WIP Using 2019 data for cog_over_assignment

* WIP Test Cases for cog_over_assignment

* WIP Refactor assignment logic

* WIP Split testcases into separate functions

* WIP Cog / Over using CognizantBaseline table

* Merge changes by sudha

* Merged main

* WIP Updated test case names

* WIP Renamed test_cog_over_assignment.py to test_cog_agency.py

* WIP cog / over using Cognizantbaseline table

* Populate baseline table

* Merge and lint

* rm refs to census2019

* Fix linter warnings

* WIP cog / over assignment prior to ETL

* More linting..

* Added asserts in test_cog_over.py and doing cog/over assignment in models.py

* Formatted files, tested cog_over

* Add instructions for CognizantBaseline fixture

* Resolve migrations by merging

* Reload config from main

* fix lhci

---------

Co-authored-by: JeanMarie Mariadassou <JeanMarie.Mariadassou@gsa.gov>
Co-authored-by: Matt Jadud <matthew.jadud@gsa.gov>
Co-authored-by: Alex Steel <130377221+asteel-gsa@users.noreply.github.com>
…nd federal awards audit findings workbooks (#1862)

* #1805 Refactored code to avoid duplication

* #1805 Renamed files/code to improve readability

* #1805 Renamed files/code to improve readability

* #1805 Added error message

* #1805 Added logic to check for award reference declaration

* #1805 Added test cases

* #1805 Added newly created cross-validation method to the queue

* #1805 Bug fix

* #1805 Linting

* Update backend/audit/cross_validation/__init__.py

---------

Co-authored-by: Matthew Jadud <matthew.jadud@gsa.gov>
…-all-award-references-in-federal-awards-are-unique

1848 cross validation make sure all award references in federal awards are unique
@jadudm jadudm added autogenerated Automated pull request creation automerge Used for automated deployments labels Aug 19, 2023
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@jadudm jadudm temporarily deployed to production August 19, 2023 10:34 — with GitHub Actions Inactive
@jadudm jadudm temporarily deployed to staging August 19, 2023 10:34 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Aug 19, 2023

Terraform plan for production

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

Terraform will perform the following actions:

  # module.production.cloudfoundry_app.postgrest will be updated in-place
  ~ resource "cloudfoundry_app" "postgrest" {
      ~ docker_image                    = "ghcr.io/gsa-tts/fac/postgrest@sha256:53acdb91a92d31d17020b6f60dc34ba47c454827cb59f814ede01fb539754247" -> "ghcr.io/gsa-tts/fac/postgrest@sha256:5cb1228f3d1fc6f3d0151a99180d11b38488c9dd7a2eafd95e9e309d3c2fd9e8"
      ~ environment                     = (sensitive value)
        id                              = "70ac44be-3507-4867-a75f-c2d1ab12ee89"
      ~ id_bg                           = "************************************" -> (known after apply)
        name                            = "postgrest"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.production.cloudfoundry_app.swagger will be destroyed
  # (because cloudfoundry_app.swagger is not in configuration)
  - resource "cloudfoundry_app" "swagger" {
      - disk_quota                      = 256 -> null
      - docker_image                    = "swaggerapi/swagger-ui:latest" -> null
      - enable_ssh                      = true -> null
      - environment                     = (sensitive value) -> null
      - health_check_invocation_timeout = 0 -> null
      - health_check_timeout            = 0 -> null
      - health_check_type               = "process" -> null
      - id                              = "3f83d812-318f-49ab-b853-8c8ddbf02718" -> null
      - id_bg                           = "3f83d812-318f-49ab-b853-8c8ddbf02718" -> null
      - instances                       = 2 -> null
      - memory                          = 256 -> null
      - name                            = "swagger" -> null
      - ports                           = [] -> null
      - space                           = "5593dba8-7023-49a5-bdbe-e809fe23edf9" -> null
      - stopped                         = false -> null
      - strategy                        = "rolling" -> null
      - timeout                         = 20 -> null

      - routes {
          - port  = 0 -> null
          - route = "9f004253-79d9-4edb-b069-70b3a457e9b5" -> null
        }
    }

  # module.production.cloudfoundry_route.swagger will be destroyed
  # (because cloudfoundry_route.swagger is not in configuration)
  - resource "cloudfoundry_route" "swagger" {
      - domain   = "50ba3f69-cd54-4963-9172-14f3334b479e" -> null
      - endpoint = "fac-production-swagger.app.cloud.gov" -> null
      - hostname = "fac-production-swagger" -> null
      - id       = "9f004253-79d9-4edb-b069-70b3a457e9b5" -> null
      - space    = "5593dba8-7023-49a5-bdbe-e809fe23edf9" -> null
    }

  # 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:0f54c4b052f7dfdc2a0c5ef28bcada6c296882932859e29588818b9644e00412" -> "ghcr.io/gsa-tts/fac/clamav@sha256:0c189607a2306ccce672cf570bf503258a5b196a4c84203b224841d1c418afd8"
        id                              = "5d0afa4f-527b-472a-8671-79a60335417f"
        name                            = "fac-av-production"
        # (14 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.production.module.https-proxy.cloudfoundry_app.egress_app will be updated in-place
  ~ resource "cloudfoundry_app" "egress_app" {
        id                              = "5e81ca8b-99cf-41f8-ae42-76652d51a44c"
        name                            = "https-proxy"
      ~ source_code_hash                = "9fcf4a7f6abfc9a220de2b8bb97591ab490a271ac0933b984f606f645319e1a4" -> "e59a40c4e0195f484032d3cc746c985c2ee791531eb72ba994d7b0943575ba36"
        # (18 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

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

📝 Plan generated in Pull Request Checks #610

@github-actions
Copy link
Contributor

github-actions bot commented Aug 19, 2023

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:a1182cf2dbf596260fa7d7a2c996338a76de8f14d3b2a5b558bcbad10ec1e9a6" -> "ghcr.io/gsa-tts/fac/clamav@sha256:0c189607a2306ccce672cf570bf503258a5b196a4c84203b224841d1c418afd8"
        id                              = "d1bea029-d2d3-4b68-b16d-b216bcaea573"
        name                            = "fac-av-staging"
        # (14 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.staging.module.https-proxy.cloudfoundry_app.egress_app will be updated in-place
  ~ resource "cloudfoundry_app" "egress_app" {
        id                              = "1c9e7877-3c69-4fe5-8541-7bca3f845eb1"
        name                            = "https-proxy"
      ~ source_code_hash                = "9b63bf9766c73480bf1c2385e259b1321988ede71a7b68ebe5c451d9ff6bf1c1" -> "e59a40c4e0195f484032d3cc746c985c2ee791531eb72ba994d7b0943575ba36"
        # (18 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

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

✅ Plan applied in Deploy to Staging Environment #21

@github-actions
Copy link
Contributor

github-actions bot commented Aug 19, 2023

File Coverage Missing
All files 89%
api/serializers.py 89% 117-118 123 128
api/test_views.py 99%
api/uei.py 96% 17-18 107-108
api/views.py 97% 160-161 168-169 190 368-369
audit/cog_agency.py 94% 49
audit/cog_over.py 53% 73-116 120-136 144
audit/etl.py 78% 55-56 73-74 107 194-200 214-235 256 271 401-430
audit/excel.py 87% 397 413 419 424 429 451-452 464 665-666 675-681 691 711
audit/forms.py 52% 22-32
audit/models.py 82% 86 155 311 329-330 338 360 417-420 449-450 454 462 471 481 484-490
audit/test_commands.py 87%
audit/test_etl.py 97% 235-250 331-334
audit/test_mixins.py 90% 112-113 117-119 184-185 189-191
audit/test_validators.py 94% 433 437 605-606 844 851 858 865
audit/utils.py 92% 12
audit/validators.py 95% 248-257 282-283 298-299 309 500-509
audit/views.py 36% 80-101 124-125 187-188 231-232 242-253 294-307 310-324 329-342 356-362 367-387 414-418 423-452 492-496 501-521 548-552 557-586 626-630 635-647 650-661 666-678 691-692 770-771 776-825 828-856 859-876 881-884 889 936-956 959-1025
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_findings_count_consistency.py 91%
audit/cross_validation/errors.py 58% 29 60
audit/cross_validation/submission_progress_check.py 88% 88 112-113
audit/cross_validation/tribal_data_sharing_consent.py 86% 20
audit/fixtures/single_audit_checklist.py 86% 155 229-235
audit/management/commands/load_fixtures.py 46% 39-44
cms/views.py 57% 11-16 29-30
dissemination/models.py 99% 685
report_submission/forms.py 90% 9
report_submission/views.py 73% 80 191 195 202-275 278-288
report_submission/templatetags/get_attr.py 76% 8 11-14 18
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 7ab3738

@asteel-gsa asteel-gsa temporarily deployed to staging August 21, 2023 09:01 — with GitHub Actions Inactive
* Primary nav, homepage, my submission home

* Eligibility steps, part one

* Audit access updates

* General information form updates

* Linting, orphaned tag

* Get linted

* Accessibility updates (duplicate ids)

* Linting - broke a tag.

* accessibility: aria-autocomplete is now inline
@jadudm jadudm temporarily deployed to production August 21, 2023 14:40 — with GitHub Actions Inactive
@jadudm jadudm temporarily deployed to staging August 21, 2023 14:40 — with GitHub Actions Inactive
@jperson1 jperson1 temporarily deployed to production August 21, 2023 15:24 — with GitHub Actions Inactive
@jperson1 jperson1 temporarily deployed to staging August 21, 2023 15:24 — with GitHub Actions Inactive
@jperson1 jperson1 temporarily deployed to meta August 21, 2023 15:41 — with GitHub Actions Inactive
Closes #1584

In this PR:
Creating auditor certification Cypress test
Auditor email is now set to whatever the CYPRESS_LOGIN_TEST_EMAIL is set to. This allows the test to access the auditor cert page.

Testing: Cypress tests should pass

Co-authored-by: Phil Dominguez <“philip.dominguez@gsa.gov”>
@phildominguez-gsa phildominguez-gsa temporarily deployed to production August 21, 2023 16:56 — with GitHub Actions Inactive
@phildominguez-gsa phildominguez-gsa temporarily deployed to staging August 21, 2023 16:56 — with GitHub Actions Inactive
@phildominguez-gsa phildominguez-gsa temporarily deployed to dev August 21, 2023 17:14 — with GitHub Actions Inactive
@phildominguez-gsa phildominguez-gsa temporarily deployed to meta August 21, 2023 17:14 — with GitHub Actions Inactive
@phildominguez-gsa phildominguez-gsa temporarily deployed to dev August 21, 2023 17:15 — with GitHub Actions Inactive
uses the always() conditional expression so that it always runs after
testing-from-ghcr and testing-from-build terraform-plan-staging
have completed, regardless of whether they were successful, so long
as the base_ref is prod.
@jadudm jadudm temporarily deployed to staging August 21, 2023 17:20 — with GitHub Actions Inactive
@jadudm jadudm temporarily deployed to production August 21, 2023 17:20 — with GitHub Actions Inactive
* mock AV scans in fixture tests

* lint.
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to production August 21, 2023 17:26 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to staging August 21, 2023 17:26 — with GitHub Actions Inactive
@jadudm jadudm merged commit f72183c into prod Aug 21, 2023
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to dev August 21, 2023 17:43 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to meta August 21, 2023 17:43 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to dev August 21, 2023 18:13 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to meta August 21, 2023 18:13 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to dev August 21, 2023 18:13 — with GitHub Actions Inactive
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.

8 participants