Merge branch 'main' into investigate-pubsub-conformance-test

Author: roseyang62

iam/iam-aws/src/main/java/com/salesforce/multicloudj/iam/aws/AwsIam.java

@@ -12,9 +12,13 @@
 import com.salesforce.multicloudj.common.provider.Provider;
 import com.salesforce.multicloudj.iam.driver.AbstractIam;
 import com.salesforce.multicloudj.iam.model.AttachInlinePolicyRequest;
+import com.salesforce.multicloudj.iam.model.CreateIdentityRequest;
 import com.salesforce.multicloudj.iam.model.CreateOptions;
+import com.salesforce.multicloudj.iam.model.DeleteIdentityRequest;
 import com.salesforce.multicloudj.iam.model.GetAttachedPoliciesRequest;
+import com.salesforce.multicloudj.iam.model.GetIdentityRequest;
 import com.salesforce.multicloudj.iam.model.GetInlinePolicyDetailsRequest;
+import com.salesforce.multicloudj.iam.model.RemovePolicyRequest;
 import com.salesforce.multicloudj.iam.model.PolicyDocument;
 import com.salesforce.multicloudj.iam.model.Statement;
 import com.salesforce.multicloudj.iam.model.TrustConfiguration;
@@ -155,25 +159,20 @@ public void close() throws Exception {
     /**
      * Create IAM Role with optional Trust Configuration and Create Options.
      *
-     * @param identityName the IAM role name (e.g., "MyApplicationRole").
-     * @param description optional description for the role.
-     * @param tenantId the AWS Account ID.
-     * @param region the AWS region for the IAM client.
-     * @param trustConfig optional trust configuration.
-     * @param options optional creation options for the role.
+     * @param request the request containing identity name, description, tenant ID, region, trust config, and options.
      * @return the IAM role ARN.
      */
     @Override
-    protected String doCreateIdentity(String identityName, String description, String tenantId, String region, Optional<TrustConfiguration> trustConfig, Optional<CreateOptions> options) {
-        String assumeRolePolicyDocument = buildAssumeRolePolicyDocument(tenantId, trustConfig);
+    protected String doCreateIdentity(CreateIdentityRequest request) {
+        String assumeRolePolicyDocument = buildAssumeRolePolicyDocument(request.getTenantId(), request.getTrustConfig());
 
         CreateRoleRequest.Builder requestBuilder = CreateRoleRequest.builder()
-                .roleName(identityName)
+                .roleName(request.getIdentityName())
                 .assumeRolePolicyDocument(assumeRolePolicyDocument)
-                .description(StringUtils.defaultString(description));
+                .description(StringUtils.defaultString(request.getDescription()));
 
-        if (options.isPresent()) {
-            CreateOptions opts = options.get();
+        if (request.getOptions().isPresent()) {
+            CreateOptions opts = request.getOptions().get();
             if (StringUtils.isNotBlank(opts.getPath())) {
                 requestBuilder.path(opts.getPath());
             }
@@ -190,11 +189,11 @@ protected String doCreateIdentity(String identityName, String description, Strin
             Role role = response.role();
             return role != null ? role.arn() : null;
         } catch (EntityAlreadyExistsException e) {
-            GetRoleResponse getRoleResponse = this.iamClient.getRole(GetRoleRequest.builder().roleName(identityName).build());
+            GetRoleResponse getRoleResponse = this.iamClient.getRole(GetRoleRequest.builder().roleName(request.getIdentityName()).build());
             Role existingRole = getRoleResponse.role();
 
             if (existingRole != null) {
-                updateRoleIfNeeded(existingRole, description, assumeRolePolicyDocument, options);
+                updateRoleIfNeeded(existingRole, request.getDescription(), assumeRolePolicyDocument, request.getOptions());
             }
 
             return existingRole != null ? existingRole.arn() : null;
@@ -313,10 +312,10 @@ private String buildAssumeRolePolicyDocument(String tenantId, Optional<TrustConf
 
         Map<String, Object> principal = new LinkedHashMap<>();
         if (!awsPrincipals.isEmpty()) {
-            principal.put("AWS", awsPrincipals.size() == 1 ? awsPrincipals.get(0) : awsPrincipals);
+            principal.put("AWS", awsPrincipals);
         }
         if (!servicePrincipals.isEmpty()) {
-            principal.put("Service", servicePrincipals.size() == 1 ? servicePrincipals.get(0) : servicePrincipals);
+            principal.put("Service", servicePrincipals);
         }
         stmt.put("Principal", principal);
 
@@ -334,9 +333,6 @@ private String buildAssumeRolePolicyDocument(String tenantId, Optional<TrustConf
 
     @Override
     protected void doAttachInlinePolicy(AttachInlinePolicyRequest request) {
-        if (StringUtils.isBlank(request.getIdentityName())) {
-            throw new InvalidArgumentException("identityName is required for AWS IAM");
-        }
         if (StringUtils.isBlank(request.getPolicyDocument().getName())) {
             throw new InvalidArgumentException("policy name is required for AWS IAM");
         }
@@ -356,7 +352,7 @@ protected void doAttachInlinePolicy(AttachInlinePolicyRequest request) {
     private static String buildInlinePolicyDocumentJson(PolicyDocument policyDocument) {
         String version = policyDocument.getVersion();
         if (StringUtils.isBlank(version)) {
-            throw new InvalidArgumentException("Version is required for AWS inline policy document");
+            version = POLICY_VERSION;
         }
         Map<String, Object> doc = new LinkedHashMap<>();
         doc.put("Version", version);
@@ -368,21 +364,19 @@ private static String buildInlinePolicyDocumentJson(PolicyDocument policyDocumen
 
             List<String> actions = stmt.getActions();
             if (actions != null && !actions.isEmpty()) {
-                awsStmt.put("Action", actions.size() == 1 ? actions.get(0) : actions);
+                awsStmt.put("Action", actions);
             }
             if (StringUtils.isNotBlank(stmt.getSid())) {
                 awsStmt.put("Sid", stmt.getSid());
             }
             if (stmt.getResources() != null && !stmt.getResources().isEmpty()) {
-                awsStmt.put("Resource", stmt.getResources().size() == 1 ? stmt.getResources().get(0) : stmt.getResources());
-            } else {
-                awsStmt.put("Resource", "*");
+                awsStmt.put("Resource", stmt.getResources());
             }
             if (stmt.getConditions() != null && !stmt.getConditions().isEmpty()) {
                 awsStmt.put("Condition", stmt.getConditions());
             }
             if (stmt.getPrincipals() != null && !stmt.getPrincipals().isEmpty()) {
-                awsStmt.put("Principal", stmt.getPrincipals().size() == 1 ? stmt.getPrincipals().get(0) : stmt.getPrincipals());
+                awsStmt.put("Principal", stmt.getPrincipals());
             }
 
             awsStatements.add(awsStmt);
@@ -439,51 +433,44 @@ protected List<String> doGetAttachedPolicies(GetAttachedPoliciesRequest request)
     /**
      * Removes an inline policy from an IAM role.
      *
-     * @param identityName the IAM role name.
-     * @param policyName the name of the inline policy to remove.
-     * @param tenantId the AWS Account ID.
-     * @param region the AWS region for the IAM client.
+     * @param request the request containing identity name, policy name, tenant ID, and region.
      */
     @Override
-    protected void doRemovePolicy(String identityName, String policyName, String tenantId, String region) {
-        DeleteRolePolicyRequest request = DeleteRolePolicyRequest.builder()
-                .roleName(identityName)
-                .policyName(policyName)
+    protected void doRemovePolicy(RemovePolicyRequest request) {
+        DeleteRolePolicyRequest deleteRequest = DeleteRolePolicyRequest.builder()
+                .roleName(request.getIdentityName())
+                .policyName(request.getPolicyName())
                 .build();
 
-        this.iamClient.deleteRolePolicy(request);
+        this.iamClient.deleteRolePolicy(deleteRequest);
     }
 
 
     /**
      * Delete IAM Role.
      *
-     * @param identityName the IAM role name.
-     * @param tenantId the AWS Account ID.
-     * @param region the AWS region for the IAM client.
+     * @param request the request containing identity name, tenant ID, and region.
      */
     @Override
-    protected void doDeleteIdentity(String identityName, String tenantId, String region) {
-        DeleteRoleRequest request = DeleteRoleRequest.builder()
-                .roleName(identityName)
+    protected void doDeleteIdentity(DeleteIdentityRequest request) {
+        DeleteRoleRequest deleteRoleRequest = DeleteRoleRequest.builder()
+                .roleName(request.getIdentityName())
                 .build();
-        this.iamClient.deleteRole(request);
+        this.iamClient.deleteRole(deleteRoleRequest);
     }
 
     /**
      * Get IAM Role.
      *
-     * @param identityName the IAM role name.
-     * @param tenantId the AWS Account ID.
-     * @param region the AWS region for the IAM client.
+     * @param request the request containing identity name, tenant ID, and region.
      * @return the IAM role ARN.
      */
     @Override
-    protected String doGetIdentity(String identityName, String tenantId, String region) {
-        GetRoleRequest request = GetRoleRequest.builder()
-                .roleName(identityName)
+    protected String doGetIdentity(GetIdentityRequest request) {
+        GetRoleRequest getRoleRequest = GetRoleRequest.builder()
+                .roleName(request.getIdentityName())
                 .build();
-        GetRoleResponse response = this.iamClient.getRole(request);
+        GetRoleResponse response = this.iamClient.getRole(getRoleRequest);
         Role role = response.role();
         return role != null ? role.arn() : null;
     }

iam/iam-aws/src/test/java/com/salesforce/multicloudj/iam/aws/AwsIamIT.java

@@ -127,6 +127,14 @@ public String getTestRoleName() {
             return "testSa"; // IAM role name for attach/getInlinePolicyDetails.
         }
 
+        /** Dummy S3 resource ARN for the test inline policy (valid format; used in record/replay IT). */
+        private static final String TEST_POLICY_RESOURCE = "arn:aws:s3:::multicloudj-iam-it-test-bucket/*";
+
+        @Override
+        public String getTestPolicyResource() {
+            return TEST_POLICY_RESOURCE;
+        }
+
         @Override
         public void close() {
             if (client != null) {

iam/iam-aws/src/test/java/com/salesforce/multicloudj/iam/aws/AwsIamTest.java

@@ -138,7 +138,7 @@ void testCreateIdentityWithServicePrincipalInTrustConfig() throws Exception {
 
         JsonNode service = doc.at("/Statement/0/Principal/Service");
         assertFalse(service.isMissingNode(), "Service principal should not be missing");
-        assertEquals("ec2.amazonaws.com", service.asText());
+        assertEquals("ec2.amazonaws.com", service.isArray() ? service.get(0).asText() : service.asText());
     }
 
     @Test
@@ -173,8 +173,9 @@ void testCreateIdentityWithoutTrustConfigDefaultsToSameAccountRoot() throws Exce
         assertFalse(stmt.isMissingNode(), "Statement should not be missing");
         assertEquals("Allow", stmt.at("/Effect").asText());
         assertEquals("sts:AssumeRole", stmt.at("/Action").asText());
+        JsonNode awsPrincipal = stmt.at("/Principal/AWS");
         assertEquals("arn:aws:iam::" + TEST_TENANT_ID + ":root",
-                stmt.at("/Principal/AWS").asText());
+                awsPrincipal.isArray() ? awsPrincipal.get(0).asText() : awsPrincipal.asText());
     }
 
     @Test
@@ -457,7 +458,7 @@ void testCreateIdentityAlreadyExistsUpdatesTrustPolicyWhenDifferent() throws Exc
 
         JsonNode updatedPolicy = OBJECT_MAPPER.readTree(updatePolicyCaptor.getValue().policyDocument());
         JsonNode principal = updatedPolicy.at("/Statement/0/Principal/AWS");
-        assertEquals("arn:aws:iam::999999999999:root", principal.asText());
+        assertEquals("arn:aws:iam::999999999999:root", principal.isArray() ? principal.get(0).asText() : principal.asText());
     }
 
     @Test
@@ -549,8 +550,8 @@ void testCreateIdentityAlreadyExistsUpdatesMultipleAttributesWhenDifferent() thr
 
     private String buildDefaultAssumeRolePolicy() {
         return "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\"," +
-                "\"Action\":\"sts:AssumeRole\",\"Principal\":{\"AWS\":\"arn:aws:iam::" +
-                TEST_TENANT_ID + ":root\"}}]}";
+                "\"Action\":\"sts:AssumeRole\",\"Principal\":{\"AWS\":[\"arn:aws:iam::" +
+                TEST_TENANT_ID + ":root\"]}}]}";
     }
 
     @Test

…/resources/mappings/post-a7redz3j0q.json …/resources/mappings/post-3uk1re9u8b.jsoniam/iam-aws/src/test/resources/mappings/post-a7redz3j0q.json renamed to iam/iam-aws/src/test/resources/mappings/post-3uk1re9u8b.json iam/iam-aws/src/test/resources/mappings/post-a7redz3j0q.json renamed to iam/iam-aws/src/test/resources/mappings/post-3uk1re9u8b.json

@@ -1,24 +1,24 @@
 {
-  "id" : "a4a68dd6-d272-41dc-b5d0-e9ce8285fe5d",
+  "id" : "444eb433-71e4-442e-8eca-93cbb80210ad",
   "name" : "",
   "request" : {
     "url" : "/",
     "method" : "POST",
     "bodyPatterns" : [ {
-      "equalTo" : "Action=PutRolePolicy&Version=2010-05-08&RoleName=testSa&PolicyName=TestPolicy&PolicyDocument=%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Action%22%3A%22iam%3AGetRole%22%2C%22Resource%22%3A%22*%22%7D%5D%7D",
+      "equalTo" : "Action=PutRolePolicy&Version=2010-05-08&RoleName=testSa&PolicyName=TestPolicy&PolicyDocument=%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Action%22%3A%5B%22s3%3AGetObject%22%2C%22s3%3APutObject%22%5D%2C%22Resource%22%3A%5B%22arn%3Aaws%3As3%3A%3A%3Amulticloudj-iam-it-test-bucket%2F*%22%5D%7D%5D%7D",
       "caseInsensitive" : false
     } ]
   },
   "response" : {
     "status" : 200,
-    "body" : "<PutRolePolicyResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <ResponseMetadata>\n    <RequestId>04339358-c312-437d-97f9-a42a385438db</RequestId>\n  </ResponseMetadata>\n</PutRolePolicyResponse>\n",
+    "body" : "<PutRolePolicyResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <ResponseMetadata>\n    <RequestId>58100288-efa5-4fc6-a2df-78c9216d7e23</RequestId>\n  </ResponseMetadata>\n</PutRolePolicyResponse>\n",
     "headers" : {
-      "x-amzn-RequestId" : "04339358-c312-437d-97f9-a42a385438db",
-      "Date" : "Mon, 02 Feb 2026 20:44:18 GMT",
+      "x-amzn-RequestId" : "58100288-efa5-4fc6-a2df-78c9216d7e23",
+      "Date" : "Thu, 26 Feb 2026 22:33:58 GMT",
       "Content-Type" : "text/xml"
     }
   },
-  "uuid" : "a4a68dd6-d272-41dc-b5d0-e9ce8285fe5d",
+  "uuid" : "444eb433-71e4-442e-8eca-93cbb80210ad",
   "persistent" : true,
-  "insertionIndex" : 33
+  "insertionIndex" : 31
 }

iam/iam-aws/src/test/resources/mappings/post-4pcfetqzcl.json

@@ -0,0 +1,24 @@
+{
+  "id" : "0a380abe-17a2-4d3c-a911-4ff5cd11c0ac",
+  "name" : "",
+  "request" : {
+    "url" : "/",
+    "method" : "POST",
+    "bodyPatterns" : [ {
+      "equalTo" : "Action=CreateRole&Version=2010-05-08&RoleName=MultiCloudJTestRoleOptions&AssumeRolePolicyDocument=%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Action%22%3A%22sts%3AAssumeRole%22%2C%22Principal%22%3A%7B%22AWS%22%3A%5B%22arn%3Aaws%3Aiam%3A%3A654654370895%3Aroot%22%5D%7D%7D%5D%7D&Description=Test+identity+with+options",
+      "caseInsensitive" : false
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "body" : "<CreateRoleResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <CreateRoleResult>\n    <Role>\n      <Path>/</Path>\n      <AssumeRolePolicyDocument>%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Action%22%3A%22sts%3AAssumeRole%22%2C%22Principal%22%3A%7B%22AWS%22%3A%5B%22arn%3Aaws%3Aiam%3A%3A654654370895%3Aroot%22%5D%7D%7D%5D%7D</AssumeRolePolicyDocument>\n      <RoleId>AROAZQ3DQ6RH33DRLNZ2I</RoleId>\n      <RoleName>MultiCloudJTestRoleOptions</RoleName>\n      <Arn>arn:aws:iam::654654370895:role/MultiCloudJTestRoleOptions</Arn>\n      <CreateDate>2026-02-26T22:33:39Z</CreateDate>\n    </Role>\n  </CreateRoleResult>\n  <ResponseMetadata>\n    <RequestId>d91d3643-48c1-4169-867c-2a788b3548a8</RequestId>\n  </ResponseMetadata>\n</CreateRoleResponse>\n",
+    "headers" : {
+      "x-amzn-RequestId" : "d91d3643-48c1-4169-867c-2a788b3548a8",
+      "Date" : "Thu, 26 Feb 2026 22:33:39 GMT",
+      "Content-Type" : "text/xml"
+    }
+  },
+  "uuid" : "0a380abe-17a2-4d3c-a911-4ff5cd11c0ac",
+  "persistent" : true,
+  "insertionIndex" : 14
+}

…/resources/mappings/post-hpvfnilooi.json …/resources/mappings/post-bdn3i0sqqv.jsoniam/iam-aws/src/test/resources/mappings/post-hpvfnilooi.json renamed to iam/iam-aws/src/test/resources/mappings/post-bdn3i0sqqv.json iam/iam-aws/src/test/resources/mappings/post-hpvfnilooi.json renamed to iam/iam-aws/src/test/resources/mappings/post-bdn3i0sqqv.json

@@ -1,5 +1,5 @@
 {
-  "id" : "6ecad65a-167f-4030-8e43-ea2acf576811",
+  "id" : "bb996a64-e3ba-42db-866d-7a0bf4938d1e",
   "name" : "",
   "request" : {
     "url" : "/",
@@ -11,14 +11,14 @@
   },
   "response" : {
     "status" : 200,
-    "body" : "<GetRoleResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <GetRoleResult>\n    <Role>\n      <Path>/</Path>\n      <AssumeRolePolicyDocument>%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22arn%3Aaws%3Aiam%3A%3A654654370895%3Aroot%22%7D%2C%22Action%22%3A%22sts%3AAssumeRole%22%7D%5D%7D</AssumeRolePolicyDocument>\n      <MaxSessionDuration>3600</MaxSessionDuration>\n      <RoleId>AROAZQ3DQ6RH4Y2AB3YKQ</RoleId>\n      <RoleLastUsed/>\n      <RoleName>MultiCloudJTestRoleLifeCycle</RoleName>\n      <Description>Test identity for lifecycle test</Description>\n      <Arn>arn:aws:iam::654654370895:role/MultiCloudJTestRoleLifeCycle</Arn>\n      <CreateDate>2026-01-06T09:25:34Z</CreateDate>\n    </Role>\n  </GetRoleResult>\n  <ResponseMetadata>\n    <RequestId>5b842721-6b57-43ca-aa63-39eadc66e18d</RequestId>\n  </ResponseMetadata>\n</GetRoleResponse>\n",
+    "body" : "<GetRoleResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <GetRoleResult>\n    <Role>\n      <Path>/</Path>\n      <AssumeRolePolicyDocument>%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22arn%3Aaws%3Aiam%3A%3A654654370895%3Aroot%22%7D%2C%22Action%22%3A%22sts%3AAssumeRole%22%7D%5D%7D</AssumeRolePolicyDocument>\n      <MaxSessionDuration>3600</MaxSessionDuration>\n      <RoleId>AROAZQ3DQ6RHW3D5YSFCM</RoleId>\n      <RoleLastUsed/>\n      <RoleName>MultiCloudJTestRoleLifeCycle</RoleName>\n      <Description>Test identity for lifecycle test</Description>\n      <Arn>arn:aws:iam::654654370895:role/MultiCloudJTestRoleLifeCycle</Arn>\n      <CreateDate>2026-02-26T22:33:33Z</CreateDate>\n    </Role>\n  </GetRoleResult>\n  <ResponseMetadata>\n    <RequestId>0e978bb1-e425-4f22-837b-b05eeb6da0db</RequestId>\n  </ResponseMetadata>\n</GetRoleResponse>\n",
     "headers" : {
-      "x-amzn-RequestId" : "5b842721-6b57-43ca-aa63-39eadc66e18d",
-      "Date" : "Tue, 06 Jan 2026 09:25:36 GMT",
+      "x-amzn-RequestId" : "0e978bb1-e425-4f22-837b-b05eeb6da0db",
+      "Date" : "Thu, 26 Feb 2026 22:33:36 GMT",
       "Content-Type" : "text/xml"
     }
   },
-  "uuid" : "6ecad65a-167f-4030-8e43-ea2acf576811",
+  "uuid" : "bb996a64-e3ba-42db-866d-7a0bf4938d1e",
   "persistent" : true,
-  "insertionIndex" : 6
+  "insertionIndex" : 8
 }

iam/iam-aws/src/test/resources/mappings/post-bzrkjjeoqm.json

@@ -0,0 +1,24 @@
+{
+  "id" : "40a6ca24-a9bb-448b-92e9-9561c250a2be",
+  "name" : "",
+  "request" : {
+    "url" : "/",
+    "method" : "POST",
+    "bodyPatterns" : [ {
+      "equalTo" : "Action=GetRolePolicy&Version=2010-05-08&RoleName=testSa&PolicyName=TestPolicy",
+      "caseInsensitive" : false
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "body" : "<GetRolePolicyResponse xmlns=\"https://iam.amazonaws.com/doc/2010-05-08/\">\n  <GetRolePolicyResult>\n    <PolicyDocument>%7B%22Version%22%3A%222012-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Action%22%3A%5B%22s3%3AGetObject%22%2C%22s3%3APutObject%22%5D%2C%22Resource%22%3A%5B%22arn%3Aaws%3As3%3A%3A%3Amulticloudj-iam-it-test-bucket%2F%2A%22%5D%7D%5D%7D</PolicyDocument>\n    <PolicyName>TestPolicy</PolicyName>\n    <RoleName>testSa</RoleName>\n  </GetRolePolicyResult>\n  <ResponseMetadata>\n    <RequestId>e3784cee-baad-4ae1-a534-6d6b3bd10fc2</RequestId>\n  </ResponseMetadata>\n</GetRolePolicyResponse>\n",
+    "headers" : {
+      "x-amzn-RequestId" : "e3784cee-baad-4ae1-a534-6d6b3bd10fc2",
+      "Date" : "Thu, 26 Feb 2026 22:33:28 GMT",
+      "Content-Type" : "text/xml"
+    }
+  },
+  "uuid" : "40a6ca24-a9bb-448b-92e9-9561c250a2be",
+  "persistent" : true,
+  "insertionIndex" : 1
+}