Upgrade Alerting to 2.0 (#357)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
opensearch-project · Mar 22, 2022 · 0c5090f · 0c5090f
1 parent 120f7c4
commit 0c5090f
Show file tree

Hide file tree

Showing 21 changed files with 206 additions and 157 deletions.
diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
@@ -27,4 +27,4 @@ jobs:
       - name: Checkout Branch
         uses: actions/checkout@v2
       - name: Run integration tests with multi node config
-        run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.3.0-SNAPSHOT
+        run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=2.0.0-SNAPSHOT
diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml
@@ -33,7 +33,7 @@ jobs:
           java-version: 11
       - name: Build Alerting
         # Only assembling since the full build is governed by other workflows
-        run: ./gradlew assemble -Dopensearch.version=1.3.0-SNAPSHOT
+        run: ./gradlew assemble -Dopensearch.version=2.0.0-SNAPSHOT
       - name: Pull and Run Docker
         run: |
           plugin=`ls alerting/build/distributions/*.zip`

diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8, 11, 14]
+        java: [11, 14]
     # Job name
     name: Build Alerting with JDK ${{ matrix.java }}
     # This job runs on Linux
@@ -27,7 +27,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Build and run with Gradle
-        run: ./gradlew build -Dopensearch.version=1.3.0-SNAPSHOT
+        run: ./gradlew build -Dopensearch.version=2.0.0-SNAPSHOT
       - name: Create Artifact Path
         run: |
           mkdir -p alerting-artifacts

diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -50,24 +50,24 @@ configurations.all {
     }
 }
 
-configurations.testCompile {
+configurations.testImplementation {
     exclude module: "securemock"
 }
 
 dependencies {
     compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
 
     // OpenSearch Nanny state
-    compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
-    compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
-    compile "org.jetbrains:annotations:13.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
+    implementation "org.jetbrains:annotations:13.0"
 
-    compile project(":alerting-core")
-    compile project(":alerting-notification")
+    api project(":alerting-core")
+    api project(":alerting-notification")
     implementation "com.github.seancfoley:ipaddress:5.3.3"
 
     testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
-    testCompile "org.mockito:mockito-core:3.12.4"
+    testImplementation "org.mockito:mockito-core:4.3.1"
 }
 
 javadoc.enabled = false // turn off javadoc as it barfs on Kotlin code
@@ -161,7 +161,7 @@ String bwcFilePath = "src/test/resources/bwc"
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["7.10.2","1.3.0-SNAPSHOT"]
+            versions = ["7.10.2","2.0.0-SNAPSHOT"]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>(){
                 @Override

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt b/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt
@@ -236,7 +236,7 @@ class AlertIndices(
             return
         }
 
-        var putMappingRequest: PutMappingRequest = PutMappingRequest(targetIndex).type(MAPPING_TYPE)
+        var putMappingRequest: PutMappingRequest = PutMappingRequest(targetIndex)
             .source(mapping, XContentType.JSON)
         val updateResponse: AcknowledgedResponse = client.admin().indices().suspendUntil { putMapping(putMappingRequest, it) }
         if (updateResponse.isAcknowledged) {

diff --git a/...ting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexDestinationAction.kt b/...ting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexDestinationAction.kt
@@ -117,7 +117,7 @@ class TransportIndexDestinationAction @Inject constructor(
                 })
             } else if (!IndexUtils.scheduledJobIndexUpdated) {
                 IndexUtils.updateIndexMapping(
-                    ScheduledJob.SCHEDULED_JOBS_INDEX, ScheduledJob.SCHEDULED_JOB_TYPE,
+                    ScheduledJob.SCHEDULED_JOBS_INDEX,
                     ScheduledJobIndices.scheduledJobMappings(), clusterService.state(), client.admin().indices(),
                     object : ActionListener<AcknowledgedResponse> {
                         override fun onResponse(response: AcknowledgedResponse) {

diff --git a/...ing/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexEmailAccountAction.kt b/...ing/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexEmailAccountAction.kt
@@ -23,7 +23,6 @@ import org.opensearch.alerting.action.IndexEmailAccountRequest
 import org.opensearch.alerting.action.IndexEmailAccountResponse
 import org.opensearch.alerting.core.ScheduledJobIndices
 import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
-import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOB_TYPE
 import org.opensearch.alerting.model.destination.email.EmailAccount
 import org.opensearch.alerting.settings.AlertingSettings.Companion.INDEX_TIMEOUT
 import org.opensearch.alerting.settings.AlertingSettings.Companion.REQUEST_TIMEOUT
@@ -94,7 +93,7 @@ class TransportIndexEmailAccountAction @Inject constructor(
                 })
             } else if (!IndexUtils.scheduledJobIndexUpdated) {
                 IndexUtils.updateIndexMapping(
-                    SCHEDULED_JOBS_INDEX, SCHEDULED_JOB_TYPE,
+                    SCHEDULED_JOBS_INDEX,
                     ScheduledJobIndices.scheduledJobMappings(), clusterService.state(), client.admin().indices(),
                     object : ActionListener<AcknowledgedResponse> {
                         override fun onResponse(response: AcknowledgedResponse) {

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexEmailGroupAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexEmailGroupAction.kt
@@ -21,7 +21,6 @@ import org.opensearch.alerting.action.IndexEmailGroupRequest
 import org.opensearch.alerting.action.IndexEmailGroupResponse
 import org.opensearch.alerting.core.ScheduledJobIndices
 import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
-import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOB_TYPE
 import org.opensearch.alerting.settings.AlertingSettings.Companion.INDEX_TIMEOUT
 import org.opensearch.alerting.settings.DestinationSettings.Companion.ALLOW_LIST
 import org.opensearch.alerting.util.AlertingException
@@ -86,7 +85,7 @@ class TransportIndexEmailGroupAction @Inject constructor(
                 })
             } else if (!IndexUtils.scheduledJobIndexUpdated) {
                 IndexUtils.updateIndexMapping(
-                    SCHEDULED_JOBS_INDEX, SCHEDULED_JOB_TYPE,
+                    SCHEDULED_JOBS_INDEX,
                     ScheduledJobIndices.scheduledJobMappings(), clusterService.state(), client.admin().indices(),
                     object : ActionListener<AcknowledgedResponse> {
                         override fun onResponse(response: AcknowledgedResponse) {

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexMonitorAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexMonitorAction.kt
@@ -25,7 +25,6 @@ import org.opensearch.alerting.action.IndexMonitorResponse
 import org.opensearch.alerting.core.ScheduledJobIndices
 import org.opensearch.alerting.core.model.ScheduledJob
 import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
-import org.opensearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOB_TYPE
 import org.opensearch.alerting.core.model.SearchInput
 import org.opensearch.alerting.model.Monitor
 import org.opensearch.alerting.settings.AlertingSettings
@@ -243,7 +242,7 @@ class TransportIndexMonitorAction @Inject constructor(
                 })
             } else if (!IndexUtils.scheduledJobIndexUpdated) {
                 IndexUtils.updateIndexMapping(
-                    SCHEDULED_JOBS_INDEX, SCHEDULED_JOB_TYPE,
+                    SCHEDULED_JOBS_INDEX,
                     ScheduledJobIndices.scheduledJobMappings(), clusterService.state(), client.admin().indices(),
                     object : ActionListener<AcknowledgedResponse> {
                         override fun onResponse(response: AcknowledgedResponse) {

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/util/IndexUtils.kt b/alerting/src/main/kotlin/org/opensearch/alerting/util/IndexUtils.kt
@@ -105,15 +105,14 @@ class IndexUtils {
         @JvmStatic
         fun updateIndexMapping(
             index: String,
-            type: String,
             mapping: String,
             clusterState: ClusterState,
             client: IndicesAdminClient,
             actionListener: ActionListener<AcknowledgedResponse>
         ) {
             if (clusterState.metadata.indices.containsKey(index)) {
                 if (shouldUpdateIndex(clusterState.metadata.indices[index], mapping)) {
-                    val putMappingRequest: PutMappingRequest = PutMappingRequest(index).type(type).source(mapping, XContentType.JSON)
+                    val putMappingRequest: PutMappingRequest = PutMappingRequest(index).source(mapping, XContentType.JSON)
                     client.putMapping(putMappingRequest, actionListener)
                 } else {
                     actionListener.onResponse(AcknowledgedResponse(true))

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/AlertingRestTestCase.kt b/alerting/src/test/kotlin/org/opensearch/alerting/AlertingRestTestCase.kt
@@ -79,7 +79,7 @@ abstract class AlertingRestTestCase : ODFERestTestCase() {
                 SearchInput.XCONTENT_REGISTRY,
                 QueryLevelTrigger.XCONTENT_REGISTRY,
                 BucketLevelTrigger.XCONTENT_REGISTRY
-            ) + SearchModule(Settings.EMPTY, false, emptyList()).namedXContents
+            ) + SearchModule(Settings.EMPTY, emptyList()).namedXContents
         )
     }
 

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/TestHelpers.kt b/alerting/src/test/kotlin/org/opensearch/alerting/TestHelpers.kt
@@ -527,7 +527,7 @@ fun xContentRegistry(): NamedXContentRegistry {
     return NamedXContentRegistry(
         listOf(
             SearchInput.XCONTENT_REGISTRY, QueryLevelTrigger.XCONTENT_REGISTRY, BucketLevelTrigger.XCONTENT_REGISTRY
-        ) + SearchModule(Settings.EMPTY, false, emptyList()).namedXContents
+        ) + SearchModule(Settings.EMPTY, emptyList()).namedXContents
     )
 }
 

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/util/IndexUtilsTests.kt b/alerting/src/test/kotlin/org/opensearch/alerting/util/IndexUtilsTests.kt
@@ -78,10 +78,12 @@ class IndexUtilsTests : OpenSearchTestCase() {
     fun `test should update index with same version`() {
         val indexContent = "{\"testIndex\":{\"settings\":{\"index\":{\"creation_date\":\"1558407515699\"," +
             "\"number_of_shards\":\"1\",\"number_of_replicas\":\"1\",\"uuid\":\"t-VBBW6aR6KpJ3XP5iISOA\"," +
-            "\"version\":{\"created\":\"6040399\"},\"provided_name\":\"data_test\"}},\"mappings\":" +
+            "\"version\":{\"created\":\"6040399\"},\"provided_name\":\"data_test\"}},\"mapping_version\":\"1\"," +
+            "\"settings_version\":\"1\",\"aliases_version\":\"1\",\"mappings\":" +
             "{\"_doc\":{\"_meta\":{\"schema_version\":1},\"properties\":{\"name\":{\"type\":\"keyword\"}}}}}}"
         val newMapping = "{\"_meta\":{\"schema_version\":1},\"properties\":{\"name\":{\"type\":\"keyword\"}}}"
-        val index: IndexMetadata = IndexMetadata.fromXContent(parser(indexContent))
+        val xContentParser = parser(indexContent)
+        val index: IndexMetadata = IndexMetadata.fromXContent(xContentParser)
 
         val shouldUpdateIndex = IndexUtils.shouldUpdateIndex(index, newMapping)
         assertFalse(shouldUpdateIndex)

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     apply from: 'build-tools/repositories.gradle'
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
         // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
         opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
@@ -77,10 +77,10 @@ allprojects {
     apply from: "$rootDir/build-tools/repositories.gradle"
 
     plugins.withId('java') {
-        sourceCompatibility = targetCompatibility = "1.8"
+        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
     }
     plugins.withId('org.jetbrains.kotlin.jvm') {
-        compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = "1.8"
+        compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11
         compileKotlin.dependsOn ktlint
     }
 }

diff --git a/core/build.gradle b/core/build.gradle
@@ -9,14 +9,14 @@ apply plugin: 'jacoco'
 
 dependencies {
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
-    compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
-    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-    compile "com.cronutils:cron-utils:9.1.6"
-    compile "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
-    compile 'com.google.googlejavaformat:google-java-format:1.10.0'
-    compile "org.opensearch:common-utils:${common_utils_version}"
-    compile 'commons-validator:commons-validator:1.7'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
+    implementation "com.cronutils:cron-utils:9.1.6"
+    api "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
+    implementation 'com.google.googlejavaformat:google-java-format:1.10.0'
+    api "org.opensearch:common-utils:${common_utils_version}"
+    implementation 'commons-validator:commons-validator:1.7'
 
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"

diff --git a/core/src/test/kotlin/org/opensearch/alerting/core/model/XContentTestBase.kt b/core/src/test/kotlin/org/opensearch/alerting/core/model/XContentTestBase.kt
@@ -27,7 +27,7 @@ interface XContentTestBase {
     fun xContentRegistry(): NamedXContentRegistry {
         return NamedXContentRegistry(
             listOf(SearchInput.XCONTENT_REGISTRY) +
-                SearchModule(Settings.EMPTY, false, emptyList()).namedXContents
+                SearchModule(Settings.EMPTY, emptyList()).namedXContents
         )
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists