Merge branch 'main' into ci-with-security

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,16 @@
 ### Description
 [Describe what this change achieves]
-
-### Issues Resolved
-[List any issues this PR will resolve]
-
+
+### Related Issues
+Resolves #[Issue number to be closed when this PR is merged]
+<!-- List any other related issues here -->
+
 ### Check List
 - [ ] New functionality includes testing.
-  - [ ] All tests pass
 - [ ] New functionality has been documented.
-  - [ ] New functionality has javadoc added
-- [ ] Commits are signed per the DCO using --signoff 
+- [ ] API changes companion pull request [created](https://github.com/opensearch-project/opensearch-api-specification/blob/main/DEVELOPER_GUIDE.md).
+- [ ] Commits are signed per the DCO using `--signoff`.
+- [ ] Public documentation issue/PR [created](https://github.com/opensearch-project/documentation-website/issues/new/choose).
 
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
-For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
+For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/job-scheduler/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

.github/workflows/ci.yml

@@ -29,6 +29,10 @@ jobs:
       # need to switch to root so that github actions can install runner binary on container without permission issues.
       options: --user root
 
+    # Allow using Node16 actions
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
     steps:
       - name: Checkout job-scheduler
         uses: actions/checkout@v2

build.gradle

@@ -178,7 +178,7 @@ dependencies {
     testImplementation group: 'org.mockito', name: 'mockito-core', version: "${versions.mockito}"
     javaRestTestImplementation project.sourceSets.main.runtimeClasspath
     //spotless
-    implementation('com.google.googlejavaformat:google-java-format:1.22.0') {
+    implementation('com.google.googlejavaformat:google-java-format:1.23.0') {
         exclude group: 'com.google.guava'
     }
     opensearchPlugin "org.opensearch.plugin:opensearch-security:${security_plugin_version}@zip"

release-notes/opensearch-job-scheduler.release-notes-2.15.0.0.md

@@ -1,6 +1,6 @@
-## Version 2.14.0.0
+## Version 2.15.0.0
 
-Compatible with OpenSearch 2.14.0
+Compatible with OpenSearch 2.15.0
 
 ### Maintenance
 * Increment version to 2.15.0 ([#626](https://github.com/opensearch-project/job-scheduler/pull/626)).

release-notes/opensearch-job-scheduler.release-notes-2.16.0.0.md

@@ -0,0 +1,12 @@
+## Version 2.16.0.0
+
+Compatible with OpenSearch 2.16.0
+
+### Maintenance
+* Increment version to 2.16.0 ([#638](https://github.com/opensearch-project/job-scheduler/pull/638)).
+
+### Infrastructure
+* Fix checkout action failure [(#650)](https://github.com/opensearch-project/job-scheduler/pull/650) [(#651)](https://github.com/opensearch-project/job-scheduler/pull/651).
+
+### Enhancements
+* Wrap interactions with `.opendistro-job-scheduler-lock` in `ThreadContext.stashContext` to ensure JS can read and write to the index [(#347)](https://github.com/opensearch-project/job-scheduler/pull/347) [(#647)](https://github.com/opensearch-project/job-scheduler/pull/647).

sample-extension-plugin/build.gradle

@@ -205,7 +205,7 @@ testClusters.integTest {
 }
 
 String baseName = "jobSchedulerBwcCluster"
-String bwcOpenSearchVersion = "2.15.0"
+String bwcOpenSearchVersion = "2.17.0"
 String bwcPluginVersion = bwcOpenSearchVersion + ".0"
 String bwcFilePath = "src/test/resources/bwc/job-scheduler/"
 bwcOpenSearchVersion += "-SNAPSHOT"

spi/build.gradle

@@ -11,7 +11,7 @@ plugins {
     id 'jacoco'
     id 'maven-publish'
     id 'signing'
-    id "org.gradle.test-retry" version "1.5.9"
+    id "org.gradle.test-retry" version "1.5.10"
 }
 
 apply plugin: 'opensearch.java'
@@ -44,7 +44,7 @@ jacocoTestReport {
 }
 check.dependsOn jacocoTestReport
 
-def slf4j_version_of_cronutils = "2.0.13"
+def slf4j_version_of_cronutils = "2.0.16"
 dependencies {
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
     // slf4j is the runtime dependency of cron-utils

spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java

@@ -26,6 +26,7 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.common.xcontent.XContentFactory;
@@ -82,7 +83,10 @@ void createLockIndex(ActionListener<Boolean> listener) {
             if (lockIndexExist()) {
                 listener.onResponse(true);
             } else {
-                final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME).mapping(lockMapping());
+                final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME).mapping(
+                    lockMapping(),
+                    (MediaType) XContentType.JSON
+                );
                 client.admin()
                     .indices()
                     .create(request, ActionListener.wrap(response -> listener.onResponse(response.isAcknowledged()), exception -> {

src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java

@@ -30,6 +30,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.extensions.action.ExtensionProxyAction;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.index.IndexNotFoundException;
@@ -293,7 +294,10 @@ void createJobDetailsIndex(ActionListener<Boolean> listener) {
         if (jobDetailsIndexExist()) {
             listener.onResponse(true);
         } else {
-            CreateIndexRequest request = new CreateIndexRequest(JOB_DETAILS_INDEX_NAME).mapping(jobDetailsMapping());
+            CreateIndexRequest request = new CreateIndexRequest(JOB_DETAILS_INDEX_NAME).mapping(
+                jobDetailsMapping(),
+                (MediaType) XContentType.JSON
+            );
             client.admin()
                 .indices()
                 .create(request, ActionListener.wrap(response -> listener.onResponse(response.isAcknowledged()), exception -> {