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.

Sign up for GitHub

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

Jump to bottom

2024-08-07 | MAIN --> PROD | DEV (5f89fd8) --> STAGING #4155

Merged
merged 2 commits into from
Aug 7, 2024
Merged

2024-08-07 | MAIN --> PROD | DEV (5f89fd8) --> STAGING #4155

merged 2 commits into from
Aug 7, 2024

Conversation

jadudm
Copy link
Contributor

@jadudm jadudm commented Aug 7, 2024

This is an auto-generated pull request to merge main into prod for a staging release on 2024-08-07 with the last commit being merged as 5f89fd8

sambodeme and others added 2 commits August 6, 2024 14:15
@sambodeme
4150 waiver for duplicate finding reference number (#4151)
4bc1a25 
* #4150 Added duplicate finding reference waiver

* #4150 Added logic to bypass finding reference uniqueness validation when waiver exists

* #4150 Added test case

* #4150 Updated warning message

* Added mising migration file
@rnovak338
Cleanup and some extra context added to development and branching rea…
5f89fd8 
…dmes (#4153)

* Update development.md

- Included relevant tools and links that were not previously specified.
- Created some sub-sections directed toward Windows developers to assist with some potential troubleshooting in the onboarding experience.
- Added more context for the Environment Variables section.
- Consistent visuals to distinguish sections from sub-sections in the readme.
- Commented out "load_test_data" for now as it does not appear to be an existing command after investigating with James and Phil.

* Git signing documentation

- Removed context for GPG keys on development.md.
- Created a section in the branching documentation to instruct new developers on how to sign their commits.

* Rephrase section addressing CRLF issues

* Update development.md

Addresses feedback from Phil.
- CLAMAV_PORT .env variable.
- SECRET_KEY .env variable.
- removed commented section.
@jadudm jadudm added autogenerated Automated pull request creation automerge Used for automated deployments labels Aug 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024 •
edited
Loading

Terraform plan for staging

Plan: 1 to add, 4 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.cloudfoundry_app.postgrest will be updated in-place
!~  resource "cloudfoundry_app" "postgrest" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/postgrest@sha256:c15b1c1cfe03f3b974319ca3df8702aee908f2bd588f8061b0b1e803d7d3a61d" -> "ghcr.io/gsa-tts/fac/postgrest@sha256:bd918a7d03c801d03802e27c19e589b53fd71ab181a5ec942705551c7dbc3d53"
        id                              = "db50e549-24c7-4dcf-b30e-e9dee3512be8"
        name                            = "postgrest"
#        (17 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

  # 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:8df2e712eb361ca105f3f0b7655e50aef6f615eca013941a13bfc4f6bee7a1d9" -> "ghcr.io/gsa-tts/fac/clamav@sha256:64de0c0a3277a0dd99c7ad4ff1130e4d20eb9a53d507f2aea3fc28b2c0d85102"
        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-08-02T11:08:49Z" -> (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:8df2e712eb361ca105f3f0b7655e50aef6f615eca013941a13bfc4f6bee7a1d9" -> "ghcr.io/gsa-tts/fac/clamav@sha256:64de0c0a3277a0dd99c7ad4ff1130e4d20eb9a53d507f2aea3fc28b2c0d85102"
        id                              = "e416bb0c-8b95-47f7-9cff-c4029ebbd2df"
        name                            = "fac-av-staging-fs"
#        (17 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                = "cfddd8df06cdb61c6b5a5fe8b879a9ad5b8eeb0752a9f7d73bf4ae050184e237" -> "e59a40c4e0195f484032d3cc746c985c2ee791531eb72ba994d7b0943575ba36"
#        (21 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

Plan: 1 to add, 4 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 #248

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024 •
edited
Loading

Terraform plan for production

Plan: 1 to add, 4 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.cloudfoundry_app.postgrest will be updated in-place
!~  resource "cloudfoundry_app" "postgrest" {
!~      docker_image                    = "ghcr.io/gsa-tts/fac/postgrest@sha256:c15b1c1cfe03f3b974319ca3df8702aee908f2bd588f8061b0b1e803d7d3a61d" -> "ghcr.io/gsa-tts/fac/postgrest@sha256:bd918a7d03c801d03802e27c19e589b53fd71ab181a5ec942705551c7dbc3d53"
        id                              = "70ac44be-3507-4867-a75f-c2d1ab12ee89"
        name                            = "postgrest"
#        (17 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:8df2e712eb361ca105f3f0b7655e50aef6f615eca013941a13bfc4f6bee7a1d9" -> "ghcr.io/gsa-tts/fac/clamav@sha256:64de0c0a3277a0dd99c7ad4ff1130e4d20eb9a53d507f2aea3fc28b2c0d85102"
        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-07-31T19:45:42Z" -> (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:8df2e712eb361ca105f3f0b7655e50aef6f615eca013941a13bfc4f6bee7a1d9" -> "ghcr.io/gsa-tts/fac/clamav@sha256:64de0c0a3277a0dd99c7ad4ff1130e4d20eb9a53d507f2aea3fc28b2c0d85102"
        id                              = "6b0ce685-a80c-4feb-9ed6-49c6427efdb8"
        name                            = "fac-av-production-fs"
#        (17 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                = "cfddd8df06cdb61c6b5a5fe8b879a9ad5b8eeb0752a9f7d73bf4ae050184e237" -> "e59a40c4e0195f484032d3cc746c985c2ee791531eb72ba994d7b0943575ba36"
#        (21 unchanged attributes hidden)

#        (1 unchanged block hidden)
    }

Plan: 1 to add, 4 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 #96

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024

☂️ Python Coverage

current status: ✅

Overall Coverage

Lines Covered Coverage Threshold Status
18062 16502 91% 0% 🟢

New Files

No new covered files...

Modified Files

No covered modified files...

updated for commit: 5f89fd8 by action🐍

@jadudm jadudm merged commit b864015 into prod Aug 7, 2024
80 of 82 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees
No one assigned
Labels
autogenerated Automated pull request creation automerge Used for automated deployments
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jadudm @sambodeme @rnovak338