From 7c7f7837fbe1b1add528d24823db4bd1bf79f0b4 Mon Sep 17 00:00:00 2001 From: busma13 Date: Tue, 27 Aug 2024 12:56:24 -0700 Subject: [PATCH 1/3] create default import for elasticsearch-api --- packages/elasticsearch-api/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elasticsearch-api/types/index.d.ts b/packages/elasticsearch-api/types/index.d.ts index 7ac22408662..49fd91dde87 100644 --- a/packages/elasticsearch-api/types/index.d.ts +++ b/packages/elasticsearch-api/types/index.d.ts @@ -5,7 +5,7 @@ import { ClientParams, ClientResponse } from '@terascope/types'; import { Logger } from '@terascope/utils'; import { ClientMetadata } from '@terascope/types' -export = elasticsearchAPI; +export default elasticsearchAPI; declare function elasticsearchAPI(client: Client, logger: Logger, config?: elasticsearchAPI.Config): elasticsearchAPI.Client; From 047e9e4046ea84ab9d455df792e2ab0c40491e75 Mon Sep 17 00:00:00 2001 From: busma13 Date: Tue, 27 Aug 2024 13:04:50 -0700 Subject: [PATCH 2/3] fix import in teraslice-state-storage --- .../src/elasticsearch-state-storage/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/teraslice-state-storage/src/elasticsearch-state-storage/index.ts b/packages/teraslice-state-storage/src/elasticsearch-state-storage/index.ts index 7905d9f6a78..d17256ce84a 100644 --- a/packages/teraslice-state-storage/src/elasticsearch-state-storage/index.ts +++ b/packages/teraslice-state-storage/src/elasticsearch-state-storage/index.ts @@ -3,7 +3,7 @@ import { chunk, pMap } from '@terascope/utils'; import { ClientParams, ClientResponse } from '@terascope/types'; -import esApi, { Client, BulkRecord } from '@terascope/elasticsearch-api'; +import esApi from '@terascope/elasticsearch-api'; import { ESStateStorageConfig, MGetCacheResponse } from '../interfaces.js'; import CachedStateStorage from '../cached-state-storage/index.js'; @@ -15,11 +15,11 @@ export default class ESCachedStateStorage { private chunkSize: number; private persist: boolean; private metaKey: string; - private es: Client; + private es: esApi.Client; private logger: Logger; public cache: CachedStateStorage; - constructor(client: Client, logger: Logger, config: ESStateStorageConfig) { + constructor(client: esApi.Client, logger: Logger, config: ESStateStorageConfig) { this.index = config.index; this.type = config.type; this.concurrency = config.concurrency; @@ -228,7 +228,7 @@ export default class ESCachedStateStorage { return this.es.mget(request); } - private _esBulkUpdatePrep(dataArray: DataEntity[]): BulkRecord[] { + private _esBulkUpdatePrep(dataArray: DataEntity[]): esApi.BulkRecord[] { return dataArray.map((doc) => ({ action: { index: { From f33b63d6375709c1895a3a8a8bca8dd32ad52cd9 Mon Sep 17 00:00:00 2001 From: busma13 Date: Tue, 27 Aug 2024 13:07:10 -0700 Subject: [PATCH 3/3] bump: (patch) @terascope/elasticsearch-api@4.0.1, @terascope/teraslice-state-storage@1.0.1 --- packages/elasticsearch-api/package.json | 2 +- packages/teraslice-state-storage/package.json | 4 ++-- packages/teraslice/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/elasticsearch-api/package.json b/packages/elasticsearch-api/package.json index 2e6e15d059a..7ee8541b546 100644 --- a/packages/elasticsearch-api/package.json +++ b/packages/elasticsearch-api/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/elasticsearch-api", "displayName": "Elasticsearch API", - "version": "4.0.0", + "version": "4.0.1", "description": "Elasticsearch client api used across multiple services, handles retries and exponential backoff", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-api#readme", "bugs": { diff --git a/packages/teraslice-state-storage/package.json b/packages/teraslice-state-storage/package.json index dd8cbeeec71..a354cf6f02c 100644 --- a/packages/teraslice-state-storage/package.json +++ b/packages/teraslice-state-storage/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/teraslice-state-storage", "displayName": "Teraslice State Storage", - "version": "1.0.0", + "version": "1.0.1", "description": "State storage operation api for teraslice", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/teraslice-state-storage#readme", "bugs": { @@ -24,7 +24,7 @@ "test:watch": "ts-scripts test --watch . --" }, "dependencies": { - "@terascope/elasticsearch-api": "^4.0.0", + "@terascope/elasticsearch-api": "^4.0.1", "@terascope/utils": "^1.0.0" }, "engines": { diff --git a/packages/teraslice/package.json b/packages/teraslice/package.json index 2b3257699b2..9a03ee946fb 100644 --- a/packages/teraslice/package.json +++ b/packages/teraslice/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@kubernetes/client-node": "^0.21.0", - "@terascope/elasticsearch-api": "^4.0.0", + "@terascope/elasticsearch-api": "^4.0.1", "@terascope/job-components": "^1.2.0", "@terascope/teraslice-messaging": "^1.3.0", "@terascope/types": "^1.0.0",