Fix deprecated valkey props

Author: bai

modules/redis-cluster/README.md

@@ -59,7 +59,7 @@ Check the [example/](https://github.com/terraform-google-modules/terraform-googl
 
 | Name | Description |
 |------|-------------|
-| discovery\_endpoints | Endpoints created on each given network, for Redis clients to connect to the cluster. Currently only one endpoint is supported |
+| endpoints | Endpoints created on each given network, for Redis clients to connect to the cluster. Currently only one endpoint is supported |
 | id | The redis cluster instance ID |
 | psc\_connections | PSC connections for discovery of the cluster topology and accessing the cluster |
 | psc\_service\_attachments | The PSC service attachments of the cluster |

modules/redis-cluster/metadata.display.yaml

@@ -94,3 +94,7 @@ spec:
         zone_distribution_config_zone:
           name: zone_distribution_config_zone
           title: Zone Distribution Config Zone
+    runtime:
+      outputs:
+        discovery_endpoints:
+          visibility: VISIBILITY_ROOT

modules/redis-cluster/metadata.yaml

@@ -156,16 +156,190 @@ spec:
         varType: list(string)
         defaultValue: []
     outputs:
-      - name: discovery_endpoints
+      - name: endpoints
         description: Endpoints created on each given network, for Redis clients to connect to the cluster. Currently only one endpoint is supported
+        type:
+          - list
+          - - object
+            - address: string
+              port: number
+              psc_config:
+                - list
+                - - object
+                  - network: string
       - name: id
         description: The redis cluster instance ID
+        type: string
       - name: psc_connections
         description: PSC connections for discovery of the cluster topology and accessing the cluster
+        type:
+          - list
+          - - object
+            - address: string
+              forwarding_rule: string
+              network: string
+              project_id: string
+              psc_connection_id: string
       - name: psc_service_attachments
         description: The PSC service attachments of the cluster
+        type:
+          - list
+          - - object
+            - connection_type: string
+              service_attachment: string
       - name: redis_cluster
         description: The redis cluster created
+        type:
+          - object
+          - authorization_mode: string
+            automated_backup_config:
+              - list
+              - - object
+                - fixed_frequency_schedule:
+                    - list
+                    - - object
+                      - start_time:
+                          - list
+                          - - object
+                            - hours: number
+                  retention: string
+            backup_collection: string
+            create_time: string
+            cross_cluster_replication_config:
+              - list
+              - - object
+                - cluster_role: string
+                  membership:
+                    - list
+                    - - object
+                      - primary_cluster:
+                          - list
+                          - - object
+                            - cluster: string
+                              uid: string
+                        secondary_clusters:
+                          - list
+                          - - object
+                            - cluster: string
+                              uid: string
+                  primary_cluster:
+                    - list
+                    - - object
+                      - cluster: string
+                        uid: string
+                  secondary_clusters:
+                    - list
+                    - - object
+                      - cluster: string
+                        uid: string
+                  update_time: string
+            deletion_protection_enabled: bool
+            discovery_endpoints:
+              - list
+              - - object
+                - address: string
+                  port: number
+                  psc_config:
+                    - list
+                    - - object
+                      - network: string
+            gcs_source:
+              - list
+              - - object
+                - uris:
+                    - set
+                    - string
+            id: string
+            kms_key: string
+            maintenance_policy:
+              - list
+              - - object
+                - create_time: string
+                  update_time: string
+                  weekly_maintenance_window:
+                    - list
+                    - - object
+                      - day: string
+                        duration: string
+                        start_time:
+                          - list
+                          - - object
+                            - hours: number
+                              minutes: number
+                              nanos: number
+                              seconds: number
+            maintenance_schedule:
+              - list
+              - - object
+                - end_time: string
+                  schedule_deadline_time: string
+                  start_time: string
+            managed_backup_source:
+              - list
+              - - object
+                - backup: string
+            name: string
+            node_type: string
+            persistence_config:
+              - list
+              - - object
+                - aof_config:
+                    - list
+                    - - object
+                      - append_fsync: string
+                  mode: string
+                  rdb_config:
+                    - list
+                    - - object
+                      - rdb_snapshot_period: string
+                        rdb_snapshot_start_time: string
+            precise_size_gb: number
+            project: string
+            psc_configs:
+              - list
+              - - object
+                - network: string
+            psc_connections:
+              - list
+              - - object
+                - address: string
+                  forwarding_rule: string
+                  network: string
+                  project_id: string
+                  psc_connection_id: string
+            psc_service_attachments:
+              - list
+              - - object
+                - connection_type: string
+                  service_attachment: string
+            redis_configs:
+              - map
+              - string
+            region: string
+            replica_count: number
+            shard_count: number
+            size_gb: number
+            state: string
+            state_info:
+              - list
+              - - object
+                - update_info:
+                    - list
+                    - - object
+                      - target_replica_count: number
+                        target_shard_count: number
+            timeouts:
+              - object
+              - create: string
+                delete: string
+                update: string
+            transit_encryption_mode: string
+            uid: string
+            zone_distribution_config:
+              - list
+              - - object
+                - mode: string
+                  zone: string
   requirements:
     roles:
       - level: Project

modules/redis-cluster/outputs.tf

@@ -19,9 +19,9 @@ output "id" {
   value       = google_redis_cluster.redis_cluster.id
 }
 
-output "discovery_endpoints" {
+output "endpoints" {
   description = "Endpoints created on each given network, for Redis clients to connect to the cluster. Currently only one endpoint is supported"
-  value       = google_redis_cluster.redis_cluster.discovery_endpoints
+  value       = google_redis_cluster.redis_cluster.endpoints
 }
 
 output "psc_connections" {

modules/valkey/README.md

@@ -70,7 +70,6 @@ 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 |
 | id | The valkey cluster instance ID |
 | psc\_auto\_connection | Detailed information of a PSC connection that is created through service connectivity automation |

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
   }

modules/valkey/metadata.yaml

@@ -169,8 +169,6 @@ 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
       - name: id

modules/valkey/outputs.tf

@@ -19,11 +19,6 @@ 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