Fix some conflicts

Signed-off-by: Ryan Liang <jiallian@amazon.com>
opensearch-project · Nov 1, 2023 · d0d38d5 · d0d38d5
1 parent 83e80d7
commit d0d38d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -409,7 +409,7 @@ protected void doRun() throws Exception {
                 transportService.sendRequest(
                     extensionNode,
                     REQUEST_EXTENSION_ACTION_NAME,
-                    new InitializeExtensionRequest(transportService.getLocalNode(), extension, issueServiceAccount(extension)),
+                    new InitializeExtensionRequest(transportService.getLocalNode(), extensionNode, issueServiceAccount(extensionNode)),
                     initializeExtensionResponseHandler
                 );
             }

diff --git a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java
@@ -421,7 +421,7 @@ public void testInitialize() throws Exception {
     }
 
     public void testInitializeExtension() throws Exception {
-        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
+        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
 
         TransportService mockTransportService = spy(
             new TransportService(
@@ -513,7 +513,7 @@ public void testHandleRegisterRestActionsRequest() throws Exception {
 
     public void testHandleRegisterRestActionsRequestRequiresDiscoveryNode() throws Exception {
 
-        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
+        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
         initialize(extensionsManager);
 
         RegisterRestActionsRequest registerActionsRequest = new RegisterRestActionsRequest("uniqueId1", List.of(), List.of());
@@ -527,7 +527,7 @@ public void testHandleRegisterRestActionsRequestRequiresDiscoveryNode() throws E
 
     public void testHandleRegisterRestActionsRequestMultiple() throws Exception {
 
-        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
+        ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
         initialize(extensionsManager);
 
         List<String> actionsList = List.of("GET /foo foo", "PUT /bar bar", "POST /baz baz");