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

2024-10-16 | MAIN --> PROD | DEV (d3627f2) --> STAGING #4389

Merged
merged 3 commits into from
Oct 16, 2024
Merged

2024-10-16 | MAIN --> PROD | DEV (d3627f2) --> STAGING #4389

merged 3 commits into from
Oct 16, 2024

Conversation

jadudm
Copy link
Contributor

@jadudm jadudm commented Oct 16, 2024

This is an auto-generated pull request to merge main into prod for a staging release on 2024-10-16 with the last commit being merged as d3627f2

phildominguez-gsa and others added 3 commits October 15, 2024 14:23
* Allowing users to remove editors

* Better handling for users removing their own access

* User management documentation

* Lint

* Lint

* Unit tests

* Lint

* Lint

* More 404 tests

* Only editors can remove an editor

* Moving RemoveEditorViewTests to its own file

* Lint

* Fixing test

* Fixing Remove column

* Test cleanup

* Lint

* Audit metadata fix

* Fixing unit tests

* Updating instructions

* Tweaking instructions
* Django FSM migration to Viewflow

- Added new `django-viewflow` and `django-filter` dependencies to `requirements.txt`.
- New file `viewflow.py` under `/audit/models/` which contains the FSM logic for transitioning an SAC.
- Moved `STATUS` enumeration outside of the `SingleAuditChecklist` class. This required import/reference changes across many files and tests.
- Removed references of old deprecated library `django-fsm`.
- New migration to handle the changing the SAC's `submission_name` field to remove dependency on the deprecated `django-fsm`.

* Git conflicts with #4292

* Squash migrations

* Remove django-fsm requirement

* Update requirements.txt

* Re-add django-fsm dependency

This cannot be done until the migration squash is deployed to production.

* Remove replaced migrations
@jadudm jadudm added autogenerated Automated pull request creation automerge Used for automated deployments labels Oct 16, 2024
Copy link
Contributor

github-actions bot commented Oct 16, 2024

Terraform plan for staging

Plan: 1 to add, 2 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 and then create replacement

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

#        (1 unchanged block hidden)
    }

  # module.staging.module.cors.null_resource.cors_header must be replaced
-/+ resource "null_resource" "cors_header" {
!~      id       = "*******************" -> (known after apply)
!~      triggers = { # forces replacement
!~          "always_run" = "2024-10-12T11:00:27Z" -> (known after apply)
        }
    }

  # module.staging.module.file_scanner_clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:7a6358f7cbef463b3ef1de2209351369886901c92039af4ce4ca43d7f7c8e4bf" -> "ghcr.io/gsa-tts/fac/clamav@sha256:df51007d864a4dd6985e0c6a334936c5774e4facaa431b751fb014ae3e5c2ee8"
        id                              = "e416bb0c-8b95-47f7-9cff-c4029ebbd2df"
        name                            = "fac-av-staging-fs"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

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

Warning: Argument is deprecated

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

(and 6 more similar warnings elsewhere)

✅ Plan applied in Deploy to Staging Environment #284

Copy link
Contributor

github-actions bot commented Oct 16, 2024

Terraform plan for production

Plan: 1 to add, 2 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 and then create replacement

Terraform will perform the following actions:

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

#        (1 unchanged block hidden)
    }

  # module.production.module.cors.null_resource.cors_header must be replaced
-/+ resource "null_resource" "cors_header" {
!~      id       = "*******************" -> (known after apply)
!~      triggers = { # forces replacement
!~          "always_run" = "2024-10-09T16:52:24Z" -> (known after apply)
        }
    }

  # module.production.module.file_scanner_clamav.cloudfoundry_app.clamav_api will be updated in-place
!~  resource "cloudfoundry_app" "clamav_api" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/clamav@sha256:7a6358f7cbef463b3ef1de2209351369886901c92039af4ce4ca43d7f7c8e4bf" -> "ghcr.io/gsa-tts/fac/clamav@sha256:df51007d864a4dd6985e0c6a334936c5774e4facaa431b751fb014ae3e5c2ee8"
        id                              = "6b0ce685-a80c-4feb-9ed6-49c6427efdb8"
        name                            = "fac-av-production-fs"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

Plan: 1 to add, 2 to change, 1 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 6 more similar warnings elsewhere)

✅ Plan applied in Deploy to Production Environment #105

Copy link
Contributor

☂️ Python Coverage

current status: ✅

Overall Coverage

Lines Covered Coverage Threshold Status
18789 17108 91% 0% 🟢

New Files

No new covered files...

Modified Files

No covered modified files...

updated for commit: d3627f2 by action🐍

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.

4 participants