Increment version to 3.3.0-SNAPSHOT (#1574)

* Increment version to 3.3.0-SNAPSHOT

Signed-off-by: opensearch-ci-bot <[email protected]>

* Consume custom attributes

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: opensearch-ci-bot <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

Author: cwperks

build.gradle

@@ -20,7 +20,7 @@ import org.opensearch.gradle.testclusters.OpenSearchCluster
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')

src/test/java/org/opensearch/securityanalytics/TestHelpers.java

@@ -852,7 +852,7 @@ public static User randomUser() {
                         OpenSearchRestTestCase.randomAlphaOfLength(10)
                 ),
                 List.of(OpenSearchRestTestCase.randomAlphaOfLength(10), AccessRoles.ALL_ACCESS_ROLE),
-                List.of("test_attr=test")
+                Map.of("test_attr", "test")
         );
     }
 

src/test/java/org/opensearch/securityanalytics/model/WriteableTests.java

@@ -35,7 +35,7 @@ public void testDetectorAsAStream() throws IOException {
     public void testDetector() throws IOException { // an edge case of detector serialization that failed testDetectorAsAStream() intermittently
         String detectorString = "{\"type\":\"detector\",\"name\":\"MczAuRCrve\",\"detector_type\":\"test_windows\"," +
                 "\"user\":{\"name\":\"QhKrfthgxw\",\"backend_roles\":[\"uYvGLCPhfX\",\"fOLkcRxMWR\"],\"roles\"" +
-                ":[\"YuucNpVzTm\",\"all_access\"],\"custom_attribute_names\":[\"test_attr=test\"]," +
+                ":[\"YuucNpVzTm\",\"all_access\"],\"custom_attributes\":{\"test_attr\":\"test\"}," +
                 "\"user_requested_tenant\":null},\"threat_intel_enabled\":false,\"enabled\":false,\"enabled_time\"" +
                 ":null,\"schedule\":{\"period\":{\"interval\":5,\"unit\":\"MINUTES\"}},\"inputs\":[{\"detector_input\"" +
                 ":{\"description\":\"\",\"indices\":[],\"custom_rules\":[],\"pre_packaged_rules\":[]}}],\"triggers\"" +

src/test/java/org/opensearch/securityanalytics/model/XContentTests.java

@@ -47,9 +47,9 @@ public void testDetectorParsingWithNoName() {
                 "      \"zEMpObrYPM\",\n" +
                 "      \"all_access\"\n" +
                 "    ],\n" +
-                "    \"custom_attribute_names\": [\n" +
-                "      \"test_attr=test\"\n" +
-                "    ],\n" +
+                "    \"custom_attributes\": {\n" +
+                "      \"test_attr\":\"test\"\n" +
+                "    },\n" +
                 "    \"user_requested_tenant\": null\n" +
                 "  },\n" +
                 "  \"enabled\": false,\n" +
@@ -119,9 +119,9 @@ public void testDetectorParsingWithNoSchedule() {
                 "      \"zEMpObrYPM\",\n" +
                 "      \"all_access\"\n" +
                 "    ],\n" +
-                "    \"custom_attribute_names\": [\n" +
-                "      \"test_attr=test\"\n" +
-                "    ],\n" +
+                "    \"custom_attributes\": {\n" +
+                "      \"test_attr\":\"test\"\n" +
+                "    },\n" +
                 "    \"user_requested_tenant\": null\n" +
                 "  },\n" +
                 "  \"enabled\": false,\n" +