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

Import notify-sandbox space #925

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Import notify-sandbox space #925

wants to merge 2 commits into from

Conversation

jskinne3
Copy link
Contributor

@jskinne3 jskinne3 commented Apr 16, 2024 •
edited

Description

Brings a "space," a thing which exists out on Cloud.gov, under Terraform management

This is a preliminary, experimental restoration of a bunch of Terraform configuration changes. More PRs to come if this works out.

To do

Because I wanted to create the smallest possible delta that would prove the concept of importing a space, there are things this PR dosen't do, but a later one will:

  • remove the deprecated recursive_delete argument
  • use the prevent_destroy argument
  • use local variables at all

Deployment

The import bock used in this PR is supported only by Terraform v1.5 and above. It relies on PR #923 which ensures the Terraform version number is at least this high.

🛠️ Only deploy this PR after number 923 has been deployed and verified

@github-actions GitHub Actions
Copy link

Terraform Format and Style: success
Terraform Initialization: success
Terraform Validation: success
Terraform Plan: success

Show Plan 

module.csv_upload_bucket.data.cloudfoundry_space.space: Reading...
module.redis.data.cloudfoundry_space.space: Reading...
module.ses_email.data.cloudfoundry_space.space: Reading...
module.egress-space.data.cloudfoundry_org.org: Reading...
module.ses_email.data.cloudfoundry_service.ses: Reading...
module.database.data.cloudfoundry_service.rds: Reading...
module.sns_sms.data.cloudfoundry_service.sns: Reading...
module.database.data.cloudfoundry_space.space: Reading...
module.redis.data.cloudfoundry_service.redis: Reading...
module.csv_upload_bucket.data.cloudfoundry_service.s3: Reading...
module.ses_email.data.cloudfoundry_service.ses: Read complete after 1s [id=b41dc2f2-7825-4a8e-987a-ce87a161e670]
module.sns_sms.data.cloudfoundry_space.space: Reading...
module.redis.data.cloudfoundry_service.redis: Read complete after 1s [id=045871d3-d9a8-4a9b-a844-00a067fab054]
module.sns_sms.data.cloudfoundry_service.sns: Read complete after 1s [id=9c59e780-af5a-4a89-ac31-591a3ae1347e]
module.csv_upload_bucket.data.cloudfoundry_service.s3: Read complete after 1s [id=440ce9d9-b108-4bbe-80b4-08338f3cc25b]
module.database.data.cloudfoundry_service.rds: Read complete after 1s [id=dcfb1d43-f22c-42d3-962c-7ae04eda24e7]
module.egress-space.data.cloudfoundry_org.org: Read complete after 1s [id=9e428562-a2d9-41b4-9c23-1ef5237fb44e]
module.egress-space.data.cloudfoundry_user.users["carlo.costino@gsa.gov"]: Reading...
module.egress-space.data.cloudfoundry_user.users["3416d155-a1eb-4953-bc79-76712aaa7910"]: Reading...
module.egress-space.data.cloudfoundry_user.users["steven.reilly@gsa.gov"]: Reading...
module.egress-space.cloudfoundry_space.public_egress: Refreshing state... [id=21b58751-362b-433a-a285-8a1455d9634f]
module.csv_upload_bucket.data.cloudfoundry_space.space: Read complete after 1s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.csv_upload_bucket.cloudfoundry_service_instance.bucket: Refreshing state... [id=b15631b3-00fb-49f6-a4d3-ebaedfca1cd9]
module.ses_email.data.cloudfoundry_space.space: Read complete after 1s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.ses_email.cloudfoundry_service_instance.ses: Refreshing state... [id=bc6b3f0b-dc2f-4b46-84d1-3940c29693d7]
module.redis.data.cloudfoundry_space.space: Read complete after 1s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.redis.cloudfoundry_service_instance.redis: Refreshing state... [id=ebcfe297-b76f-4d71-a6a7-bf6c12b2587c]
module.database.data.cloudfoundry_space.space: Read complete after 1s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.database.cloudfoundry_service_instance.rds: Refreshing state... [id=b8caaa4f-b3b8-4dbc-ba16-95d3899be5a0]
module.sns_sms.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.sns_sms.cloudfoundry_service_instance.sns: Refreshing state... [id=d09f8305-42c1-4b74-820e-5479cdcf515a]
module.egress-space.data.cloudfoundry_user.users["steven.reilly@gsa.gov"]: Read complete after 0s [id=ffd00a3e-aa1a-42e1-a81a-5f60420658c2]
module.egress-space.data.cloudfoundry_user.users["3416d155-a1eb-4953-bc79-76712aaa7910"]: Read complete after 0s [id=bd05a408-f276-4f68-9fa6-efc89442a642]
module.egress-space.data.cloudfoundry_user.users["carlo.costino@gsa.gov"]: Read complete after 0s [id=c7b9f5e0-4d1b-43b1-a659-e8fe4f7083a8]
module.egress-space.cloudfoundry_space_users.deployers: Refreshing state... [id=3fbb7982-1e77-4219-cc78-986468887dd7]

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.ses_email.cloudfoundry_service_instance.ses,
  on ../shared/ses/main.tf line 22, in resource "cloudfoundry_service_instance" "ses":
  22:   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 4 more similar warnings elsewhere)

Pusher: @jskinne3, Action: pull_request

@github-actions GitHub Actions
Copy link

Terraform Format and Style: success
Terraform Initialization: success
Terraform Validation: success
Terraform Plan: success

Show Plan 

module.database.data.cloudfoundry_space.space: Reading...
module.csv_upload_bucket.data.cloudfoundry_service.s3: Reading...
module.ses_email.data.cloudfoundry_space.space: Reading...
module.csv_upload_bucket.data.cloudfoundry_space.space: Reading...
module.sns_sms.data.cloudfoundry_space.space: Reading...
module.ses_email.data.cloudfoundry_service.ses: Reading...
module.database.data.cloudfoundry_service.rds: Reading...
module.egress-space.data.cloudfoundry_org.org: Reading...
module.redis.data.cloudfoundry_space.space: Reading...
module.redis.data.cloudfoundry_service.redis: Reading...
module.ses_email.data.cloudfoundry_service.ses: Read complete after 0s [id=b41dc2f2-7825-4a8e-987a-ce87a161e670]
module.sns_sms.data.cloudfoundry_service.sns: Reading...
module.database.data.cloudfoundry_service.rds: Read complete after 0s [id=dcfb1d43-f22c-42d3-962c-7ae04eda24e7]
module.egress-space.data.cloudfoundry_org.org: Read complete after 0s [id=9e428562-a2d9-41b4-9c23-1ef5237fb44e]
module.egress-space.data.cloudfoundry_user.users["3416d155-a1eb-4953-bc79-76712aaa7910"]: Reading...
module.egress-space.cloudfoundry_space.public_egress: Refreshing state... [id=21b58751-362b-433a-a285-8a1455d9634f]
module.redis.data.cloudfoundry_service.redis: Read complete after 0s [id=045871d3-d9a8-4a9b-a844-00a067fab054]
module.egress-space.data.cloudfoundry_user.users["carlo.costino@gsa.gov"]: Reading...
module.csv_upload_bucket.data.cloudfoundry_service.s3: Read complete after 0s [id=440ce9d9-b108-4bbe-80b4-08338f3cc25b]
module.egress-space.data.cloudfoundry_user.users["steven.reilly@gsa.gov"]: Reading...
module.ses_email.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.ses_email.cloudfoundry_service_instance.ses: Refreshing state... [id=bc6b3f0b-dc2f-4b46-84d1-3940c29693d7]
module.database.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.database.cloudfoundry_service_instance.rds: Refreshing state... [id=b8caaa4f-b3b8-4dbc-ba16-95d3899be5a0]
module.redis.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.redis.cloudfoundry_service_instance.redis: Refreshing state... [id=ebcfe297-b76f-4d71-a6a7-bf6c12b2587c]
module.sns_sms.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.csv_upload_bucket.data.cloudfoundry_space.space: Read complete after 0s [id=9745decb-4988-4bab-88a4-e3f07b36241c]
module.csv_upload_bucket.cloudfoundry_service_instance.bucket: Refreshing state... [id=b15631b3-00fb-49f6-a4d3-ebaedfca1cd9]
module.sns_sms.data.cloudfoundry_service.sns: Read complete after 0s [id=9c59e780-af5a-4a89-ac31-591a3ae1347e]
module.sns_sms.cloudfoundry_service_instance.sns: Refreshing state... [id=d09f8305-42c1-4b74-820e-5479cdcf515a]
module.egress-space.data.cloudfoundry_user.users["3416d155-a1eb-4953-bc79-76712aaa7910"]: Read complete after 0s [id=bd05a408-f276-4f68-9fa6-efc89442a642]
module.egress-space.data.cloudfoundry_user.users["carlo.costino@gsa.gov"]: Read complete after 0s [id=c7b9f5e0-4d1b-43b1-a659-e8fe4f7083a8]
module.egress-space.data.cloudfoundry_user.users["steven.reilly@gsa.gov"]: Read complete after 0s [id=ffd00a3e-aa1a-42e1-a81a-5f60420658c2]
module.egress-space.cloudfoundry_space_users.deployers: Refreshing state... [id=3fbb7982-1e77-4219-cc78-986468887dd7]

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.ses_email.cloudfoundry_service_instance.ses,
  on ../shared/ses/main.tf line 22, in resource "cloudfoundry_service_instance" "ses":
  22:   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 4 more similar warnings elsewhere)

Pusher: @jskinne3, Action: pull_request

@jskinne3 jskinne3 marked this pull request as ready for review April 16, 2024 17:53
xlorepdarkhelm
xlorepdarkhelm approved these changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@xlorepdarkhelm xlorepdarkhelm left a comment

Choose a reason for hiding this comment

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

LGTM

@jskinne3 jskinne3 mentioned this pull request Apr 17, 2024
Draft
ccostino
ccostino reviewed Apr 19, 2024
View reviewed changes
Copy link
Contributor

@ccostino ccostino left a comment •
edited

Choose a reason for hiding this comment

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

Thanks, @jskinne3! The approach looks right to me and the changes fine, though as you'll note we'll have to rebase with main once the other stuff is merged first to make sure that it doesn't undo or revert anything.

@jskinne3 jskinne3 mentioned this pull request Apr 19, 2024
Draft
@jskinne3 jskinne3 marked this pull request as draft April 24, 2024 17:04
@ccostino
Copy link
Contributor

@jskinne3, do we need to come back to this PR? And are the things it previously required now in place, or are there other changes that still need to be accounted for first?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ccostino ccostino ccostino left review comments

@xlorepdarkhelm xlorepdarkhelm xlorepdarkhelm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jskinne3 @ccostino @xlorepdarkhelm