Skip to content

Commit 3bdc4e4

Browse files
stephen-crawfordstephen-crawford
committed
Update changelog
Signed-off-by: Stephen Crawford <[email protected]>
1 parent f568e03 commit 3bdc4e4

File tree

4 files changed

+30
-19
lines changed

4 files changed

+30
-19
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Add events correlation engine plugin ([#6854](https://github.com/opensearch-project/OpenSearch/issues/6854))
1212
- Introduce new dynamic cluster setting to control slice computation for concurrent segment search ([#9107](https://github.com/opensearch-project/OpenSearch/pull/9107))
1313
- Implement on behalf of token passing for extensions ([#8679](https://github.com/opensearch-project/OpenSearch/pull/8679))
14+
- Implement service account issuance and fetching for extensions ([#9618](https://github.com/opensearch-project/OpenSearch/pull/9618))
1415

1516
### Dependencies
1617
- Bump `log4j-core` from 2.18.0 to 2.19.0

‎plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/AuthTokenHandlerTests.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,13 @@ public void testTokenNoopIssuance() {
169169
assertTrue(token instanceof AuthToken);
170170
}
171171

172+
public void testShouldSucceedIssueServiceAccountToken() {
173+
174+
175+
}
176+
177+
public void testShouldFailIssueServiceAccountToken() {
178+
179+
}
180+
172181
}

‎server/src/main/java/org/opensearch/extensions/NoopExtensionsManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.extensions;
1010

11+
import java.util.List;
1112
import org.opensearch.action.ActionModule;
1213
import org.opensearch.client.node.NodeClient;
1314
import org.opensearch.cluster.service.ClusterService;
@@ -31,7 +32,7 @@
3132
public class NoopExtensionsManager extends ExtensionsManager {
3233

3334
public NoopExtensionsManager() throws IOException {
34-
super(Set.of());
35+
super(Set.of(), new IdentityService(Settings.EMPTY, List.of()));
3536
}
3637

3738
@Override

‎server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void testLoadExtensions() throws Exception {
182182

183183
Set<Setting<?>> additionalSettings = extAwarePlugin.getExtensionSettings().stream().collect(Collectors.toSet());
184184
ExtensionScopedSettings extensionScopedSettings = new ExtensionScopedSettings(additionalSettings);
185-
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings);
185+
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings, identityService);
186186
ExtensionDependency dependentExtension = new ExtensionDependency("uniqueid0", Version.fromString("2.0.0"));
187187

188188
Extension firstExtension = new Extension(
@@ -278,7 +278,7 @@ public void testNonUniqueLoadedExtensions() throws Exception {
278278
null,
279279
null
280280
);
281-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
281+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
282282
extensionsManager.loadExtension(firstExtension);
283283
IOException exception = expectThrows(IOException.class, () -> extensionsManager.loadExtension(secondExtension));
284284
assertEquals(
@@ -317,7 +317,7 @@ public void testNonUniqueLoadedExtensions() throws Exception {
317317
public void testMissingRequiredFieldsWhileLoadingExtension() throws Exception {
318318

319319
Extension firstExtension = new Extension("firstExtension", "uniqueid1", "127.0.0.0", "9300", "0.0.7", "3.0.0", "", null, null);
320-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
320+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
321321

322322
IOException exception = expectThrows(IOException.class, () -> extensionsManager.loadExtension(firstExtension));
323323
assertEquals("Required field [minimum opensearch version] is missing in the request", exception.getMessage());
@@ -374,7 +374,7 @@ public void testExtensionDependency() throws Exception {
374374
}
375375

376376
public void testInitialize() throws Exception {
377-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
377+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
378378

379379
initialize(extensionsManager);
380380

@@ -416,7 +416,7 @@ public void testInitialize() throws Exception {
416416

417417
public void testHandleRegisterRestActionsRequest() throws Exception {
418418

419-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
419+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
420420
initialize(extensionsManager);
421421

422422
String uniqueIdStr = "uniqueid1";
@@ -430,7 +430,7 @@ public void testHandleRegisterRestActionsRequest() throws Exception {
430430
}
431431

432432
public void testHandleRegisterSettingsRequest() throws Exception {
433-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
433+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
434434
initialize(extensionsManager);
435435

436436
String uniqueIdStr = "uniqueid1";
@@ -446,7 +446,7 @@ public void testHandleRegisterSettingsRequest() throws Exception {
446446
}
447447

448448
public void testHandleRegisterRestActionsRequestWithInvalidMethod() throws Exception {
449-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
449+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
450450
initialize(extensionsManager);
451451

452452
String uniqueIdStr = "uniqueid1";
@@ -461,7 +461,7 @@ public void testHandleRegisterRestActionsRequestWithInvalidMethod() throws Excep
461461
}
462462

463463
public void testHandleRegisterRestActionsRequestWithInvalidDeprecatedMethod() throws Exception {
464-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
464+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
465465
initialize(extensionsManager);
466466

467467
String uniqueIdStr = "uniqueid1";
@@ -476,7 +476,7 @@ public void testHandleRegisterRestActionsRequestWithInvalidDeprecatedMethod() th
476476
}
477477

478478
public void testHandleRegisterRestActionsRequestWithInvalidUri() throws Exception {
479-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
479+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
480480
initialize(extensionsManager);
481481
String uniqueIdStr = "uniqueid1";
482482
List<String> actionsList = List.of("GET", "PUT /bar", "POST /baz");
@@ -490,7 +490,7 @@ public void testHandleRegisterRestActionsRequestWithInvalidUri() throws Exceptio
490490
}
491491

492492
public void testHandleRegisterRestActionsRequestWithInvalidDeprecatedUri() throws Exception {
493-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
493+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
494494
initialize(extensionsManager);
495495
String uniqueIdStr = "uniqueid1";
496496
List<String> actionsList = List.of("GET /foo", "PUT /bar", "POST /baz");
@@ -504,7 +504,7 @@ public void testHandleRegisterRestActionsRequestWithInvalidDeprecatedUri() throw
504504
}
505505

506506
public void testHandleExtensionRequest() throws Exception {
507-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
507+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
508508
initialize(extensionsManager);
509509

510510
ExtensionRequest clusterStateRequest = new ExtensionRequest(ExtensionRequestProto.RequestType.REQUEST_EXTENSION_CLUSTER_STATE);
@@ -658,7 +658,7 @@ public void testEnvironmentSettingsDefaultValue() throws Exception {
658658
}
659659

660660
public void testAddSettingsUpdateConsumerRequest() throws Exception {
661-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
661+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
662662
initialize(extensionsManager);
663663

664664
List<Setting<?>> componentSettings = List.of(
@@ -702,7 +702,7 @@ public void testAddSettingsUpdateConsumerRequest() throws Exception {
702702
}
703703

704704
public void testHandleAddSettingsUpdateConsumerRequest() throws Exception {
705-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
705+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
706706
initialize(extensionsManager);
707707

708708
List<Setting<?>> componentSettings = List.of(
@@ -722,7 +722,7 @@ public void testHandleAddSettingsUpdateConsumerRequest() throws Exception {
722722
}
723723

724724
public void testUpdateSettingsRequest() throws Exception {
725-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
725+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
726726
initialize(extensionsManager);
727727

728728
Setting<?> componentSetting = Setting.boolSetting("falseSetting", false, Property.Dynamic);
@@ -751,7 +751,7 @@ public void testUpdateSettingsRequest() throws Exception {
751751

752752
public void testRegisterHandler() throws Exception {
753753

754-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
754+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
755755

756756
TransportService mockTransportService = spy(
757757
new TransportService(
@@ -778,7 +778,7 @@ public void testRegisterHandler() throws Exception {
778778
}
779779

780780
public void testIncompatibleExtensionRegistration() throws IOException {
781-
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of());
781+
ExtensionsManager extensionsManager = new ExtensionsManager(Set.of(), identityService);
782782
Extension firstExtension = new Extension(
783783
"firstExtension",
784784
"uniqueid1",
@@ -819,7 +819,7 @@ public List<Setting<?>> getExtensionSettings() {
819819
extensionScopedSettings
820820
);
821821

822-
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings);
822+
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings, identityService);
823823
extensionsManager.loadExtension(firstExtension);
824824

825825
DiscoveryExtensionNode extension = new DiscoveryExtensionNode(
@@ -857,7 +857,7 @@ public void testAdditionalExtensionSettingsForExtensionWithoutCustomSettingSet()
857857
extensionScopedSettings
858858
);
859859

860-
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings);
860+
ExtensionsManager extensionsManager = new ExtensionsManager(additionalSettings, identityService);
861861
extensionsManager.loadExtension(firstExtension);
862862

863863
DiscoveryExtensionNode extension = new DiscoveryExtensionNode(

0 commit comments

Comments
 (0)