From 0a11dbf75856ded6caad4cc91bb2dbe891e33945 Mon Sep 17 00:00:00 2001 From: Jordan-Williams2 Date: Wed, 1 May 2024 12:42:49 +0100 Subject: [PATCH 1/2] fix: remove hyperb-postgres and hyperb-mongodb --- common-dev-assets | 2 +- examples/every-mt-vpe/main.tf | 8 -------- examples/every-mt-vpe/variables.tf | 2 ++ service_endpoints.tf | 2 -- variables.tf | 2 -- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index ede51011..f3a80f0a 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit ede51011fa1c9ba379c2d9a7b563b3714804de6a +Subproject commit f3a80f0aba9cd08dbf70b044fd4adce587e02dda diff --git a/examples/every-mt-vpe/main.tf b/examples/every-mt-vpe/main.tf index 8cd2adcb..5ee05a49 100644 --- a/examples/every-mt-vpe/main.tf +++ b/examples/every-mt-vpe/main.tf @@ -106,14 +106,6 @@ module "vpes" { { service_name = "hs-crypto-tke" }, - { - service_name = "hyperp-dbaas-mongodb" - vpe_name = "${var.prefix}-hyperp-mongodb" - }, - { - service_name = "hyperp-dbaas-postgresql" - vpe_name = "${var.prefix}-hyperp-postgresql" - }, { service_name = "iam-svcs" }, diff --git a/examples/every-mt-vpe/variables.tf b/examples/every-mt-vpe/variables.tf index a355bf52..eff1a603 100644 --- a/examples/every-mt-vpe/variables.tf +++ b/examples/every-mt-vpe/variables.tf @@ -7,11 +7,13 @@ variable "ibmcloud_api_key" { variable "region" { description = "The region where VPC and services are deployed" type = string + default = "us-south" } variable "prefix" { description = "The prefix that you would like to append to your resources" type = string + default = "test" } variable "resource_group" { diff --git a/service_endpoints.tf b/service_endpoints.tf index e9aadbb3..ac589f74 100644 --- a/service_endpoints.tf +++ b/service_endpoints.tf @@ -28,8 +28,6 @@ locals { hs-crypto-ep11-az3 = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:ep11-az3.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com" hs-crypto-kmip = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:kmip.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com" hs-crypto-tke = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:tke.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com" - hyperp-dbaas-mongodb = "crn:v1:bluemix:public:hyperp-dbaas-mongodb:${var.region}:::endpoint:dbaas900-mongodb.${local.endpoint_prefix}hyperp-dbaas.cloud.ibm.com" - hyperp-dbaas-postgresql = "crn:v1:bluemix:public:hyperp-dbaas-postgresql:${var.region}:::endpoint:dbaas900-postgresql.${local.endpoint_prefix}hyperp-dbaas.cloud.ibm.com" iam-svcs = "crn:v1:bluemix:public:iam-svcs:global:::endpoint:${local.endpoint_prefix}iam.cloud.ibm.com" is = "crn:v1:bluemix:public:is:${var.region}:::endpoint:${var.region}.${local.endpoint_prefix}iaas.cloud.ibm.com" kms = "crn:v1:bluemix:public:kms:${var.region}:::endpoint:${local.endpoint_prefix}${var.region}.kms.cloud.ibm.com" diff --git a/variables.tf b/variables.tf index 222b6244..62990e2b 100644 --- a/variables.tf +++ b/variables.tf @@ -92,8 +92,6 @@ variable "cloud_services" { "hs-crypto-ep11-az3", "hs-crypto-kmip", "hs-crypto-tke", - "hyperp-dbaas-mongodb", - "hyperp-dbaas-postgresql", "iam-svcs", "is", "kms", From 3b2c38fc80b24d5d7862007751d1813953644e1e Mon Sep 17 00:00:00 2001 From: Jordan-Williams2 Date: Wed, 1 May 2024 12:46:00 +0100 Subject: [PATCH 2/2] fix: remove hyperb-postgres and hyperb-mongodb --- examples/every-mt-vpe/variables.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/every-mt-vpe/variables.tf b/examples/every-mt-vpe/variables.tf index eff1a603..a355bf52 100644 --- a/examples/every-mt-vpe/variables.tf +++ b/examples/every-mt-vpe/variables.tf @@ -7,13 +7,11 @@ variable "ibmcloud_api_key" { variable "region" { description = "The region where VPC and services are deployed" type = string - default = "us-south" } variable "prefix" { description = "The prefix that you would like to append to your resources" type = string - default = "test" } variable "resource_group" {