Merge branch 'main' into feat-add-workspace-create-right-sidebar

opensearch-project · Aug 29, 2024 · 6e2ae44 · 6e2ae44
2 parents 811ff0e + 07504f6
commit 6e2ae44
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/changelogs/fragments/7901.yml b/changelogs/fragments/7901.yml
@@ -0,0 +1,2 @@
+fix:
+- Fix bootstrap errors in 2.x ([#7901](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7901))
diff --git a/src/core/server/config/service/config_store_client/opensearch_config_store.test.ts b/src/core/server/config/service/config_store_client/opensearch_config_store.test.ts
@@ -71,6 +71,7 @@ describe('OpenSearchConfigStoreClient', () => {
               hits: mockHits.map((hit) => ({
                 _index: getDynamicConfigIndexName(1),
                 _id: JSON.stringify(hit),
+                _version: 1,
                 _source: hit,
               })),
             },
@@ -299,6 +300,11 @@ describe('OpenSearchConfigStoreClient', () => {
           {
             create: {
               _id: itemId,
+              _index: DYNAMIC_APP_CONFIG_ALIAS,
+              retry_on_conflict: 2,
+              routing: '',
+              version: 1,
+              version_type: 'external',
             },
           },
           {
@@ -314,6 +320,11 @@ describe('OpenSearchConfigStoreClient', () => {
           {
             update: {
               _id: JSON.stringify(configDocument),
+              _index: DYNAMIC_APP_CONFIG_ALIAS,
+              retry_on_conflict: 2,
+              routing: '',
+              version: 2,
+              version_type: 'external',
             },
           },
           {
@@ -483,6 +494,11 @@ describe('OpenSearchConfigStoreClient', () => {
             {
               update: {
                 _id: JSON.stringify(oldConfig),
+                _index: DYNAMIC_APP_CONFIG_ALIAS,
+                retry_on_conflict: 2,
+                routing: '',
+                version: 2,
+                version_type: 'external',
               },
             },
             {
@@ -503,6 +519,11 @@ describe('OpenSearchConfigStoreClient', () => {
             {
               create: {
                 _id: JSON.stringify(config),
+                _index: DYNAMIC_APP_CONFIG_ALIAS,
+                retry_on_conflict: 2,
+                routing: '',
+                version: 1,
+                version_type: 'external',
               },
             },
             {

diff --git a/src/core/server/config/service/config_store_client/opensearch_config_store_client.ts b/src/core/server/config/service/config_store_client/opensearch_config_store_client.ts
@@ -240,6 +240,11 @@ export class OpenSearchConfigStoreClient implements IDynamicConfigStoreClient {
         {
           update: {
             _id: config._id,
+            _index: DYNAMIC_APP_CONFIG_ALIAS,
+            retry_on_conflict: 2,
+            routing: '',
+            version: config._version! + 1,
+            version_type: 'external',
           },
         },
         {
@@ -267,6 +272,11 @@ export class OpenSearchConfigStoreClient implements IDynamicConfigStoreClient {
         {
           create: {
             _id: uniqueId(),
+            _index: DYNAMIC_APP_CONFIG_ALIAS,
+            retry_on_conflict: 2,
+            routing: '',
+            version: 1,
+            version_type: 'external',
           },
         },
         newConfigDocument
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- Fix bootstrap errors in 2.x ([#7901](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7901))