Changes to use OpenSearch 1.0.0-alpha1

.github/draft-release-notes-config.yml

@@ -2,7 +2,7 @@
 # As pull requests are merged, a draft release is kept up-to-date listing the changes, ready to publish when you’re ready
 
 template: |
-  Compatible with Elasticsearch (**set version here**).
+  Compatible with OpenSearch (**set version here**).
   $CHANGES
 
 # Setting the formatting and sorting for the release notes body

.github/workflows/multi-node-test-workflow.yml

@@ -17,14 +17,52 @@ jobs:
     # This job runs on Linux
     runs-on: ubuntu-latest
     steps:
-      # This step uses the checkout Github action: https://github.com/actions/checkout
-      - name: Checkout Branch
-        uses: actions/checkout@v2
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
       - name: Set Up JDK 14
         uses: actions/setup-java@v1
         with:
           java-version: 14
+      # dependencies: OpenSearch
+      - name: Checkout OpenSearch
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/OpenSearch'
+          path: OpenSearch
+          ref: '1.0.0-alpha1'
+      - name: Build OpenSearch
+        working-directory: ./OpenSearch
+        run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha1 -Dbuild.snapshot=false
+      # dependencies: common-utils
+      - name: Checkout common-utils
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/common-utils'
+          path: common-utils
+      - name: Build common-utils
+        working-directory: ./common-utils
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1
+      # dependencies: job-scheduler
+      - name: Checkout job-scheduler
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/job-scheduler'
+          path: job-scheduler
+      - name: Build job-scheduler
+        working-directory: ./job-scheduler
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 -Dbuild.snapshot=false
+      # dependencies: alerting-notification
+      - name: Checkout alerting
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/alerting'
+          ref: 'beta'
+          path: alerting
+      - name: Build alerting
+        working-directory: ./alerting
+        run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.0.0-alpha1
+      # index-management
+      - name: Checkout Branch
+        uses: actions/checkout@v2
       - name: Run integration tests with multi node config
         run: ./gradlew integTest -PnumNodes=3
       - name: Upload failed logs

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

@@ -19,14 +19,52 @@ jobs:
     # This job runs on Linux
     runs-on: ubuntu-latest
     steps:
-      # This step uses the checkout Github action: https://github.com/actions/checkout
-      - name: Checkout Branch
-        uses: actions/checkout@v2
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
       - name: Set Up JDK 14
         uses: actions/setup-java@v1
         with:
           java-version: 14
+      # dependencies: OpenSearch
+      - name: Checkout OpenSearch
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/OpenSearch'
+          path: OpenSearch
+          ref: '1.0.0-alpha1'
+      - name: Build OpenSearch
+        working-directory: ./OpenSearch
+        run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha1 -Dbuild.snapshot=false
+      # dependencies: common-utils
+      - name: Checkout common-utils
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/common-utils'
+          path: common-utils
+      - name: Build common-utils
+        working-directory: ./common-utils
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1
+      # dependencies: job-scheduler
+      - name: Checkout job-scheduler
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/job-scheduler'
+          path: job-scheduler
+      - name: Build job-scheduler
+        working-directory: ./job-scheduler
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 -Dbuild.snapshot=false
+      # dependencies: alerting-notification
+      - name: Checkout alerting
+        uses: actions/checkout@v2
+        with:
+          repository: 'opensearch-project/alerting'
+          ref: 'beta'
+          path: alerting
+      - name: Build alerting
+        working-directory: ./alerting
+        run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.0.0-alpha1
+      # index-management
+      - name: Checkout Branch
+        uses: actions/checkout@v2
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload failed logs

MAINTAINERS.md

@@ -3,6 +3,12 @@
 ## Maintainers
 | Maintainer | GitHub ID | Affiliation |
 | --------------- | --------- | ----------- |
+| Ashish Agrawal | [lezzago](https://github.com/lezzago) | Amazon |
+| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
 | Charlotte | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
-| Nick Knize | [nknize](https://github.com/nknize) | Amazon | 
-| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon |
+| Drew Baugher | [dbbaughe](https://github.com/dbbaughe) | Amazon |
+| Mohammad Qureshi | [qreshi](https://github.com/qreshi) | Amazon |
+| Nick Knize | [nknize](https://github.com/nknize) | Amazon |
+| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon |
+| Ravi | [thalurur](https://github.com/thalurur) | Amazon |
+| Sriram | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon |

README.md

@@ -1,4 +1,4 @@
-[![Test and Build Workflow](https://github.com/opendistro-for-elasticsearch/index-management/workflows/Test%20and%20Build%20Workflow/badge.svg)](https://github.com/opendistro-for-elasticsearch/index-management/actions)
+[![Test and Build Workflow](https://github.com/opensearch-project/index-management/workflows/Test%20and%20Build%20Workflow/badge.svg)](https://github.com/opensearch-project/index-management/actions)
 [![codecov](https://codecov.io/gh/opendistro-for-elasticsearch/index-management/branch/main/graph/badge.svg)](https://codecov.io/gh/opendistro-for-elasticsearch/index-management)
 [![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://opendistro.github.io/for-elasticsearch-docs/docs/ism/api/)
 [![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/index-management/)

build.gradle

@@ -31,25 +31,18 @@ import java.util.function.Predicate
 
 buildscript {
     ext {
-        es_version = System.getProperty("es.version", "7.10.3")
+        opensearch_version = System.getProperty("opensearch_version", "1.0.0-alpha1")
         kotlin_version = System.getProperty("kotlin.version", "1.3.72")
     }
 
     repositories {
-        mavenCentral()
-        maven {
-            url = 's3://search-vemsarat/'
-            credentials(AwsCredentials) {
-                accessKey = System.env.AWS_ACCESS_KEY_ID ?: findProperty('aws_access_key_id')
-                secretKey = System.env.AWS_SECRET_ACCESS_KEY ?: findProperty('aws_secret_access_key')
-            }
-        }
-        // For local publish dependency
         mavenLocal()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     dependencies {
-        classpath "org.opensearch.gradle:build-tools:${es_version}-SNAPSHOT"
+        classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC15"
@@ -104,7 +97,7 @@ opensearchplugin {
     name 'opensearch-index-management'
     description 'OpenSearch Index Management Plugin'
     classname 'com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin'
-    extendedPlugins = ['opendistro-job-scheduler']
+    extendedPlugins = ['opensearch-job-scheduler']
 }
 
 tasks.named("integTest").configure {
@@ -140,17 +133,17 @@ group = "com.amazon.opendistroforelasticsearch"
 version = "${opendistroVersion}.0"
 
 dependencies {
-    compileOnly "org.opensearch:opensearch:${es_version}-SNAPSHOT"
-    compileOnly "com.amazon.opendistroforelasticsearch:opendistro-job-scheduler-spi:1.15.0.0-SNAPSHOT"
+    compileOnly "org.opensearch:opensearch:${opensearch_version}"
+    compileOnly "com.amazon.opendistroforelasticsearch:opensearch-job-scheduler-spi:1.0.0.0-beta1"
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
     compile "org.jetbrains:annotations:13.0"
-    compile "com.amazon.opendistroforelasticsearch:notification:1.15.0.0"
-    compile "com.amazon.opendistroforelasticsearch:common-utils:1.15.0.0"
+    compile "com.amazon.opendistroforelasticsearch:notification:1.0.0.1"
+    compile "com.amazon.opendistroforelasticsearch:common-utils:1.0.0.0"
     compile "com.github.seancfoley:ipaddress:5.3.3"
 
-    testCompile "org.opensearch.test:framework:${es_version}-SNAPSHOT"
+    testCompile "org.opensearch.test:framework:${opensearch_version}"
     testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
     testCompile "org.mockito:mockito-core:2.23.0"
@@ -159,14 +152,6 @@ dependencies {
 }
 
 repositories {
-    maven {
-        url = 's3://search-vemsarat/'
-        credentials(AwsCredentials) {
-            accessKey = System.env.AWS_ACCESS_KEY_ID ?: findProperty('aws_access_key_id')
-            secretKey = System.env.AWS_SECRET_ACCESS_KEY ?: findProperty('aws_secret_access_key')
-        }
-    }
-    // TODO: remove mavenLocal once notification is published to maven
     mavenLocal()
 }
 
@@ -189,8 +174,8 @@ thirdPartyAudit.enabled = false
 loggerUsageCheck.enabled = false
 validateNebulaPom.enabled = false
 
-def es_tmp_dir = rootProject.file('build/private/es_tmp').absoluteFile
-es_tmp_dir.mkdirs()
+def opensearch_tmp_dir = rootProject.file('build/private/opensearch_tmp').absoluteFile
+opensearch_tmp_dir.mkdirs()
 
 def securityEnabled = System.getProperty("security", "false") == "true"
 afterEvaluate {
@@ -267,7 +252,7 @@ testClusters.integTest {
 }
 integTest {
     systemProperty 'tests.security.manager', 'false'
-    systemProperty 'java.io.tmpdir', es_tmp_dir.absolutePath
+    systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath
     systemProperty 'buildDir', buildDir.path
     systemProperty "https", System.getProperty("https")
     systemProperty "security", System.getProperty("security")

gradle.properties

@@ -23,4 +23,4 @@
 #   permissions and limitations under the License.
 #
 
-version = 1.15.0
+version = 1.0.0

release-notes/create_release_notes.py

@@ -6,19 +6,15 @@
 import fileinput
 import re
 
-link_prefix = "https://github.com/opendistro-for-elasticsearch/index-management/pull/"
+link_prefix = "https://github.com/opensearch-project/index-management/pull/"
 searchExp = re.compile("([\(\[]).*?([\)\]])")
 
 current_date = raw_input("what day is today (e.g. 2020-06-29): ")
 file_path = raw_input("Path to raw note file (e.g., note.md): ")
 plugin_name = "index-management"
 plugin_version = raw_input('Plugin version (x.x.x.x): ')
 
-app_num = int(
-    raw_input('Elasticsearch plugin (enter 1) or Kibana plugin (enter 2)? '))
-app = 'Elasticsearch'
-if app_num is 2:
-    app = 'Kibana'
+app = 'OpenSearch'
 
 app_version = raw_input(app + ' compatibility version (x.x.x): ')
 

src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt

@@ -538,7 +538,7 @@ class ManagedIndexCoordinator(
 
             if (requestsToRetry.isNotEmpty()) {
                 val retryCause = failedResponses.first { it.status() == RestStatus.TOO_MANY_REQUESTS }.failure.cause
-                throw ExceptionsHelper.convertToElastic(retryCause)
+                throw ExceptionsHelper.convertToOpenSearchException(retryCause)
             }
         }
     }

src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/MetadataService.kt

@@ -188,7 +188,7 @@ class MetadataService(
 
             if (requestsToRetry.isNotEmpty()) {
                 val retryCause = failedResponses.first { it.status() == RestStatus.TOO_MANY_REQUESTS }.failure.cause
-                throw ExceptionsHelper.convertToElastic(retryCause)
+                throw ExceptionsHelper.convertToOpenSearchException(retryCause)
             }
         }
     }

src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/rollup/RollupIndexer.kt

@@ -80,7 +80,7 @@ class RollupIndexer(
             if (requestsToRetry.isNotEmpty()) {
                 retryIngestPolicy.retry(logger, listOf(RestStatus.TOO_MANY_REQUESTS)) {
                     if (it.seconds >= (Rollup.ROLLUP_LOCK_DURATION_SECONDS / 2)) {
-                        throw ExceptionsHelper.convertToElastic(
+                        throw ExceptionsHelper.convertToOpenSearchException(
                             IllegalStateException("Cannot retry ingestion with a delay more than half of the rollup lock TTL")
                         )
                     }
@@ -93,7 +93,7 @@ class RollupIndexer(
 
                     if (requestsToRetry.isNotEmpty()) {
                         val retryCause = failedResponses.first { it.status() == RestStatus.TOO_MANY_REQUESTS }.failure.cause
-                        throw ExceptionsHelper.convertToElastic(retryCause)
+                        throw ExceptionsHelper.convertToOpenSearchException(retryCause)
                     }
                 }
             }

src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt

@@ -67,7 +67,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
                 if (plugin["name"] == "opensearch-index-management") {
                     hasIndexStateManagementPlugin = true
                 }
-                if (plugin["name"] == "opendistro-job-scheduler") {
+                if (plugin["name"] == "opensearch-job-scheduler") {
                     hasJobSchedulerPlugin = true
                 }
             }