fix memcache_parameters (#3733) (#2261)

* change memcacheParameters to parameters, add parameters to basic test

* make switching memcacheParameters to parameters not a breaking-change

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/3733.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+memcache: fixed field `memcache_parameters` to work correctly on `google_memcache_instance`
+```

google-beta/resource_memcache_instance.go

@@ -189,11 +189,11 @@ func resourceMemcacheInstanceCreate(d *schema.ResourceData, meta interface{}) er
 	} else if v, ok := d.GetOkExists("node_config"); !isEmptyValue(reflect.ValueOf(nodeConfigProp)) && (ok || !reflect.DeepEqual(v, nodeConfigProp)) {
 		obj["nodeConfig"] = nodeConfigProp
 	}
-	memcacheParametersProp, err := expandMemcacheInstanceMemcacheParameters(d.Get("memcache_parameters"), d, config)
+	parametersProp, err := expandMemcacheInstanceMemcacheParameters(d.Get("memcache_parameters"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("memcache_parameters"); !isEmptyValue(reflect.ValueOf(memcacheParametersProp)) && (ok || !reflect.DeepEqual(v, memcacheParametersProp)) {
-		obj["memcacheParameters"] = memcacheParametersProp
+	} else if v, ok := d.GetOkExists("memcache_parameters"); !isEmptyValue(reflect.ValueOf(parametersProp)) && (ok || !reflect.DeepEqual(v, parametersProp)) {
+		obj["parameters"] = parametersProp
 	}
 
 	url, err := replaceVars(d, config, "{{MemcacheBasePath}}projects/{{project}}/locations/{{region}}/instances?instanceId={{name}}")
@@ -292,7 +292,7 @@ func resourceMemcacheInstanceRead(d *schema.ResourceData, meta interface{}) erro
 	if err := d.Set("node_config", flattenMemcacheInstanceNodeConfig(res["nodeConfig"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
-	if err := d.Set("memcache_parameters", flattenMemcacheInstanceMemcacheParameters(res["memcacheParameters"], d, config)); err != nil {
+	if err := d.Set("memcache_parameters", flattenMemcacheInstanceMemcacheParameters(res["parameters"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
 

google-beta/resource_memcache_instance_test.go

@@ -68,6 +68,13 @@ resource "google_memcache_instance" "test" {
     memory_size_mb = 1024
   }
   node_count = 1
+
+  memcache_parameters {
+    params = {
+      "listen-backlog" = "2048"
+      "max-item-size" = "8388608"
+    }
+  }
 }
 `, prefix, prefix, name)
 }
@@ -102,6 +109,13 @@ resource "google_memcache_instance" "test" {
     memory_size_mb = 1024
   }
   node_count = 2
+
+  memcache_parameters {
+    params = {
+      "listen-backlog" = "2048"
+      "max-item-size" = "8388608"
+    }
+  }
 }
 `, prefix, prefix, name)
 }