From 64c20f354a4c211cf9ada003e095b7096794f08d Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Thu, 19 Oct 2023 09:08:42 -0700 Subject: [PATCH 1/3] Bump bwc version after 2.11 release (#1015) Signed-off-by: bowenlan-amzn --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 58917eb2a..d0b005502 100644 --- a/build.gradle +++ b/build.gradle @@ -628,7 +628,7 @@ task integTestRemote(type: RestIntegTestTask) { // === Set up BWC tests === -String bwcVersionShort = "2.11.0" +String bwcVersionShort = "2.12.0" String bwcVersion = bwcVersionShort + ".0" String baseName = "indexmanagementBwcCluster" From cd99b0f39f2fd279d6f85161cef3b65e7adc6236 Mon Sep 17 00:00:00 2001 From: n-dohrmann <87952011+n-dohrmann@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:59:49 -0400 Subject: [PATCH 2/3] added type check for pipeline aggregator types in Transform initialization (#1014) Signed-off-by: n-dohrmann Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com> --- .../opensearch/indexmanagement/transform/model/Transform.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt index ce6e50401..1403639af 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt @@ -77,6 +77,9 @@ data class Transform( aggregations.aggregatorFactories.forEach { require(supportedAggregations.contains(it.type)) { "Unsupported aggregation [${it.type}]" } } + aggregations.pipelineAggregatorFactories.forEach { + require(supportedAggregations.contains(it.type)) { "Unsupported aggregation [${it.type}]" } + } when (jobSchedule) { is CronSchedule -> { // Job scheduler already correctly throws errors for this From 6aad0be3ae4d62074c95176e87a158204c92a164 Mon Sep 17 00:00:00 2001 From: Hailong Cui Date: Sat, 21 Oct 2023 00:55:06 +0800 Subject: [PATCH 3/3] Improve security plugin enabling check (#1017) Signed-off-by: Hailong Cui --- .github/workflows/docker-security-test-workflow.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-security-test-workflow.yml b/.github/workflows/docker-security-test-workflow.yml index 590686ae0..a3177cd1b 100644 --- a/.github/workflows/docker-security-test-workflow.yml +++ b/.github/workflows/docker-security-test-workflow.yml @@ -66,9 +66,10 @@ jobs: - name: Run Index Management Test for security enabled test cases if: env.imagePresent == 'true' run: | - cluster_running=`curl -XGET https://localhost:9200/_cat/plugins -u admin:admin --insecure` - echo $cluster_running - security=`curl -XGET https://localhost:9200/_cat/plugins -u admin:admin --insecure |grep opensearch-security|wc -l` + container_id=`docker ps -q` + plugins=`docker exec $container_id /usr/share/opensearch/bin/opensearch-plugin list` + echo "plugins: $plugins" + security=`echo $plugins | grep opensearch-security | wc -l` echo $security if [ $security -gt 0 ] then