updated workflows and version to 3.0.0 (#905)

* updated workflows and version to 3.0.0 Signed-off-by: Shenoy Pratik <sgguruda@amazon.com> * update bwc tests to 2.4.0 Signed-off-by: Shenoy Pratik <sgguruda@amazon.com> * update http library upstream changes Signed-off-by: Shenoy Pratik <sgguruda@amazon.com> Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
opensearch-project · Oct 20, 2022 · 7ad9027 · 7ad9027
1 parent 363ccd4
commit 7ad9027
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -6,7 +6,7 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: dashboards-observability
   OPENSEARCH_VERSION: 'main'
-  OPENSEARCH_PLUGIN_VERSION: 2.2.0.0
+  OPENSEARCH_PLUGIN_VERSION: 3.0.0.0
 
 jobs:
 

diff --git a/dashboards-observability/opensearch_dashboards.json b/dashboards-observability/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "observabilityDashboards",
-  "version": "2.2.0.0",
-  "opensearchDashboardsVersion": "2.2.0",
+  "version": "3.0.0.0",
+  "opensearchDashboardsVersion": "3.0.0",
   "server": true,
   "ui": true,
   "requiredPlugins": [

diff --git a/dashboards-observability/package.json b/dashboards-observability/package.json
@@ -1,6 +1,6 @@
 {
   "name": "observability-dashboards",
-  "version": "2.2.0.0",
+  "version": "3.0.0.0",
   "main": "index.ts",
   "license": "Apache-2.0",
   "scripts": {

diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle
@@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
@@ -308,16 +308,16 @@ testClusters.integTest {
     setting 'path.repo', repo.absolutePath
 }
 
-String bwcVersion = "1.2.0-SNAPSHOT"
+String bwcVersion = "2.4.0-SNAPSHOT"
 String baseName = "obsBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"
-String remoteFileURL = "https://github.com/opensearch-project/observability/releases/download/1.2.0.0/opensearch-observability-1.2.0.0.zip"
+String remoteFileURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-observability-2.4.0.0.zip"
 
 2.times {i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["1.2.0",opensearch_version]
+            versions = ["2.4.0",opensearch_version]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>(){
                 @Override
@@ -329,7 +329,7 @@ String remoteFileURL = "https://github.com/opensearch-project/observability/rele
                             if (!dir.exists()) {
                                 dir.mkdirs()
                             }
-                            File file = new File(dir, "opensearch-observability-1.2.0.0-SNAPSHOT.zip")
+                            File file = new File(dir, "opensearch-observability-2.4.0.0-SNAPSHOT.zip")
                             if (!file.exists()) {
                                 new URL(remoteFileURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
                             }

diff --git a/opensearch-observability/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt b/opensearch-observability/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt
@@ -6,7 +6,7 @@
 package org.opensearch.observability
 
 import com.google.gson.JsonObject
-import org.apache.http.HttpHost
+import org.apache.hc.core5.http.HttpHost
 import org.junit.After
 import org.junit.AfterClass
 import org.junit.Before
@@ -60,7 +60,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
     open fun wipeAllOpenSearchIndices() {
         if (preserveOpenSearchIndicesAfterTest()) return
         val response = client().performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
-        val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
+        val xContentType = XContentType.fromMediaType(response.entity.contentType)
         xContentType.xContent().createParser(
             NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
             response.entity.content