From 48924f8a5b576f905af96450c36339af2f33d6da Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:16:40 +0500
Subject: [PATCH] fix Bug 67421 - Add ingest-attachment plugin file (#216)
---
install/win/DocSpace.aip | 4 +--
install/win/OpenSearch.aip | 48 +++++++++++++++++++++++++--
install/win/build-batch.bat | 1 +
install/win/build-download-prereq.ps1 | 6 ++++
4 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index bb98a5efcd..1d71bbc43f 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -1035,7 +1035,6 @@
-
@@ -1216,7 +1215,6 @@
-
@@ -1513,7 +1511,7 @@
-
+
diff --git a/install/win/OpenSearch.aip b/install/win/OpenSearch.aip
index 230753b3e6..3be40d8bcd 100644
--- a/install/win/OpenSearch.aip
+++ b/install/win/OpenSearch.aip
@@ -5,15 +5,17 @@
+
+
-
+
@@ -31,6 +33,7 @@
+
@@ -48,7 +51,7 @@
-
+
@@ -71,10 +74,20 @@
+
+
+
+
+
+
+
+
+
+
@@ -107,9 +120,18 @@
+
+
+
+
+
+
+
+
+
@@ -129,6 +151,7 @@
+
@@ -140,6 +163,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -156,10 +190,20 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat
index c1d795b548..9f394a503b 100644
--- a/install/win/build-batch.bat
+++ b/install/win/build-batch.bat
@@ -6,6 +6,7 @@ set "opensearch_version=2.11.1"
REM echo ######## Extracting and preparing files to build ########
%sevenzip% x buildtools\install\win\opensearch-%opensearch_version%.zip -o"buildtools\install\win" -y
+%sevenzip% x buildtools\install\win\ingest-attachment-%opensearch_version%.zip -o"buildtools\install\win\OpenSearch\plugins\ingest-attachment" -y
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-security" "buildtools\install\win\OpenSearch\plugins\opensearch-security" /s /y /b /i
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-job-scheduler" "buildtools\install\win\OpenSearch\plugins\opensearch-job-scheduler" /s /y /b /i
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-index-management" "buildtools\install\win\OpenSearch\plugins\opensearch-index-management" /s /y /b /i
diff --git a/install/win/build-download-prereq.ps1 b/install/win/build-download-prereq.ps1
index b5abfd7933..8844b3b51d 100644
--- a/install/win/build-download-prereq.ps1
+++ b/install/win/build-download-prereq.ps1
@@ -61,6 +61,12 @@ $prerequisites = @(
link = "https://artifacts.opensearch.org/releases/bundle/opensearch/${opensearch_version}/opensearch-${opensearch_version}-windows-x64.zip";
}
+ @{
+ download_allways = $false;
+ name = "ingest-attachment-${opensearch_version}.zip";
+ link = "https://artifacts.opensearch.org/releases/plugins/ingest-attachment/${opensearch_version}/ingest-attachment-${opensearch_version}.zip";
+ }
+
@{
download_allways = $false;
name = "WinSW.NET4new.exe";