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 data loading as part of app deployment #1998

Merged
merged 8 commits into from
Sep 1, 2023
Merged

Update data loading as part of app deployment #1998

merged 8 commits into from
Sep 1, 2023

Conversation

asteel-gsa
Copy link
Contributor

  • Invoke data load as part of app deployment form bin/ops
  • bump app disk to 4 GB
  • remove the terraform for creating the data load container

Paired w/ @mogul on this, there are some future enhancements we need to do, namely scoping down the *.github here. The reason we are doing this is so we can use the proxy to pull the historical data directly onto the instance running the task. We should scope this down to only have the necessary redirects, instead of *.github as a whole.

NOTE: This will have to be actively monitored, specifically

  • 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.

Not needed - invoke via bin/ops and call the wait-and-load.sh as
part of the app deployment.
This is a requirement so that we can get psql to run the data loading script
We need to be able to pull down the data loading repo.

NOTE: we need to scope down *.github to be the redirect url for git's
hosting service in a subsequent PR.
This script will grab the historical data, and then execute it as part
of our app deployments.
@asteel-gsa asteel-gsa temporarily deployed to dev August 31, 2023 19:47 — with GitHub Actions Inactive
@asteel-gsa asteel-gsa temporarily deployed to meta August 31, 2023 19:47 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Aug 31, 2023

Terraform plan for meta

Plan: 4 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.environments["dev"].local_file.cf_org will be created
  + resource "local_file" "cf_org" {
      + content              = <<-EOT
            cf_org_name = "gsa-tts-oros-fac"
        EOT
      + content_base64sha256 = (known after apply)
      + content_base64sha512 = (known after apply)
      + content_md5          = (known after apply)
      + content_sha1         = (known after apply)
      + content_sha256       = (known after apply)
      + content_sha512       = (known after apply)
      + directory_permission = "0777"
      + file_permission      = "0644"
      + filename             = "./../dev/orgname.auto.tfvars"
      + id                   = (known after apply)
    }

  # module.environments["preview"].local_file.cf_org will be created
  + resource "local_file" "cf_org" {
      + content              = <<-EOT
            cf_org_name = "gsa-tts-oros-fac"
        EOT
      + content_base64sha256 = (known after apply)
      + content_base64sha512 = (known after apply)
      + content_md5          = (known after apply)
      + content_sha1         = (known after apply)
      + content_sha256       = (known after apply)
      + content_sha512       = (known after apply)
      + directory_permission = "0777"
      + file_permission      = "0644"
      + filename             = "./../preview/orgname.auto.tfvars"
      + id                   = (known after apply)
    }

  # module.environments["production"].local_file.cf_org will be created
  + resource "local_file" "cf_org" {
      + content              = <<-EOT
            cf_org_name = "gsa-tts-oros-fac"
        EOT
      + content_base64sha256 = (known after apply)
      + content_base64sha512 = (known after apply)
      + content_md5          = (known after apply)
      + content_sha1         = (known after apply)
      + content_sha256       = (known after apply)
      + content_sha512       = (known after apply)
      + directory_permission = "0777"
      + file_permission      = "0644"
      + filename             = "./../production/orgname.auto.tfvars"
      + id                   = (known after apply)
    }

  # module.environments["staging"].local_file.cf_org will be created
  + resource "local_file" "cf_org" {
      + content              = <<-EOT
            cf_org_name = "gsa-tts-oros-fac"
        EOT
      + content_base64sha256 = (known after apply)
      + content_base64sha512 = (known after apply)
      + content_md5          = (known after apply)
      + content_sha1         = (known after apply)
      + content_sha256       = (known after apply)
      + content_sha512       = (known after apply)
      + directory_permission = "0777"
      + file_permission      = "0644"
      + filename             = "./../staging/orgname.auto.tfvars"
      + id                   = (known after apply)
    }

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

✅ Plan applied in Deploy to Development and Management Environment #169

@github-actions
Copy link
Contributor

github-actions bot commented Aug 31, 2023

Terraform plan for dev

Plan: 0 to add, 1 to change, 1 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.dev.cloudfoundry_app.data_load will be destroyed
  # (because cloudfoundry_app.data_load is not in configuration)
  - resource "cloudfoundry_app" "data_load" {
      - disk_quota                      = 64 -> null
      - docker_image                    = "ghcr.io/gsa-tts/fac-historic-public-csvs/load-historic-public-data@sha256:bc012a8a2cde3044a6fc12b1b07c04a7abd6b3ab7c97ce1aeeb1ab7479027cd4" -> null
      - enable_ssh                      = true -> null
      - environment                     = (sensitive value) -> null
      - health_check_invocation_timeout = 0 -> null
      - health_check_timeout            = 0 -> null
      - health_check_type               = "port" -> null
      - id                              = "8e769637-5131-41c0-aabf-d5d5faae04f0" -> null
      - id_bg                           = "8e769637-5131-41c0-aabf-d5d5faae04f0" -> null
      - instances                       = 1 -> null
      - memory                          = 64 -> null
      - name                            = "dataload" -> null
      - ports                           = [] -> null
      - space                           = "06525ba3-19c2-451b-96e9-ea4a9134e8b9" -> null
      - stopped                         = false -> null
      - strategy                        = "rolling" -> null
      - timeout                         = 180 -> null
    }

  # module.dev.module.https-proxy.cloudfoundry_app.egress_app will be updated in-place
  ~ resource "cloudfoundry_app" "egress_app" {
      ~ environment                     = (sensitive value)
        id                              = "a6eb3870-2769-4aa9-a8f2-f1a31939f563"
      ~ id_bg                           = "************************************" -> (known after apply)
        name                            = "https-proxy"
        # (17 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

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

✅ Plan applied in Deploy to Development and Management Environment #169

@github-actions
Copy link
Contributor

github-actions bot commented Aug 31, 2023

File Coverage Missing
All files 88%
api/serializers.py 89% 121-122 127 132
api/test_views.py 99%
api/uei.py 96% 17-18 107-108
api/views.py 97% 197-198 205-206 227 405-406
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 56% 22-29
audit/models.py 86% 101 179 335 353-354 362 384 441-444 473-474 478 486 495 505 508-514
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 95% 434 438 606-607 846 853 860 867
audit/utils.py 92% 12
audit/validators.py 96% 253-254 282-283 298-299 309 500-509
audit/views.py 37% 86-107 130-131 205-206 251-252 262-273 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-693 698-710 725-726 731-780 783-823 826-843
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/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 61
audit/cross_validation/naming.py 68% 178-182
audit/cross_validation/submission_progress_check.py 82% 62 77-80
audit/cross_validation/tribal_data_sharing_consent.py 86% 20
audit/fixtures/single_audit_checklist.py 79% 155 231-240
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
dissemination/models.py 99% 685
djangooidc/backends.py 78% 32 57-63
djangooidc/exceptions.py 66% 19 21 23 28
djangooidc/oidc.py 15% 32-35 45-51 64-70 78-84 92-149 153-199 203-226 230-275 280-281
djangooidc/views.py 78% 23-26 43 114
djangooidc/tests/common.py 96%
report_submission/forms.py 90% 9
report_submission/views.py 72% 82 195-197 199 205-312 315-325
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 23aed8c

If we don't do this, then the default Ubuntu pg_wrapper script will be
called, and it gets very confused because it's not written to be
location-independent.
@mogul mogul temporarily deployed to dev August 31, 2023 20:44 — with GitHub Actions Inactive
@mogul mogul temporarily deployed to meta August 31, 2023 20:44 — with GitHub Actions Inactive
This will allow us to call wait-and-load as normal.
(This is seperating it out from the dockerfile)
@asteel-gsa asteel-gsa temporarily deployed to dev August 31, 2023 21:01 — with GitHub Actions Inactive
@asteel-gsa asteel-gsa temporarily deployed to meta August 31, 2023 21:01 — with GitHub Actions Inactive
@asteel-gsa asteel-gsa requested a review from a team August 31, 2023 21:41
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we run tasks in production?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup:

Alex Steel@DESKTOP-NL4DO24 MINGW64 ~/Code/FAC (as/dataload-fix)
$ cf tasks gsa-fac
Getting tasks for app gsa-fac in org gsa-tts-oros-fac / space production as alexander.steel@gsa.gov...

id   name        state     start time                      command
3    test        RUNNING   Fri, 01 Sep 2023 12:25:20 UTC   echo foo;

however, our bump to 4g should likely fix this error

Retrieving logs for app gsa-fac in org gsa-tts-oros-fac / space production as alexander.steel@gsa.gov...

   2023-09-01T08:25:21.92-0400 [CELL/0] OUT Cell bb361af4-f289-4c7b-9a63-40a3d76dcca5 creating container for instance 8597041f-504a-4724-9dfb-15f5a61fa1d7
   2023-09-01T08:25:22.84-0400 [CELL/0] OUT Security group rules were updated
   2023-09-01T08:25:22.85-0400 [CELL/0] OUT Cell bb361af4-f289-4c7b-9a63-40a3d76dcca5 successfully created container for instance 8597041f-504a-4724-9dfb-15f5a61fa1d7
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR Copying into the container failed: stream-in: nstar: error streaming in: exit status 2. Output: tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/libGLESv2.so: Wrote only 1536 of 10240 bytes
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/chrome_sandbox: Cannot open: No space left on device
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/chrome_100_percent.pak: Cannot open: No space left on device
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/nacl_irt_x86_64.nexe: Cannot open: No space left on device
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/nacl_helper: Cannot open: No space left on device
   2023-09-01T08:25:53.00-0400 [CELL/0] ERR tar: ./app/node_modules/puppeteer/.local-chromium/linux-869685/chrome-linux/chrome_200_percent.pak: Cannot open: No space left on device
   2023-09-01T08:25:53.32-0400 [CELL/0] OUT Cell bb361af4-f289-4c7b-9a63-40a3d76dcca5 stopping instance 8597041f-504a-4724-9dfb-15f5a61fa1d7      
   2023-09-01T08:25:53.32-0400 [CELL/0] OUT Cell bb361af4-f289-4c7b-9a63-40a3d76dcca5 destroying container for instance 8597041f-504a-4724-9dfb-15f5a61fa1d7
   2023-09-01T08:25:55.12-0400 [CELL/0] OUT Cell bb361af4-f289-4c7b-9a63-40a3d76dcca5 successfully destroyed container for instance 8597041f-504a-4724-9dfb-15f5a61fa1d7

backend/.profile Outdated Show resolved Hide resolved
@asteel-gsa asteel-gsa marked this pull request as ready for review September 1, 2023 12:44
@asteel-gsa asteel-gsa requested a review from mogul September 1, 2023 12:44
@asteel-gsa asteel-gsa temporarily deployed to dev September 1, 2023 16:02 — with GitHub Actions Inactive
@asteel-gsa asteel-gsa temporarily deployed to meta September 1, 2023 16:02 — with GitHub Actions Inactive
@mogul mogul added this pull request to the merge queue Sep 1, 2023
Merged via the queue into main with commit 9dccf0a Sep 1, 2023
14 checks passed
@mogul mogul deleted the as/dataload-fix branch September 1, 2023 16:13
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.

3 participants