adding tenantId for inline connector in model registration (#3531) (#3538)

opensearch-trigger-bot[bot] · dhrubo-os · web-flow · commit 5e4f9535ce03 · 2025-02-12T12:50:23.000-08:00
Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> (cherry picked from commit d224d7a) Co-authored-by: Dhrubo Saha <dhrubo@amazon.com>
diff --git a/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java b/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java
@@ -314,7 +314,7 @@ private void doRegister(MLRegisterModelInput registerModelInput, ActionListener<
                     log.error(e.getMessage(), e);
                     listener.onFailure(e);
                 });
-                MLCreateConnectorRequest mlCreateConnectorRequest = createDryRunConnectorRequest();
+                MLCreateConnectorRequest mlCreateConnectorRequest = createDryRunConnectorRequest(registerModelInput.getTenantId());
                 client.execute(MLCreateConnectorAction.INSTANCE, mlCreateConnectorRequest, dryRunResultListener);
             }
         } else {
@@ -339,8 +339,9 @@ private void createModelGroup(MLRegisterModelInput registerModelInput, ActionLis
         }
     }
 
-    private MLCreateConnectorRequest createDryRunConnectorRequest() {
+    private MLCreateConnectorRequest createDryRunConnectorRequest(final String tenantId) {
         MLCreateConnectorInput createConnectorInput = MLCreateConnectorInput.builder().dryRun(true).build();
+        createConnectorInput.setTenantId(tenantId);
         return new MLCreateConnectorRequest(createConnectorInput);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ private void doRegister(MLRegisterModelInput registerModelInput, ActionListener<`
`314`	`314`	`log.error(e.getMessage(), e);`
`315`	`315`	`listener.onFailure(e);`
`316`	`316`	`});`
`317`		`- MLCreateConnectorRequest mlCreateConnectorRequest = createDryRunConnectorRequest();`
	`317`	`+ MLCreateConnectorRequest mlCreateConnectorRequest = createDryRunConnectorRequest(registerModelInput.getTenantId());`
`318`	`318`	`client.execute(MLCreateConnectorAction.INSTANCE, mlCreateConnectorRequest, dryRunResultListener);`
`319`	`319`	`}`
`320`	`320`	`} else {`
`@@ -339,8 +339,9 @@ private void createModelGroup(MLRegisterModelInput registerModelInput, ActionLis`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
`342`		`- private MLCreateConnectorRequest createDryRunConnectorRequest() {`
	`342`	`+ private MLCreateConnectorRequest createDryRunConnectorRequest(final String tenantId) {`
`343`	`343`	`MLCreateConnectorInput createConnectorInput = MLCreateConnectorInput.builder().dryRun(true).build();`
	`344`	`+ createConnectorInput.setTenantId(tenantId);`
`344`	`345`	`return new MLCreateConnectorRequest(createConnectorInput);`
`345`	`346`	`}`
`346`	`347`