Skip to content

feat: add direct endpoint support #1077

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

Merged
merged 7 commits into from
Nov 3, 2025
Merged

feat: add direct endpoint support #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8846e53
feat: add direct endpoint support
Oct 8, 2025
5b574a5
fix: update override.json
Oct 16, 2025
e288960
fix: exclude br-sao
Oct 21, 2025
2298909
fix: update endpoints
Oct 21, 2025
c294fda
fix: schematics test issues
Oct 29, 2025
e6b00af
fix: align common-dev-assets submodule with main
Nov 3, 2025
aa47294
fix: hooks
Nov 3, 2025
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
2 changes: 1 addition & 1 deletion .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion cos.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
16 changes: 15 additions & 1 deletion ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions patterns/dynamic_values/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions patterns/mixed/override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-atracker-key",
"name": "atracker-bucket",
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "management-bucket",
Expand All @@ -111,7 +111,7 @@
}
},
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "workload-bucket",
Expand Down
8 changes: 4 additions & 4 deletions patterns/roks/module/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions patterns/roks/override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-atracker-key",
"name": "atracker-bucket",
Expand Down Expand Up @@ -132,7 +132,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "management-bucket",
Expand All @@ -154,7 +154,7 @@
}
},
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "workload-bucket",
Expand Down
8 changes: 4 additions & 4 deletions patterns/roks/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions patterns/vpc/override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-atracker-key",
"name": "atracker-bucket",
Expand Down Expand Up @@ -53,7 +53,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "management-bucket",
Expand All @@ -75,7 +75,7 @@
}
},
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "workload-bucket",
Expand Down
6 changes: 3 additions & 3 deletions patterns/vsi/override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-atracker-key",
"name": "atracker-bucket",
Expand Down Expand Up @@ -47,7 +47,7 @@
{
"buckets": [
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "management-bucket",
Expand All @@ -69,7 +69,7 @@
}
},
{
"endpoint_type": "public",
"endpoint_type": "direct",
"force_delete": true,
"kms_key": "slz-slz-key",
"name": "workload-bucket",
Expand Down
17 changes: 16 additions & 1 deletion tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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")

Expand Down Expand Up @@ -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")

Expand Down Expand Up @@ -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")

Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion vpe.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

##############################################################################\
##############################################################################