Merge pull request #19 from benzaita/OX-1168

OX-1168 Work around for non-versioned breaking API change in ChaosSearch

Author: f34nk

client/operation_read_object_group.go

@@ -19,6 +19,54 @@ func (l appLogger) Log(args ...interface{}) {
 	log.Printf("AWS: %+v", args...)
 }
 
+// BUG: ChaosSearch breaking API change now uses two representations of "regex", one as an object, the other as a string.
+// The function `recoverFilterJSON` takes a JSON string as input, checks the structure of the "regex" key,
+// and returns a modified JSON string according to the specified rules.
+// For example:
+//     `{"AND":[{"field":"key","regex":{"pattern":".*","strict":true}}]}`
+// is converted back into
+//     `{"AND":[{"field":"key","regex":".*"}]}`
+func recoverFilterJSON(input string) (string, error) {
+    // Unmarshal the input JSON string into a map structure.
+    var data map[string]interface{}
+    if err := json.Unmarshal([]byte(input), &data); err != nil {
+        return "", err // Return an error if JSON is invalid.
+    }
+
+    // Iterate over the "AND" array in the JSON structure.
+    for _, item := range data["AND"].([]interface{}) {
+        entry := item.(map[string]interface{}) // Cast to a map.
+        regex := entry["regex"]                // Access the "regex" key.
+
+        // Check the type of the "regex" key.
+        switch regexValue := regex.(type) {
+        case map[string]interface{}:
+            // If "regex" is a map, check if the "strict" key is true.
+            if strict, ok := regexValue["strict"].(bool); ok && strict {
+                // If "strict" is true, set "regex" to the value of the "pattern" key.
+                entry["regex"] = regexValue["pattern"]
+            } else {
+                // If "strict" is not true, return an error.
+                return "", fmt.Errorf("strict key is not true")
+            }
+        case string:
+            // If "regex" is a string, no action is needed.
+        default:
+            // Return an error if "regex" is neither a string nor a map.
+            return "", fmt.Errorf("unexpected type for regex key")
+        }
+    }
+
+    // Marshal the modified map structure back into a JSON string.
+    outputBytes, err := json.Marshal(data)
+    if err != nil {
+        return "", err // Return an error if marshaling fails.
+    }
+
+    // Return the modified JSON string.
+    return string(outputBytes), nil
+}
+
 func (client *Client) ReadObjectGroup(ctx context.Context, req *ReadObjectGroupRequest) (*ReadObjectGroupResponse, error) {
 	var resp ReadObjectGroupResponse
 
@@ -141,6 +189,18 @@ func mapBucketTaggingToResponse(tagging *s3.GetBucketTaggingOutput, v *ReadObjec
 		return err
 	}
 
+
+	// NOTE: this is to work around a non-versioned breaking API change in ChaosSearch.
+	// The API might return a slightly modified JSON string.
+	// Here, we recover the "original" format in case that happens.
+	inputFilterJSON := v.FilterJSON
+	outputJSON, err := recoverFilterJSON(inputFilterJSON)
+    if err != nil {
+        return err
+    } else {
+        v.FilterJSON = outputJSON
+    }
+
 	var retentionObject struct {
 		Overall int `json:"overall"`
 	}

terraformprovider/Makefile

@@ -3,7 +3,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=benzaita
 NAME=chaossearch
 BINARY=terraform-provider-${NAME}
-VERSION=0.12.2
+VERSION=0.12.3
 OS_ARCH=$(shell go env GOOS)_$(shell go env GOARCH)
 
 default: install