Add server-state reconsiliation logic to ensure TF can better detect/overwrite remote changes

Author: sullivtr

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}",
+            "args": [
+                "--debug"
+            ],
+            "env": {
+                "TF_LOG": "debug"
+            }
+        }
+    ]
+}

docsite/website/build/terraform-provider-graphql-gh-pages

@@ -1 +1 @@
-Subproject commit cf2e4400b11c81f451bf31d282b06a493caafda2
+Subproject commit 3dcb5028045e697de357f58a69158a14d558e2a3

e2e/test_basic/test.tf

@@ -18,8 +18,8 @@ resource "graphql_mutation" "basic_mutation" {
   compute_from_create = var.compute_from_create
   mutation_variables = {
     "text" = var.todo_text
-    "userId" = "\"${var.todo_user_id}\""
-    "list" = "[\"this\", \"that\"]"
+    "userId" = var.todo_user_id
+    "list" = "[\"this\",\"that\"]"
   }
 
   delete_mutation_variables = {

graphql/keys.go

@@ -92,6 +92,39 @@ func getResourceKey(m map[string]interface{}, ks ...string) (val interface{}, er
 	}
 }
 
+func mapQueryResponseInputKey(m map[string]interface{}, value, prev string, parentKeys []string) (key string, ok bool) {
+	for k, v := range m {
+		var jsonV string
+		if str, isString := v.(string); !isString {
+			bytes, err := json.Marshal(v)
+			if err != nil {
+				return
+			}
+			jsonV = string(bytes)
+		} else {
+			jsonV = str
+		}
+
+		if jsonV == value {
+			if len(parentKeys) != 0 {
+				newPrev := parentKeys[len(parentKeys)-1]
+				if newPrev != prev {
+					parentKeys = parentKeys[:len(parentKeys)-1]
+				}
+			}
+
+			parentKeys = append(parentKeys, k)
+			key = strings.Join(parentKeys, ".")
+			ok = true
+			return
+		} else if nv, isMap := v.(map[string]interface{}); isMap {
+			parentKeys = append(parentKeys, k)
+			key, ok = mapQueryResponseInputKey(nv, value, k, parentKeys)
+		}
+	}
+	return
+}
+
 func hash(v []byte) int {
 	queryResponseObj := make(map[string]interface{})
 	_ = json.Unmarshal(v, &queryResponseObj)

graphql/resource_graphql_mutation.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -93,6 +94,13 @@ func resourceGraphqlMutation() *schema.Resource {
 				Description: "The raw body of the HTTP response from the last read of the object.",
 				Computed:    true,
 			},
+			"query_response_input_key_map": {
+				Type: schema.TypeMap,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Computed: true,
+			},
 			"existing_hash": {
 				Type:        schema.TypeString,
 				Description: "Represents the state of existence of a mutation in order to support intelligent updates.",
@@ -149,6 +157,7 @@ func resourceGraphqlRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	queryVariables := d.Get("read_query_variables").(map[string]interface{})
 	computedVariables := d.Get("computed_read_operation_variables").(map[string]interface{})
+	queryResponseInputKeyMap := d.Get("query_response_input_key_map").(map[string]interface{})
 
 	for k, v := range queryVariables {
 		computedVariables[k] = v
@@ -171,6 +180,44 @@ func resourceGraphqlRead(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
+	mappedKeys := make(map[string]interface{})
+	mutationVars := d.Get("mutation_variables").(map[string]interface{})
+
+	for k, v := range mutationVars {
+		key, ok := mapQueryResponseInputKey(queryResponse.Data, v.(string), "", nil)
+		if !ok {
+			if qrk, found := queryResponseInputKeyMap[k]; !found || qrk == "" {
+				mutationVars[k] = ""
+			} else {
+				ks := strings.Split(qrk.(string), ".")
+				remoteVal, err := getResourceKey(queryResponse.Data, ks...)
+				if err != nil {
+					mutationVars[k] = ""
+				}
+
+				if _, isString := remoteVal.(string); !isString {
+					bytes, err := json.Marshal(remoteVal)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+					mutationVars[k] = string(bytes)
+				} else {
+					mutationVars[k] = remoteVal
+				}
+			}
+
+		}
+		mappedKeys[k] = key
+	}
+
+	if err := d.Set("query_response_input_key_map", mappedKeys); err != nil {
+		return diag.FromErr(err)
+	}
+
+	if err := d.Set("mutation_variables", mutationVars); err != nil {
+		return diag.FromErr(err)
+	}
+
 	computeFromCreate := d.Get("compute_from_create").(bool)
 	if !computeFromCreate {
 		if err := computeMutationVariables(resBytes, d); err != nil {

testdata/readQuery

@@ -3,6 +3,7 @@ query findTodos{
     id
     text
     user {
+      id
       name
     }
     list