Update extension point names

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Jul 3, 2023 · 6a487ce · 6a487ce
1 parent c7250ba
commit 6a487ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java b/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java
@@ -199,7 +199,11 @@ boolean reschedule(
                 && entry.getExtensionUniqueId() != null) {
                 accessToken = JobSchedulerPlugin.GuiceHolder.getIdentityService()
                     .getScheduledJobIdentityManager()
-                    .issueAccessTokenOnBehalfOfUser(jobInfo.getJobId(), jobInfo.getIndexName(), Optional.of(entry.getExtensionUniqueId()));
+                    .issueAccessTokenOnBehalfOfOperator(
+                        jobInfo.getJobId(),
+                        jobInfo.getIndexName(),
+                        Optional.of(entry.getExtensionUniqueId())
+                    );
             }
 
             // invoke job runner

diff --git a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java
@@ -69,6 +69,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -231,7 +232,7 @@ public Engine.Index preIndex(ShardId shardId, Engine.Index operation) {
 
             JobSchedulerPlugin.GuiceHolder.getIdentityService()
                 .getScheduledJobIdentityManager()
-                .saveUserDetails(operation.id(), shardId.getIndexName(), operator);
+                .associateJobWithOperator(operation.id(), shardId.getIndexName(), Optional.of(operator));
             return newIndex;
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -277,7 +278,7 @@ public void postDelete(ShardId shardId, Engine.Delete delete, Engine.DeleteResul
                 && JobSchedulerPlugin.GuiceHolder.getIdentityService().getScheduledJobIdentityManager() != null) {
                 JobSchedulerPlugin.GuiceHolder.getIdentityService()
                     .getScheduledJobIdentityManager()
-                    .deleteUserDetails(delete.id(), shardId.getIndexName());
+                    .deleteJobOperatorEntry(delete.id(), shardId.getIndexName());
             }
             this.scheduler.deschedule(shardId.getIndexName(), delete.id());
             lockService.deleteLock(