feat: updated the COS endpoint to default to "direct" endpoint (#1077)

jor2 · web-flow · commit 9991186fb05e · 2025-11-03T20:45:23.000Z
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-10-30T17:32:37Z",
+  "generated_at": "2025-11-03T14:00:38Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
diff --git a/cos.tf b/cos.tf
@@ -81,7 +81,9 @@ resource "ibm_resource_key" "key" {
 resource "ibm_cos_bucket" "buckets" {
   for_each = local.buckets_map
 
-  depends_on = [time_sleep.wait_for_authorization_policy]
+  depends_on = [
+    time_sleep.wait_for_authorization_policy
+  ]
 
   bucket_name           = "${var.prefix}-${each.value.name}${each.value.random_suffix == "true" ? "-${random_string.random_cos_suffix.result}" : ""}"
   resource_instance_id  = local.cos_instance_ids[each.value.instance]
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -1738,7 +1738,21 @@
               "key": "existing_cos_resource_group"
             },
             {
-              "key": "existing_cos_endpoint_type"
+              "key": "existing_cos_endpoint_type",
+              "options": [
+                {
+                  "displayname": "direct",
+                  "value": "direct"
+                },
+                {
+                  "displayname": "private",
+                  "value": "private"
+                },
+                {
+                  "displayname": "public",
+                  "value": "public"
+                }
+              ]
             },
             {
               "key": "use_existing_cos_for_vpc_flowlogs"
diff --git a/patterns/dynamic_values/variables.tf b/patterns/dynamic_values/variables.tf
@@ -125,13 +125,13 @@ variable "existing_cos_resource_group" {
 }
 
 variable "existing_cos_endpoint_type" {
-  description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
+  description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
   type        = string
-  default     = "public"
+  default     = "direct"
 
   validation {
-    error_message = "Endpoint type can only be `public` or `private`."
-    condition     = contains(["public", "private", null], var.existing_cos_endpoint_type)
+    error_message = "Endpoint type can only be `public`, `private`, or `direct`."
+    condition     = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)
   }
 }
 
diff --git a/patterns/mixed/override.json b/patterns/mixed/override.json
@@ -46,7 +46,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-atracker-key",
                     "name": "atracker-bucket",
@@ -89,7 +89,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "management-bucket",
@@ -111,7 +111,7 @@
                     }
                 },
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "workload-bucket",
diff --git a/patterns/roks/module/variables.tf b/patterns/roks/module/variables.tf
@@ -143,13 +143,13 @@ variable "existing_cos_resource_group" {
 }
 
 variable "existing_cos_endpoint_type" {
-  description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
+  description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
   type        = string
-  default     = "public"
+  default     = "direct"
 
   validation {
-    error_message = "Endpoint type can only be `public` or `private`."
-    condition     = contains(["public", "private", null], var.existing_cos_endpoint_type)
+    error_message = "Endpoint type can only be `public`, `private`, or `direct`."
+    condition     = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)
   }
 }
 
diff --git a/patterns/roks/override.json b/patterns/roks/override.json
@@ -89,7 +89,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-atracker-key",
                     "name": "atracker-bucket",
@@ -132,7 +132,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "management-bucket",
@@ -154,7 +154,7 @@
                     }
                 },
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "workload-bucket",
diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf
@@ -150,13 +150,13 @@ variable "existing_cos_resource_group" {
 }
 
 variable "existing_cos_endpoint_type" {
-  description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
+  description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
   type        = string
-  default     = "public"
+  default     = "direct"
 
   validation {
-    error_message = "Endpoint type can only be `public` or `private`."
-    condition     = contains(["public", "private", null], var.existing_cos_endpoint_type)
+    error_message = "Endpoint type can only be `public`, `private`, or `direct`."
+    condition     = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)
   }
 }
 
diff --git a/patterns/vpc/override.json b/patterns/vpc/override.json
@@ -10,7 +10,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-atracker-key",
                     "name": "atracker-bucket",
@@ -53,7 +53,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "management-bucket",
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "workload-bucket",
diff --git a/patterns/vsi/override.json b/patterns/vsi/override.json
@@ -10,7 +10,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-atracker-key",
                     "name": "atracker-bucket",
@@ -47,7 +47,7 @@
         {
             "buckets": [
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "management-bucket",
@@ -69,7 +69,7 @@
                     }
                 },
                 {
-                    "endpoint_type": "public",
+                    "endpoint_type": "direct",
                     "force_delete": true,
                     "kms_key": "slz-slz-key",
                     "name": "workload-bucket",
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -163,6 +163,9 @@ func TestRunQuickStartPattern(t *testing.T) {
 
 func TestRunUpgradeQuickStartPattern(t *testing.T) {
 	t.Parallel()
+	if enableSchematicsTests {
+		t.Skip("Skipping terratest for Quickstart Pattern upgrade, running Schematics test instead")
+	}
 
 	options := setupOptionsQuickStartPattern(t, "vsi-qs-u", quickStartPatternTerraformDir)
 
@@ -203,6 +206,9 @@ func TestRunROKSQuickStartPattern(t *testing.T) {
 
 func TestRunUpgradeROKSQuickStartPattern(t *testing.T) {
 	t.Parallel()
+	if enableSchematicsTests {
+		t.Skip("Skipping terratest for ROKS Quickstart Pattern upgrade, running Schematics test instead")
+	}
 
 	options := setupOptionsROKSQuickStartPattern(t, "rokqsu", roksQuickstartPatternTerraformDir)
 
@@ -252,6 +258,9 @@ func TestRunRoksPattern(t *testing.T) {
 
 func TestRunUpgradeRoksPattern(t *testing.T) {
 	t.Parallel()
+	if enableSchematicsTests {
+		t.Skip("Skipping terratest for ROKS Pattern upgrade, running Schematics test instead")
+	}
 
 	options := setupOptionsRoksPattern(t, "ocp-u")
 
@@ -301,6 +310,9 @@ func TestRunVSIPattern(t *testing.T) {
 
 func TestRunUpgradeVsiPattern(t *testing.T) {
 	t.Parallel()
+	if enableSchematicsTests {
+		t.Skip("Skipping terratest for VSI Pattern upgrade, running Schematics test instead")
+	}
 
 	options := setupOptionsVsiPattern(t, "vsi-u")
 
@@ -347,6 +359,9 @@ func TestRunVpcPattern(t *testing.T) {
 
 func TestRunUpgradeVpcPattern(t *testing.T) {
 	t.Parallel()
+	if enableSchematicsTests {
+		t.Skip("Skipping terratest for VPC Pattern upgrade, running Schematics test instead")
+	}
 
 	options := setupOptionsVpcPattern(t, "vpc-ug")
 
@@ -430,7 +445,7 @@ SCHEMATICS TESTS
 These schematics tests will only be run if the "RUN_SCHEMATICS_TESTS"
 environment variable is set to "true" or "yes".
 If not set, the normal terratest will be run for the patterns.
-****************************************************************************/
+***************************************************************************/
 
 func TestRunVSIQuickStartPatternSchematics(t *testing.T) {
 	t.Parallel()
diff --git a/vpe.tf b/vpe.tf
@@ -48,4 +48,4 @@ resource "ibm_is_virtual_endpoint_gateway_ip" "endpoint_gateway_ip" {
   reserved_ip = ibm_is_subnet_reserved_ip.ip[each.key].reserved_ip
 }
 
-##############################################################################\
+##############################################################################

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"files": "go.sum\|^.secrets.baseline$",`
`4`	`4`	`"lines": null`
`5`	`5`	`},`
`6`		`- "generated_at": "2025-10-30T17:32:37Z",`
	`6`	`+ "generated_at": "2025-11-03T14:00:38Z",`
`7`	`7`	`"plugins_used": [`
`8`	`8`	`{`
`9`	`9`	`"name": "AWSKeyDetector"`
Original file line number	Diff line number	Diff line change
`@@ -125,13 +125,13 @@ variable "existing_cos_resource_group" {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`variable "existing_cos_endpoint_type" {`
`128`		- description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
	`128`	+ description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
`129`	`129`	`type = string`
`130`		`- default = "public"`
	`130`	`+ default = "direct"`
`131`	`131`
`132`	`132`	`validation {`
`133`		- error_message = "Endpoint type can only be `public` or `private`."
`134`		`- condition = contains(["public", "private", null], var.existing_cos_endpoint_type)`
	`133`	+ error_message = "Endpoint type can only be `public`, `private`, or `direct`."
	`134`	`+ condition = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`{`
`47`	`47`	`"buckets": [`
`48`	`48`	`{`
`49`		`- "endpoint_type": "public",`
	`49`	`+ "endpoint_type": "direct",`
`50`	`50`	`"force_delete": true,`
`51`	`51`	`"kms_key": "slz-atracker-key",`
`52`	`52`	`"name": "atracker-bucket",`
`@@ -89,7 +89,7 @@`
`89`	`89`	`{`
`90`	`90`	`"buckets": [`
`91`	`91`	`{`
`92`		`- "endpoint_type": "public",`
	`92`	`+ "endpoint_type": "direct",`
`93`	`93`	`"force_delete": true,`
`94`	`94`	`"kms_key": "slz-slz-key",`
`95`	`95`	`"name": "management-bucket",`
`@@ -111,7 +111,7 @@`
`111`	`111`	`}`
`112`	`112`	`},`
`113`	`113`	`{`
`114`		`- "endpoint_type": "public",`
	`114`	`+ "endpoint_type": "direct",`
`115`	`115`	`"force_delete": true,`
`116`	`116`	`"kms_key": "slz-slz-key",`
`117`	`117`	`"name": "workload-bucket",`
Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,13 @@ variable "existing_cos_resource_group" {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`variable "existing_cos_endpoint_type" {`
`146`		- description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
	`146`	+ description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
`147`	`147`	`type = string`
`148`		`- default = "public"`
	`148`	`+ default = "direct"`
`149`	`149`
`150`	`150`	`validation {`
`151`		- error_message = "Endpoint type can only be `public` or `private`."
`152`		`- condition = contains(["public", "private", null], var.existing_cos_endpoint_type)`
	`151`	+ error_message = "Endpoint type can only be `public`, `private`, or `direct`."
	`152`	`+ condition = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -150,13 +150,13 @@ variable "existing_cos_resource_group" {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`variable "existing_cos_endpoint_type" {`
`153`		- description = "The endpoint type to use when accessing the existing COS instance, default is `public`."
	`153`	+ description = "The endpoint type to use when accessing the existing COS instance. `direct` is the preferred endpoint type for re-platformed regions."
`154`	`154`	`type = string`
`155`		`- default = "public"`
	`155`	`+ default = "direct"`
`156`	`156`
`157`	`157`	`validation {`
`158`		- error_message = "Endpoint type can only be `public` or `private`."
`159`		`- condition = contains(["public", "private", null], var.existing_cos_endpoint_type)`
	`158`	+ error_message = "Endpoint type can only be `public`, `private`, or `direct`."
	`159`	`+ condition = contains(["public", "private", "direct", null], var.existing_cos_endpoint_type)`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`{`
`11`	`11`	`"buckets": [`
`12`	`12`	`{`
`13`		`- "endpoint_type": "public",`
	`13`	`+ "endpoint_type": "direct",`
`14`	`14`	`"force_delete": true,`
`15`	`15`	`"kms_key": "slz-atracker-key",`
`16`	`16`	`"name": "atracker-bucket",`
`@@ -53,7 +53,7 @@`
`53`	`53`	`{`
`54`	`54`	`"buckets": [`
`55`	`55`	`{`
`56`		`- "endpoint_type": "public",`
	`56`	`+ "endpoint_type": "direct",`
`57`	`57`	`"force_delete": true,`
`58`	`58`	`"kms_key": "slz-slz-key",`
`59`	`59`	`"name": "management-bucket",`
`@@ -75,7 +75,7 @@`
`75`	`75`	`}`
`76`	`76`	`},`
`77`	`77`	`{`
`78`		`- "endpoint_type": "public",`
	`78`	`+ "endpoint_type": "direct",`
`79`	`79`	`"force_delete": true,`
`80`	`80`	`"kms_key": "slz-slz-key",`
`81`	`81`	`"name": "workload-bucket",`