change variable name in valkey

Author: imrannayer

examples/valkey/main.tf

@@ -34,13 +34,12 @@ module "enable_apis" {
 
 
 module "valkey_cluster" {
-  # source  = "terraform-google-modules/memorystore/google//modules/valkey"
-  # version = "~> 11.0"
+  source  = "terraform-google-modules/memorystore/google//modules/valkey"
+  version = "~> 11.0"
 
-  source = "../../modules/valkey"
 
   instance_id                 = "test-valkey-cluster"
-  project                     = var.project_id
+  project_id                  = var.project_id
   location                    = "us-central1"
   node_type                   = "HIGHMEM_MEDIUM"
   deletion_protection_enabled = false

modules/valkey/README.md

@@ -53,7 +53,7 @@ module "valkey_cluster" {
 | network\_project | project ID of the consumer network where the network address of the discovery endpoint will be reserved. Required for Shared VPC host | `string` | `null` | no |
 | node\_type | The nodeType for the valkey cluster. Possible values are: SHARED\_CORE\_NANO, HIGHMEM\_MEDIUM, HIGHMEM\_XLARGE, STANDARD\_SMALL | `string` | `null` | no |
 | persistence\_config | User-provided persistence configurations for the instance | <pre>object({<br>    mode = optional(string)<br>    rdb_config = optional(object({<br>      rdb_snapshot_period     = optional(string)<br>      rdb_snapshot_start_time = optional(string)<br>    }), null)<br>    aof_config = optional(object({<br>      append_fsync = string<br>    }), null)<br>  })</pre> | `{}` | no |
-| project | The ID of the project in which the resource belongs to. | `string` | n/a | yes |
+| project\_id | The ID of the project in which the resource belongs to. | `string` | n/a | yes |
 | replica\_count | Number of replica nodes per shard. If omitted the default is 0 replicas | `number` | `0` | no |
 | service\_connection\_policies | The Service Connection Policies to create. Required to create service connection policy. Not needed if service connection policy already exist | <pre>map(object({<br>    subnet_names = list(string)<br>    description  = optional(string)<br>    limit        = optional(number)<br>    labels       = optional(map(string), {})<br>  }))</pre> | `{}` | no |
 | shard\_count | Number of shards for the instance | `number` | `3` | no |

modules/valkey/main.tf

@@ -16,13 +16,13 @@
 
 resource "google_memorystore_instance" "valkey_cluster" {
   provider    = google-beta
-  project     = var.project
+  project     = var.project_id
   instance_id = var.instance_id
   shard_count = var.shard_count
 
   desired_psc_auto_connections {
-    network    = "projects/${coalesce(var.network_project, var.project)}/global/networks/${var.network}"
-    project_id = var.project
+    network    = "projects/${coalesce(var.network_project, var.project_id)}/global/networks/${var.network}"
+    project_id = var.project_id
   }
 
   location                = var.location
@@ -72,16 +72,16 @@ resource "google_memorystore_instance" "valkey_cluster" {
 
 resource "google_network_connectivity_service_connection_policy" "service_connection_policies" {
   for_each      = var.service_connection_policies
-  project       = coalesce(var.network_project, var.project)
+  project       = coalesce(var.network_project, var.project_id)
   name          = each.key
   location      = var.location
   service_class = "gcp-memorystore"
   description   = lookup(each.value, "description", null)
-  network       = "projects/${coalesce(var.network_project, var.project)}/global/networks/${var.network}"
+  network       = "projects/${coalesce(var.network_project, var.project_id)}/global/networks/${var.network}"
   labels        = each.value.labels
 
   psc_config {
-    subnetworks = [for x in each.value.subnet_names : "projects/${coalesce(var.network_project, var.project)}/regions/${var.location}/subnetworks/${x}"]
+    subnetworks = [for x in each.value.subnet_names : "projects/${coalesce(var.network_project, var.project_id)}/regions/${var.location}/subnetworks/${x}"]
     limit       = lookup(each.value, "limit", null)
   }
 
@@ -91,7 +91,7 @@ module "enable_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
   version = "~> 17.0"
 
-  project_id  = var.project
+  project_id  = var.project_id
   enable_apis = var.enable_apis
 
   disable_services_on_destroy = false

modules/valkey/variables.tf

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-variable "project" {
+variable "project_id" {
   description = "The ID of the project in which the resource belongs to."
   type        = string
 }