Bump version 3.0.0-alpha1-SNAPSHOT (#1073)

* Bump version 3.0.0-alpha1-SNAPSHOT

Signed-off-by: Paul Sebastian <[email protected]>

* Update github actions checkout and upload-artifact to v4

Signed-off-by: Paul Sebastian <[email protected]>

* update bwcversion

Signed-off-by: Paul Sebastian <[email protected]>

* update imports and bump kotlin version

Signed-off-by: Shenoy Pratik <[email protected]>

* add resolution for org.jetbrains.kotlin:kotlin-stdlib-jdk7

Signed-off-by: Shenoy Pratik <[email protected]>

* fix linter errors

Signed-off-by: Shenoy Pratik <[email protected]>

* update tests

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Co-authored-by: Shenoy Pratik <[email protected]>

.github/workflows/maven-publish.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin # Temurin is a distribution of adoptium
-          java-version: 11
+          java-version: 21
       - uses: actions/checkout@v3
       - uses: aws-actions/configure-aws-credentials@v1
         with:

.github/workflows/reports-scheduler-test-and-build-workflow.yml

@@ -20,12 +20,16 @@ jobs:
       # this image tag is subject to change as more dependencies and updates will arrive over time
       image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
       # need to switch to root so that github actions can install runner binary on container without permission issues.
-      options: --user root
+      options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
 
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
     steps:
+      - name: Run start commands
+        run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
+      - uses: actions/checkout@v4
+
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
@@ -46,7 +50,7 @@ jobs:
           su `id -un 1000` -c "./gradlew build"
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
           flags: reports-scheduler
           directory: reports-scheduler/
@@ -59,58 +63,28 @@ jobs:
           chown -R 1000:1000 `pwd`
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: reports-scheduler-linux
           path: reports-scheduler-builds
 
-  windows-build:
-    strategy:
-      matrix:
-        java:
-          - 21
-    runs-on: windows-latest
-
-    steps:
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-
-      - name: Checkout Reports Scheduler
-        uses: actions/checkout@v2
-
-      - name: Build with Gradle
-        run: |
-          ./gradlew.bat build
-
-      - name: Create Artifact Path
-        run: |
-          mkdir -p reports-scheduler-builds
-          cp -r ./build/distributions/*.zip reports-scheduler-builds/
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: reports-scheduler-windows
-          path: reports-scheduler-builds
-
-  macos-build:
+  build-windows-macos:
     strategy:
+      # Run all jobs
+      fail-fast: false
       matrix:
-        java:
-          - 21
-    runs-on: macos-latest
+        java: [21]
+        os: [windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
 
-      # reports-scheduler
       - name: Checkout Reports Scheduler
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build with Gradle
         run: |
@@ -122,7 +96,7 @@ jobs:
           cp -r ./build/distributions/*.zip reports-scheduler-builds/
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: reports-scheduler-macos
-          path: reports-scheduler-builds
+          name: eports-scheduler-${{ matrix.os }}
+          path: eports-scheduler-builds

build.gradle

@@ -12,8 +12,8 @@ buildscript {
         opensearch_group = "org.opensearch"
 
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
@@ -26,7 +26,7 @@ buildscript {
 
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
         job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
-        kotlin_version = System.getProperty("kotlin.version", "1.8.21")
+        kotlin_version = System.getProperty("kotlin.version", "2.0.21")
     }
 
     repositories {
@@ -132,6 +132,7 @@ configurations.all {
     resolutionStrategy {
         force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
+        force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
         force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.4"
@@ -149,18 +150,18 @@ ext {
 }
 
 plugins.withId('java') {
-    sourceCompatibility = targetCompatibility = "11"
+    sourceCompatibility = targetCompatibility = "21"
 }
 
 plugins.withId('org.jetbrains.kotlin.jvm') {
-    compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = "11"
+    compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = "21"
 }
 
 allprojects {
     group = "org.opensearch"
     version = "${opensearch_build}"
     plugins.withId('java') {
-        sourceCompatibility = targetCompatibility = "11"
+        sourceCompatibility = targetCompatibility = "21"
     }
 }
 
@@ -329,7 +330,7 @@ testClusters.integTest {
 }
 
 // For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0.
-String baseVersion = "2.16.0"
+String baseVersion = "2.20.0"
 String bwcVersion = baseVersion + ".0"
 String baseName = "reportsSchedulerBwcCluster"
 String bwcFilePath = "src/test/resources/bwc"

src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt

@@ -6,7 +6,6 @@
 package org.opensearch.reportsscheduler
 
 import org.opensearch.action.ActionRequest
-import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.node.DiscoveryNodes
 import org.opensearch.cluster.service.ClusterService
@@ -55,6 +54,7 @@ import org.opensearch.rest.RestController
 import org.opensearch.rest.RestHandler
 import org.opensearch.script.ScriptService
 import org.opensearch.threadpool.ThreadPool
+import org.opensearch.transport.client.Client
 import org.opensearch.watcher.ResourceWatcherService
 import java.util.function.Supplier
 

src/main/kotlin/org/opensearch/reportsscheduler/action/CreateReportDefinitionAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.CreateReportDefinitionRequest
 import org.opensearch.reportsscheduler.model.CreateReportDefinitionResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Create reportDefinition transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/DeleteReportDefinitionAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.DeleteReportDefinitionRequest
 import org.opensearch.reportsscheduler.model.DeleteReportDefinitionResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Delete reportDefinition transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/GetAllReportDefinitionsAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsRequest
 import org.opensearch.reportsscheduler.model.GetAllReportDefinitionsResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get all reportDefinitions transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/GetAllReportInstancesAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.GetAllReportInstancesRequest
 import org.opensearch.reportsscheduler.model.GetAllReportInstancesResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get all report instances transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/GetReportDefinitionAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.GetReportDefinitionRequest
 import org.opensearch.reportsscheduler.model.GetReportDefinitionResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get reportDefinition transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/GetReportInstanceAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.GetReportInstanceRequest
 import org.opensearch.reportsscheduler.model.GetReportInstanceResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get report instance transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/InContextReportCreateAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.InContextReportCreateRequest
 import org.opensearch.reportsscheduler.model.InContextReportCreateResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * In-Context ReportCreate transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/OnDemandReportCreateAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.OnDemandReportCreateRequest
 import org.opensearch.reportsscheduler.model.OnDemandReportCreateResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * On-Demand ReportCreate transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt

@@ -13,7 +13,6 @@ import org.opensearch.OpenSearchStatusException
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
-import org.opensearch.client.Client
 import org.opensearch.common.util.concurrent.ThreadContext
 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
 import org.opensearch.commons.authuser.User
@@ -29,6 +28,7 @@ import org.opensearch.reportsscheduler.metrics.Metrics
 import org.opensearch.reportsscheduler.util.logger
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 import java.io.IOException
 
 abstract class PluginBaseAction<Request : ActionRequest, Response : ActionResponse>(

src/main/kotlin/org/opensearch/reportsscheduler/action/ReportInstanceActions.kt

@@ -89,7 +89,8 @@ internal object ReportInstanceActions {
         val endTime: Instant
 
         if (!reportDefinitionDetails.reportDefinition.format.timeFrom.isNullOrBlank() &&
-            !reportDefinitionDetails.reportDefinition.format.timeTo.isNullOrBlank()) {
+            !reportDefinitionDetails.reportDefinition.format.timeTo.isNullOrBlank()
+        ) {
             beginTime = Instant.parse(reportDefinitionDetails.reportDefinition.format.timeFrom)
             endTime = Instant.parse(reportDefinitionDetails.reportDefinition.format.timeTo)
         } else {

src/main/kotlin/org/opensearch/reportsscheduler/action/UpdateReportDefinitionAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.UpdateReportDefinitionRequest
 import org.opensearch.reportsscheduler.model.UpdateReportDefinitionResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Update reportDefinitions transport action

src/main/kotlin/org/opensearch/reportsscheduler/action/UpdateReportInstanceStatusAction.kt

@@ -7,13 +7,13 @@ package org.opensearch.reportsscheduler.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.reportsscheduler.model.UpdateReportInstanceStatusRequest
 import org.opensearch.reportsscheduler.model.UpdateReportInstanceStatusResponse
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Update ReportInstance Status transport action

src/main/kotlin/org/opensearch/reportsscheduler/index/ReportDefinitionsIndex.kt

@@ -13,7 +13,6 @@ import org.opensearch.action.get.GetRequest
 import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.update.UpdateRequest
-import org.opensearch.client.Client
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
@@ -31,6 +30,7 @@ import org.opensearch.reportsscheduler.settings.PluginSettings
 import org.opensearch.reportsscheduler.util.SecureIndexClient
 import org.opensearch.reportsscheduler.util.logger
 import org.opensearch.search.builder.SearchSourceBuilder
+import org.opensearch.transport.client.Client
 import java.util.concurrent.TimeUnit
 
 /**

src/main/kotlin/org/opensearch/reportsscheduler/index/ReportInstancesIndex.kt

@@ -13,7 +13,6 @@ import org.opensearch.action.get.GetRequest
 import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.update.UpdateRequest
-import org.opensearch.client.Client
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
@@ -31,6 +30,7 @@ import org.opensearch.reportsscheduler.settings.PluginSettings
 import org.opensearch.reportsscheduler.util.SecureIndexClient
 import org.opensearch.reportsscheduler.util.logger
 import org.opensearch.search.builder.SearchSourceBuilder
+import org.opensearch.transport.client.Client
 import java.util.concurrent.TimeUnit
 
 /**