diff --git a/modules/valkey/README.md b/modules/valkey/README.md index 27346fac..dcefae24 100644 --- a/modules/valkey/README.md +++ b/modules/valkey/README.md @@ -70,11 +70,8 @@ module "valkey_cluster" { | Name | Description | |------|-------------| -| discovery\_endpoints | (Deprecated) Endpoints created on each given network, for valkey clients to connect to the cluster. Currently only one endpoint is supported. Use endpoints instead | -| endpoints | Endpoints for the instance | +| endpoints | Endpoints created on each given network, for valkey clients to connect to the cluster. | | id | The valkey cluster instance ID | -| psc\_auto\_connection | Detailed information of a PSC connection that is created through service connectivity automation | -| psc\_connections | (Deprecated) PSC connections for discovery of the cluster topology and accessing the cluster. Use psc\_auto\_connection instead | | valkey\_cluster | The valkey cluster created | diff --git a/modules/valkey/main.tf b/modules/valkey/main.tf index 98e6670d..c207842c 100644 --- a/modules/valkey/main.tf +++ b/modules/valkey/main.tf @@ -21,7 +21,7 @@ resource "google_memorystore_instance" "valkey_cluster" { engine_version = var.engine_version mode = var.mode - desired_psc_auto_connections { + desired_auto_created_endpoints { network = "projects/${coalesce(var.network_project, var.project_id)}/global/networks/${var.network}" project_id = var.project_id } diff --git a/modules/valkey/metadata.yaml b/modules/valkey/metadata.yaml index a3767845..d80887ec 100644 --- a/modules/valkey/metadata.yaml +++ b/modules/valkey/metadata.yaml @@ -169,16 +169,10 @@ spec: start_time_nanos = optional(string) })) outputs: - - name: discovery_endpoints - description: (Deprecated) Endpoints created on each given network, for valkey clients to connect to the cluster. Currently only one endpoint is supported. Use endpoints instead - name: endpoints - description: Endpoints for the instance + description: Endpoints created on each given network, for valkey clients to connect to the cluster. - name: id description: The valkey cluster instance ID - - name: psc_auto_connection - description: Detailed information of a PSC connection that is created through service connectivity automation - - name: psc_connections - description: (Deprecated) PSC connections for discovery of the cluster topology and accessing the cluster. Use psc_auto_connection instead - name: valkey_cluster description: The valkey cluster created requirements: diff --git a/modules/valkey/outputs.tf b/modules/valkey/outputs.tf index 54045d1a..3993fe72 100644 --- a/modules/valkey/outputs.tf +++ b/modules/valkey/outputs.tf @@ -19,27 +19,12 @@ output "id" { value = google_memorystore_instance.valkey_cluster.id } -output "discovery_endpoints" { - description = "(Deprecated) Endpoints created on each given network, for valkey clients to connect to the cluster. Currently only one endpoint is supported. Use endpoints instead" - value = google_memorystore_instance.valkey_cluster.discovery_endpoints -} - -output "psc_connections" { - description = "(Deprecated) PSC connections for discovery of the cluster topology and accessing the cluster. Use psc_auto_connection instead" - value = google_memorystore_instance.valkey_cluster.psc_auto_connections +output "endpoints" { + description = "Endpoints created on each given network, for valkey clients to connect to the cluster." + value = google_memorystore_instance.valkey_cluster.endpoints } output "valkey_cluster" { description = "The valkey cluster created" value = google_memorystore_instance.valkey_cluster } - -output "endpoints" { - description = "Endpoints for the instance" - value = google_memorystore_instance.valkey_cluster.endpoints -} - -output "psc_auto_connection" { - description = "Detailed information of a PSC connection that is created through service connectivity automation" - value = google_memorystore_instance.valkey_cluster.endpoints[0].connections[0] -}