From 21133509227beab5fa01ce117da4aa91b09de80f Mon Sep 17 00:00:00 2001
From: Zelin Hao <zelinhao@amazon.com>
Date: Mon, 5 Feb 2024 14:10:11 -0800
Subject: [PATCH] Update the 3.0.0 manifest to schema 1.1

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
---
 manifests/3.0.0/opensearch-3.0.0.yml          | 34 ++++++++++++++++++-
 .../3.0.0/opensearch-dashboards-3.0.0.yml     |  2 +-
 tests/tests_manifests/test_input_manifests.py |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml
index 19198669e4..1e922e2ca8 100644
--- a/manifests/3.0.0/opensearch-3.0.0.yml
+++ b/manifests/3.0.0/opensearch-3.0.0.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch
   version: 3.0.0
@@ -32,6 +32,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: opensearch-ml-plugin
+    depends_on:
+      - common-utils
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
     ref: main
@@ -50,6 +52,9 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - common-utils
+      - job-scheduler
   - name: security
     repository: https://github.com/opensearch-project/security.git
     ref: main
@@ -73,6 +78,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - common-utils
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
     ref: main
@@ -91,6 +98,9 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - ml-commons
+      - k-NN
   - name: geospatial
     repository: https://github.com/opensearch-project/geospatial.git
     ref: main
@@ -100,6 +110,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - job-scheduler
   - name: anomaly-detection
     repository: https://github.com/opensearch-project/anomaly-detection.git
     ref: main
@@ -109,6 +121,9 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - common-utils
+      - job-scheduler
   - name: cross-cluster-replication
     repository: https://github.com/opensearch-project/cross-cluster-replication.git
     ref: main
@@ -118,6 +133,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - common-utils
   - name: notifications-core
     repository: https://github.com/opensearch-project/notifications.git
     ref: main
@@ -128,6 +145,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: opensearch-notifications-core
+    depends_on:
+      - common-utils
   - name: notifications
     repository: https://github.com/opensearch-project/notifications.git
     ref: main
@@ -138,6 +157,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: notifications
+    depends_on:
+      - common-utils
   - name: alerting
     repository: https://github.com/opensearch-project/alerting.git
     ref: main
@@ -147,6 +168,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: alerting
+    depends_on:
+      - common-utils
   - name: sql
     repository: https://github.com/opensearch-project/sql.git
     ref: main
@@ -156,6 +179,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: opensearch-sql-plugin
+    depends_on:
+      - ml-commons
   - name: asynchronous-search
     repository: https://github.com/opensearch-project/asynchronous-search.git
     ref: main
@@ -165,6 +190,8 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+    depends_on:
+      - common-utils
   - name: security-analytics
     repository: https://github.com/opensearch-project/security-analytics.git
     ref: main
@@ -173,6 +200,8 @@ components:
       - windows
     checks:
       - gradle:properties:version
+    depends_on:
+      - common-utils
   - name: index-management
     repository: https://github.com/opensearch-project/index-management.git
     ref: main
@@ -181,3 +210,6 @@ components:
       - windows
     checks:
       - gradle:properties:version
+    depends_on:
+      - common-utils
+      - job-scheduler
diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml
index ad37725764..f0c26e3559 100644
--- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml
+++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch Dashboards
   version: 3.0.0
diff --git a/tests/tests_manifests/test_input_manifests.py b/tests/tests_manifests/test_input_manifests.py
index 54aa80b077..9d5bee7846 100644
--- a/tests/tests_manifests/test_input_manifests.py
+++ b/tests/tests_manifests/test_input_manifests.py
@@ -20,7 +20,7 @@ def tests_configs(self) -> None:
     def test_3_0_0(self) -> None:
         manifest = self.manifests["3.0.0"]
         self.assertIsNotNone(manifest)
-        self.assertEqual(manifest.version, "1.0")
+        self.assertEqual(manifest.version, "1.1")
         self.assertEqual(manifest.build.version, "3.0.0")
         self.assertEqual(manifest.build.name, "OpenSearch")
         self.assertEqual(manifest.build.filename, "opensearch")