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

Revert addition of CSB resources #907

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,10 @@ jobs:
CF_CLIENT_ID: ((cf-client-id-development))
CF_CLIENT_SECRET: ((cf-client-secret-development))
TF_VAR_remote_state_bucket: ((tf-state-bucket))
TF_VAR_external_remote_state_reader_access_key_id: ((development-tf-state-access-key-id))
TF_VAR_external_remote_state_reader_secret_access_key: ((development-tf-state-secret-access-key))
TF_VAR_external_remote_state_reader_region: ((development-tf-state-region))
TF_VAR_domain_name: dev.us-gov-west-1.aws-us-gov.cloud.gov
TF_VAR_iaas_stack_name: development
TF_VAR_tooling_stack_name: tooling
TF_VAR_aws_lb_listener_ssl_policy: "ELBSecurityPolicy-TLS13-1-2-FIPS-2023-04"
TF_VAR_remote_state_bucket_external: ((tf-state-bucket-external))
TF_VAR_external_stack_name: external-development
TF_VAR_csb_aws_region_govcloud: ((aws-region))
TF_VAR_csb_aws_region_commercial: ((csb-aws-region-commercial))
TF_VAR_csb_cg_smtp_aws_ses_zone: appmail.dev.us-gov-west-1.aws-us-gov.cloud.gov
TF_VAR_csb_docker_image_name: ((csb-docker-image-name))
TF_VAR_csb_org_name: ((csb-org-name))
TF_VAR_csb_space_name: ((csb-space-name))
TF_VAR_csb_broker_route_domain: ((csb-broker-route-domain-development))
- put: slack
params:
text_file: terraform-state/message.txt
Expand Down
85 changes: 0 additions & 85 deletions terraform/modules/csb/main.tf

This file was deleted.

108 changes: 0 additions & 108 deletions terraform/modules/csb/variables.tf

This file was deleted.

9 changes: 0 additions & 9 deletions terraform/modules/csb/versions.tf

This file was deleted.

30 changes: 0 additions & 30 deletions terraform/stack/apps.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,3 @@ module "test_cdn" {
cloudfoundry = cloudfoundry
}
}

module "csb" {
source = "../modules/csb"

count = var.iaas_stack_name == "development" ? 1 : 0

iaas_stack_name = var.iaas_stack_name

rds_host = data.terraform_remote_state.iaas.outputs.csb.rds.host
rds_port = data.terraform_remote_state.iaas.outputs.csb.rds.port
rds_name = data.terraform_remote_state.iaas.outputs.csb.rds.name
rds_username = data.terraform_remote_state.iaas.outputs.csb.rds.username
rds_password = data.terraform_remote_state.iaas.outputs.csb.rds.password

ecr_access_key_id = data.terraform_remote_state.iaas.outputs.csb.ecr_user.access_key_id_curr
ecr_secret_access_key = data.terraform_remote_state.iaas.outputs.csb.ecr_user.secret_access_key_curr
instances = 1
cg_smtp_aws_ses_zone = var.csb_cg_smtp_aws_ses_zone
aws_access_key_id_govcloud = data.terraform_remote_state.iaas.outputs.csb.broker_user.access_key_id_curr
aws_secret_access_key_govcloud = data.terraform_remote_state.iaas.outputs.csb.broker_user.secret_access_key_curr
aws_region_govcloud = var.csb_aws_region_govcloud
aws_access_key_id_commercial = data.terraform_remote_state.external.outputs.csb.broker_user.access_key_id_curr
aws_secret_access_key_commercial = data.terraform_remote_state.external.outputs.csb.broker_user.secret_access_key_curr
aws_region_commercial = var.csb_aws_region_commercial

org_name = var.csb_org_name
space_name = var.csb_space_name
docker_image_name = var.csb_docker_image_name
broker_route_domain = var.csb_broker_route_domain
}
11 changes: 0 additions & 11 deletions terraform/stack/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,3 @@ data "terraform_remote_state" "tooling" {
key = "${var.tooling_stack_name}/terraform.tfstate"
}
}

data "terraform_remote_state" "external" {
backend = "s3"
config = {
access_key = var.external_remote_state_reader_access_key_id
secret_key = var.external_remote_state_reader_secret_access_key
region = var.external_remote_state_reader_region
bucket = var.remote_state_bucket_external
key = "${var.external_stack_name}/terraform.tfstate"
}
}
52 changes: 0 additions & 52 deletions terraform/stack/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,57 +7,5 @@ variable "tooling_stack_name" {
variable "iaas_stack_name" {
}

variable "remote_state_bucket_external" {
type = string
}

variable "external_remote_state_reader_access_key_id" {
type = string
description = "Access key ID for the IAM user that has permission to read from the state bucket."
}

variable "external_remote_state_reader_secret_access_key" {
type = string
sensitive = true
description = "Secret access key for the IAM user that has permission to read from the state bucket."
}

variable "external_remote_state_reader_region" {
type = string
description = "The region in which the remote state bucket is located."
}

variable "external_stack_name" {
type = string
}

variable "domain_name" {
}

variable "csb_aws_region_govcloud" {
type = string
}

variable "csb_aws_region_commercial" {
type = string
}

variable "csb_cg_smtp_aws_ses_zone" {
type = string
}

variable "csb_docker_image_name" {
type = string
}

variable "csb_org_name" {
type = string
}

variable "csb_space_name" {
type = string
}

variable "csb_broker_route_domain" {
type = string
}