teraslice 3.0.0-dev.7 → 3.0.0-dev.9

package/cluster-service.js

@@ -1,4 +1,4 @@
-import { get, logError } from '@terascope/utils';
+import { get, logError } from '@terascope/core-utils';
 import { shutdownHandler } from './dist/src/lib/workers/helpers/worker-shutdown.js';
 import { makeTerafoundationContext } from './dist/src/lib/workers/context/terafoundation-context.js';
 import { ClusterMaster } from './dist/src/lib/cluster/cluster_master.js';

package/dist/src/lib/cluster/cluster_master.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import got from 'got';
-import { pDelay, logError, get, parseError } from '@terascope/utils';
+import { pDelay, logError, get, parseError } from '@terascope/core-utils';
 import { ClusterMaster as ClusterMasterMessaging } from '@terascope/teraslice-messaging';
 import { isPromAvailable } from '@terascope/job-components';
 import { makeLogger } from '../workers/helpers/terafoundation.js';

package/dist/src/lib/cluster/node_master.js

@@ -1,6 +1,6 @@
 import ms from 'ms';
 import { Mutex } from 'async-mutex';
-import { getFullErrorStack, debounce, isEmpty, has } from '@terascope/utils';
+import { getFullErrorStack, debounce, isEmpty, has } from '@terascope/core-utils';
 import { makeLogger } from '../workers/helpers/terafoundation.js';
 import { Messaging } from './services/cluster/backends/native/messaging.js';
 import { spawnAssetLoader } from '../workers/assets/spawn.js';

package/dist/src/lib/cluster/services/api.js

@@ -3,7 +3,7 @@ import bodyParser from 'body-parser';
 import { pipeline as streamPipeline } from 'node:stream/promises';
 import got from 'got';
 import { RecoveryCleanupType } from '@terascope/job-components';
-import { parseErrorInfo, parseList, logError, TSError, startsWith, pWhile, isKey } from '@terascope/utils';
+import { parseErrorInfo, parseList, logError, TSError, startsWith, pWhile, isKey } from '@terascope/core-utils';
 import { ExecutionStatusEnum } from '@terascope/types';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
 import { makeTable, sendError, handleTerasliceRequest, getSearchOptions, createJobActiveQuery, addDeletedToQuery } from '../../utils/api_utils.js';
@@ -558,7 +558,7 @@ export class ApiService {
                             name,
                             node_version: process.version,
                             platform: this.context.platform,
-                            teraslice_version: `v${getPackageJSON().version}`
+                            teraslice_version: `v${terasliceVersion}`
                         }, 1);
                         this.context.apis.foundation.promMetrics.set('slices_processed', {}, stats.controllers.processed);
                         this.context.apis.foundation.promMetrics.set('slices_failed', {}, stats.controllers.failed);

package/dist/src/lib/cluster/services/assets.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { TSError, parseErrorInfo, logError, toBoolean } from '@terascope/utils';
+import { TSError, parseErrorInfo, logError, toBoolean } from '@terascope/core-utils';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
 import { AssetsStorage } from '../../storage/index.js';
 import { getBackendConfig } from '../../storage/assets.js';

package/dist/src/lib/cluster/services/cluster/backends/kubernetesV2/index.js

@@ -1,4 +1,4 @@
-import { TSError, logError, get, cloneDeep, pRetry } from '@terascope/utils';
+import { TSError, logError, get, cloneDeep, pRetry } from '@terascope/core-utils';
 import { makeLogger } from '../../../../../workers/helpers/terafoundation.js';
 import { gen } from './k8sState.js';
 import { K8s } from './k8s.js';

package/dist/src/lib/cluster/services/cluster/backends/kubernetesV2/k8s.js

@@ -1,4 +1,4 @@
-import { TSError, get, isEmpty, pDelay, pRetry } from '@terascope/utils';
+import { TSError, get, isEmpty, pDelay, pRetry } from '@terascope/core-utils';
 import * as k8s from '@kubernetes/client-node';
 import { convertToTSResource, convertToTSResourceList, getRetryConfig, isDeployment, isJob, isPod, isReplicaSet, isService, isTSPod } from './utils.js';
 export class K8s {

package/dist/src/lib/cluster/services/cluster/backends/kubernetesV2/k8sResource.js

@@ -1,4 +1,4 @@
-import { isNumber, get, set, has, isEmpty, merge } from '@terascope/utils';
+import { isNumber, get, set, has, isEmpty, merge } from '@terascope/core-utils';
 import { safeEncode } from '../../../../../utils/encoding_utils.js';
 import { setMaxOldSpaceViaEnv } from './utils.js';
 export class K8sResource {

package/dist/src/lib/cluster/services/cluster/backends/kubernetesV2/k8sState.js

@@ -1,4 +1,4 @@
-import { get, has, uniq, difference } from '@terascope/utils';
+import { get, has, uniq, difference } from '@terascope/core-utils';
 /**
  * Given the k8s Pods API output generates the appropriate Teraslice cluster
  * state.  NOTE: This assumes the pods have already been filtered to ensure they

package/dist/src/lib/cluster/services/cluster/backends/kubernetesV2/utils.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 // @ts-expect-error
 import barbe from 'barbe';
 import * as k8s from '@kubernetes/client-node';
-import { isTest } from '@terascope/utils';
+import { isTest } from '@terascope/core-utils';
 const MAX_RETRIES = isTest ? 2 : 3;
 const RETRY_DELAY = isTest ? 50 : 1000; // time in ms
 const resourcePath = path.join(process.cwd(), './packages/teraslice/src/lib/cluster/services/cluster/backends/kubernetesV2/');

package/dist/src/lib/cluster/services/cluster/backends/native/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/prefer-for-of */
-import { Queue, TSError, getFullErrorStack, pDelay, cloneDeep, debounce, pMap, orderBy, isInteger, get } from '@terascope/utils';
+import { TSError, getFullErrorStack, debounce, pDelay, cloneDeep, pMap, orderBy, isInteger, get, Queue } from '@terascope/core-utils';
 import { Dispatch } from './dispatch.js';
 import { makeLogger } from '../../../../../workers/helpers/terafoundation.js';
 import { findWorkersByExecutionID } from '../state-utils.js';

package/dist/src/lib/cluster/services/cluster/backends/native/messaging.js

@@ -1,5 +1,5 @@
 import { nanoid } from 'nanoid';
-import { pDelay, Queue, isFunction, isEmpty, get, toNumber, isKey } from '@terascope/utils';
+import { pDelay, isFunction, isEmpty, get, toNumber, isKey, Queue } from '@terascope/core-utils';
 import { io as socketIOClient } from 'socket.io-client';
 import { Server as socketIOServer } from 'socket.io';
 import { isProcessAssignment, ProcessAssignment } from '../../../../../../interfaces.js';

package/dist/src/lib/cluster/services/cluster/backends/state-utils.js

@@ -1,4 +1,4 @@
-import { cloneDeep } from '@terascope/utils';
+import { cloneDeep } from '@terascope/core-utils';
 export function iterateState(clusterState, cb) {
     // I clone here, because the code below accidentally modifies clusterState.
     // Not sure if this is the best choice.

package/dist/src/lib/cluster/services/execution.js

@@ -1,4 +1,4 @@
-import { Queue, TSError, getFullErrorStack, logError, get, withoutNil, isEmpty, multiFieldSort, isString, flatten, includes, cloneDeep } from '@terascope/utils';
+import { TSError, getFullErrorStack, get, logError, withoutNil, isEmpty, multiFieldSort, isString, flatten, includes, cloneDeep, Queue } from '@terascope/core-utils';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
 /**
  * New execution result

package/dist/src/lib/cluster/services/jobs.js

@@ -1,4 +1,4 @@
-import { TSError, uniq, cloneDeep, isEmpty, getTypeOf, isString, makeISODate, defaultsDeep } from '@terascope/utils';
+import { TSError, uniq, cloneDeep, isEmpty, getTypeOf, isString, defaultsDeep, makeISODate } from '@terascope/core-utils';
 import { JobValidator, parseName } from '@terascope/job-components';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
 import { spawnAssetLoader } from '../../workers/assets/spawn.js';

package/dist/src/lib/config/index.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { get } from '@terascope/utils';
+import { get } from '@terascope/core-utils';
 import { fileURLToPath } from 'node:url';
 import { formats } from '@terascope/job-components';
 import { configSchema } from './schemas/system.js';

package/dist/src/lib/config/schemas/system.js

@@ -1,6 +1,6 @@
 import ip from 'ip';
 import path from 'node:path';
-import { isPlainObject, isString, isArray, isInteger } from '@terascope/utils';
+import { isPlainObject, isString, isArray, isInteger } from '@terascope/core-utils';
 import { cpus } from 'node:os';
 const workerCount = cpus().length;
 const DEFAULT_ASSET_STORAGE_CONNECTION_TYPE = 'elasticsearch-next';

package/dist/src/lib/storage/analytics.js

@@ -1,4 +1,4 @@
-import { pMap } from '@terascope/utils';
+import { pMap } from '@terascope/core-utils';
 import { makeLogger } from '../workers/helpers/terafoundation.js';
 import { timeseriesIndex } from '../utils/date_utils.js';
 import { TerasliceElasticsearchStorage } from './backends/elasticsearch_store.js';

package/dist/src/lib/storage/assets.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fse from 'fs-extra';
 import crypto from 'node:crypto';
-import { TSError, uniq, isString, toString, filterObject, pDelay } from '@terascope/utils';
+import { TSError, uniq, isString, toString, filterObject, pDelay } from '@terascope/core-utils';
 import { TerasliceElasticsearchStorage } from './backends/elasticsearch_store.js';
 import { S3Store } from './backends/s3_store.js';
 import { makeLogger } from '../workers/helpers/terafoundation.js';

package/dist/src/lib/storage/backends/elasticsearch_store.js

@@ -1,5 +1,5 @@
 import ms from 'ms';
-import { TSError, parseError, isTest, pDelay, pRetry, logError, pWhile, isString, getTypeOf, get, random, isInteger } from '@terascope/utils';
+import { TSError, parseError, isTest, pDelay, pRetry, logError, pWhile, isString, getTypeOf, get, random, isInteger } from '@terascope/core-utils';
 import elasticsearchApi from '@terascope/elasticsearch-api';
 import { getClient } from '@terascope/job-components';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';

package/dist/src/lib/storage/backends/mappings/ex.js

@@ -50,6 +50,9 @@ export default {
             },
             _deleted_on: {
                 type: 'date'
+            },
+            teraslice_version: {
+                type: 'keyword'
             }
         }
     }

package/dist/src/lib/storage/backends/s3_store.js

@@ -1,4 +1,4 @@
-import { TSError, isTest, logError, pDelay, pWhile, random } from '@terascope/utils';
+import { TSError, isTest, logError, pDelay, pWhile, random } from '@terascope/core-utils';
 import { S3ClientResponse, createS3Bucket, deleteS3Object, doesBucketExist, getS3Object, listS3Objects, putS3Object, s3RequestWithRetry } from '@terascope/file-asset-apis';
 import { makeLogger } from '../../workers/helpers/terafoundation.js';
 export class S3Store {

package/dist/src/lib/storage/execution.js

@@ -1,8 +1,9 @@
-import { TSError, includes, getTypeOf, makeISODate } from '@terascope/utils';
+import { TSError, includes, getTypeOf, makeISODate } from '@terascope/core-utils';
 import { RecoveryCleanupType } from '@terascope/job-components';
 import { v4 as uuid } from 'uuid';
 import { makeLogger } from '../workers/helpers/terafoundation.js';
 import { TerasliceElasticsearchStorage } from './backends/elasticsearch_store.js';
+import { getPackageJSON } from '../utils/file_utils.js';
 const INIT_STATUS = ['pending', 'scheduling', 'initializing'];
 const RUNNING_STATUS = ['recovering', 'running', 'failing', 'paused', 'stopping'];
 const TERMINAL_STATUS = ['completed', 'stopped', 'rejected', 'failed', 'terminated'];
@@ -78,7 +79,8 @@ export class ExecutionStorage {
             _updated: date,
             _has_errors: false,
             _slicer_stats: {},
-            _failureReason: ''
+            _failureReason: '',
+            teraslice_version: `v${getPackageJSON().version}`
         });
         // @ts-expect-error
         delete doc.slicer_port;

package/dist/src/lib/storage/jobs.js

@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid';
-import { TSError, makeISODate } from '@terascope/utils';
+import { TSError, makeISODate } from '@terascope/core-utils';
 import { makeLogger } from '../workers/helpers/terafoundation.js';
 import { TerasliceElasticsearchStorage } from './backends/elasticsearch_store.js';
 export class JobsStorage {

package/dist/src/lib/storage/state.js

@@ -1,5 +1,5 @@
 import { RecoveryCleanupType } from '@terascope/job-components';
-import { TSError, pRetry, toString, isRetryableError, parseErrorInfo, isTest, times, getFullErrorStack, isKey } from '@terascope/utils';
+import { TSError, pRetry, toString, isRetryableError, parseErrorInfo, isTest, times, getFullErrorStack, isKey } from '@terascope/core-utils';
 import { timeseriesIndex } from '../utils/date_utils.js';
 import { makeLogger } from '../workers/helpers/terafoundation.js';
 import { TerasliceElasticsearchStorage } from './backends/elasticsearch_store.js';

package/dist/src/lib/utils/api_utils.js

@@ -1,5 +1,5 @@
 import Table from 'easy-table';
-import { parseErrorInfo, parseList, logError, isString, get, toInteger, TSError } from '@terascope/utils';
+import { parseErrorInfo, parseList, logError, isString, get, toInteger, TSError } from '@terascope/core-utils';
 export function makeTable(req, defaults, data, mappingFn) {
     const query = fieldsQuery(req.query, defaults);
     let emptyChar = 'N/A';

package/dist/src/lib/utils/asset_utils.js

@@ -1,4 +1,4 @@
-import { isInteger, trimStart, trim, getFirst, joinList } from '@terascope/utils';
+import { isInteger, trimStart, trim, getFirst, joinList } from '@terascope/core-utils';
 import * as semver from 'semver';
 export function findMatchingAsset(records, name, version) {
     const range = toSemverRange(version);

package/dist/src/lib/utils/date_utils.js

@@ -1,4 +1,4 @@
-import { isKey, makeISODate } from '@terascope/utils';
+import { isKey, makeISODate } from '@terascope/core-utils';
 const options = {
     year: 'y',
     years: 'y',

package/dist/src/lib/utils/encoding_utils.js

@@ -1,4 +1,4 @@
-import { isString, isObjectEntity, getTypeOf, isArrayLike } from '@terascope/utils';
+import { isString, isObjectEntity, getTypeOf, isArrayLike } from '@terascope/core-utils';
 export function safeEncode(obj) {
     let str;
     if (isString(obj)) {

package/dist/src/lib/utils/file_utils.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import fse from 'fs-extra';
 import semver from 'semver';
 import { Mutex } from 'async-mutex';
-import { TSError } from '@terascope/utils';
+import { TSError } from '@terascope/core-utils';
 import decompress from 'decompress';
 import { getMajorVersion } from './asset_utils.js';
 const mutex = new Mutex();

package/dist/src/lib/utils/id_utils.js

@@ -1,4 +1,4 @@
-import { trim, padEnd } from '@terascope/utils';
+import { trim, padEnd } from '@terascope/core-utils';
 import { customAlphabet } from 'nanoid';
 export function newId(prefix, lowerCase = false, length = 15) {
     let characters = '-0123456789abcdefghijklmnopqrstuvwxyz';

package/dist/src/lib/utils/port_utils.js

@@ -1,4 +1,4 @@
-import { get, toIntegerOrThrow, shuffle, range } from '@terascope/utils';
+import { get, toIntegerOrThrow, shuffle, range } from '@terascope/core-utils';
 import getPort from 'get-port';
 const usedPorts = [];
 /**

package/dist/src/lib/workers/assets/loader-executable.js

@@ -1,4 +1,4 @@
-import { getFullErrorStack, pDelay } from '@terascope/utils';
+import { getFullErrorStack, pDelay } from '@terascope/core-utils';
 import { fileURLToPath } from 'node:url';
 import { AssetLoader } from './loader.js';
 import { makeTerafoundationContext } from '../context/terafoundation-context.js';

package/dist/src/lib/workers/assets/loader.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { get, isEmpty } from '@terascope/utils';
+import { get, isEmpty } from '@terascope/core-utils';
 import { AssetsStorage } from '../../storage/index.js';
 import { makeLogger } from '../helpers/terafoundation.js';
 import { saveAsset } from '../../utils/file_utils.js';

package/dist/src/lib/workers/assets/spawn.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { fork } from 'node:child_process';
-import { isEmpty, get, has } from '@terascope/utils';
+import { isEmpty, get, has } from '@terascope/core-utils';
 import { makeLogger } from '../helpers/terafoundation.js';
 import { safeEncode } from '../../utils/encoding_utils.js';
 const filePath = fileURLToPath(new URL('.', import.meta.url));

package/dist/src/lib/workers/execution-controller/execution-analytics.js

@@ -1,4 +1,4 @@
-import { makeISODate, get, has } from '@terascope/utils';
+import { get, has, makeISODate } from '@terascope/core-utils';
 import { makeLogger } from '../helpers/terafoundation.js';
 /**
  * @typedef ExecutionStats

package/dist/src/lib/workers/execution-controller/index.js

@@ -1,6 +1,6 @@
 import ms from 'ms';
 import { formatURL, ExecutionController as ExController, ClusterMaster } from '@terascope/teraslice-messaging';
-import { TSError, includes, get, pDelay, getFullErrorStack, logError, pWhile, makeISODate, debounce, throttle } from '@terascope/utils';
+import { TSError, includes, get, pDelay, getFullErrorStack, logError, pWhile, debounce, throttle, makeISODate } from '@terascope/core-utils';
 import { isPromAvailable } from '@terascope/job-components';
 import { waitForWorkerShutdown } from '../helpers/worker-shutdown.js';
 import { StateStorage, ExecutionStorage, SliceState } from '../../storage/index.js';

package/dist/src/lib/workers/execution-controller/recovery.js

@@ -1,4 +1,4 @@
-import { pRaceWithTimeout, logError, Queue } from '@terascope/utils';
+import { pRaceWithTimeout, logError, Queue } from '@terascope/core-utils';
 import { makeLogger } from '../helpers/terafoundation.js';
 export class RecoveryModule {
     logger;

package/dist/src/lib/workers/execution-controller/scheduler.js

@@ -1,4 +1,4 @@
-import { Queue, noop, pDelay, get, toString, makeISODate, logError, pWhile } from '@terascope/utils';
+import { noop, pDelay, get, toString, logError, pWhile, Queue, makeISODate } from '@terascope/core-utils';
 import { RecoveryModule } from './recovery.js';
 import { makeLogger } from '../helpers/terafoundation.js';
 export class Scheduler {

package/dist/src/lib/workers/execution-controller/slice-analytics.js

@@ -1,4 +1,4 @@
-import { has, isInteger, toNumber } from '@terascope/utils';
+import { has, isInteger, toNumber } from '@terascope/core-utils';
 import { makeLogger } from '../helpers/terafoundation.js';
 // TODO: more types
 export class SliceAnalytics {

package/dist/src/lib/workers/helpers/job.js

@@ -1,4 +1,4 @@
-import { makeISODate } from '@terascope/utils';
+import { makeISODate } from '@terascope/core-utils';
 import { JobValidator } from '@terascope/job-components';
 import { JobsStorage, ExecutionStorage, StateStorage } from '../../storage/index.js';
 // TODO: fix type here

package/dist/src/lib/workers/helpers/op-analytics.js

@@ -1,4 +1,4 @@
-import { isString, isArray, truncate, } from '@terascope/utils';
+import { isString, isArray, truncate, } from '@terascope/core-utils';
 function formatVal(value) {
     if (isString(value))
         return `"${value}"`;

package/dist/src/lib/workers/helpers/terafoundation.js

@@ -1,4 +1,4 @@
-import { get, isFunction, isString } from '@terascope/utils';
+import { get, isFunction, isString } from '@terascope/core-utils';
 import { makeContextLogger } from '@terascope/job-components';
 import { safeDecode } from '../../utils/encoding_utils.js';
 export function generateWorkerId(context) {

package/dist/src/lib/workers/helpers/worker-shutdown.js

@@ -1,4 +1,4 @@
-import { get, pDelay, pRaceWithTimeout, isError, logError } from '@terascope/utils';
+import { get, pDelay, pRaceWithTimeout, isError, logError } from '@terascope/core-utils';
 import ms from 'ms';
 import { makeLogger } from './terafoundation.js';
 export function waitForWorkerShutdown(context, eventName) {

package/dist/src/lib/workers/metrics/index.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { debugLogger, isTest } from '@terascope/utils';
+import { debugLogger, isTest } from '@terascope/core-utils';
 const defaultLogger = debugLogger('metrics');
 export class Metrics extends EventEmitter {
     logger;

package/dist/src/lib/workers/worker/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-const */
-import { get, getFullErrorStack, isFatalError, logError, pWhile } from '@terascope/utils';
+import { get, getFullErrorStack, isFatalError, logError, pWhile } from '@terascope/core-utils';
 import { ExecutionController, formatURL } from '@terascope/teraslice-messaging';
 import { isPromAvailable } from '@terascope/job-components';
 import { StateStorage, AnalyticsStorage } from '../../storage/index.js';

package/dist/src/lib/workers/worker/slice.js

@@ -1,4 +1,4 @@
-import { TSError, getTypeOf, logError } from '@terascope/utils';
+import { TSError, getTypeOf, logError } from '@terascope/core-utils';
 import { SliceState } from '../../storage/index.js';
 import { makeLogger } from '../helpers/terafoundation.js';
 import { logOpStats } from '../helpers/op-analytics.js';

package/dist/test/lib/cluster/services/cluster/backends/kubernetes/v2/k8s-v2-spec.js

@@ -1,6 +1,6 @@
 import { V1Deployment, V1Job, V1Pod, V1ReplicaSet, V1Service } from '@kubernetes/client-node';
 import nock from 'nock';
-import { debugLogger } from '@terascope/job-components';
+import { debugLogger } from '@terascope/core-utils';
 import { K8s } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8s.js';
 const logger = debugLogger('k8s-v2-spec');
 const _url = 'http://mock.kube.api';

package/dist/test/lib/cluster/services/cluster/backends/kubernetes/v2/k8sResource-v2-spec.js

@@ -1,5 +1,5 @@
 import yaml from 'js-yaml';
-import { debugLogger } from '@terascope/utils';
+import { debugLogger } from '@terascope/core-utils';
 import { K8sDeploymentResource } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8sDeploymentResource.js';
 import { K8sJobResource } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8sJobResource.js';
 import { K8sServiceResource } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8sServiceResource.js';

package/dist/test/lib/cluster/services/cluster/backends/kubernetes/v2/k8sState-multicluster-v2-spec.js

@@ -1,4 +1,4 @@
-import { cloneDeep } from '@terascope/utils';
+import { cloneDeep } from '@terascope/core-utils';
 import _podsJobRunning from '../files/job-running-v1-k8s-pods-multicluster.json';
 import { gen } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8sState.js';
 describe('k8sState with pods from multiple clusters', () => {

package/dist/test/lib/cluster/services/cluster/backends/kubernetes/v2/k8sState-v2-spec.js

@@ -1,4 +1,4 @@
-import { cloneDeep } from '@terascope/utils';
+import { cloneDeep } from '@terascope/core-utils';
 import _podsJobRunning from '../files/job-running-v1-k8s-pods.json';
 import { gen } from '../../../../../../../../src/lib/cluster/services/cluster/backends/kubernetesV2/k8sState.js';
 describe('k8sState', () => {

package/dist/test/node_master-spec.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { debugLogger } from '@terascope/utils';
+import { debugLogger } from '@terascope/core-utils';
 import { Server as SocketServer } from 'socket.io';
 import { nodeMaster } from '../src/lib/cluster/node_master.js';
 process.env.assignment = 'node_master';

package/dist/test/services/messaging-spec.js

@@ -1,6 +1,6 @@
 import { jest } from '@jest/globals';
 import events from 'node:events';
-import { debugLogger } from '@terascope/utils';
+import { debugLogger } from '@terascope/core-utils';
 import { Messaging, routing } from '../../src/lib/cluster/services/cluster/backends/native/messaging.js';
 describe('messaging module', () => {
     const logger = debugLogger('messaging');

package/dist/test/workers/execution-controller/execution-controller-spec.js

@@ -1,5 +1,5 @@
 import { jest } from '@jest/globals';
-import { pDelay, get, set } from '@terascope/utils';
+import { pDelay, get, set } from '@terascope/core-utils';
 import { TestContext } from '../helpers/index.js';
 import { findPort } from '../../../src/lib/utils/port_utils.js';
 import { ExecutionController } from '../../../src/lib/workers/execution-controller/index.js';

package/dist/test/workers/execution-controller/execution-special-test-cases-spec.js

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { pDelay, times, random } from '@terascope/utils';
+import { pDelay, times, random } from '@terascope/core-utils';
 import { RecoveryCleanupType } from '@terascope/job-components';
 import { ExecutionController as ExController } from '@terascope/teraslice-messaging';
 import { TestContext } from '../helpers/index.js';

package/dist/test/workers/execution-controller/execution-test-cases-spec.js

@@ -1,9 +1,10 @@
-import { pDelay, times, random, isNotNil } from '@terascope/utils';
+import { pDelay, times, random, isNotNil } from '@terascope/core-utils';
 import { ExecutionController as ExController } from '@terascope/teraslice-messaging';
 import { TestContext } from '../helpers/index.js';
 import { getTestCases } from '../helpers/execution-controller-helper.js';
 import { findPort } from '../../../src/lib/utils/port_utils.js';
 import { newId } from '../../../src/lib/utils/id_utils.js';
+import { getPackageJSON } from '../../../src/lib/utils/file_utils.js';
 import { ExecutionController } from '../../../src/lib/workers/execution-controller/index.js';
 const ExecutionControllerClient = ExController.Client;
 describe('ExecutionController Test Cases', () => {
@@ -333,6 +334,10 @@ describe('ExecutionController Test Cases', () => {
             const metadata = updateMetadata ? { slice_calls: count + 1 } : {};
             expect(executionRecord).toHaveProperty('metadata', metadata);
         });
+        it('should have the correct teraslice version', () => {
+            const terasliceVersion = `v${getPackageJSON().version}`;
+            expect(executionRecord.teraslice_version).toBe(terasliceVersion);
+        });
     });
 });
 //# sourceMappingURL=execution-test-cases-spec.js.map

package/dist/test/workers/execution-controller/recovery-spec.js

@@ -1,4 +1,4 @@
-import { pDelay, pWhile, debugLogger } from '@terascope/utils';
+import { pDelay, pWhile, debugLogger } from '@terascope/core-utils';
 import { EventEmitter } from 'node:events';
 import { RecoveryModule } from '../../../src/lib/workers/execution-controller/recovery.js';
 const eventEmitter = new EventEmitter();

package/dist/test/workers/execution-controller/scheduler-spec.js

@@ -1,6 +1,6 @@
 import { jest } from '@jest/globals';
 import { v4 as uuidv4 } from 'uuid';
-import { pDelay, once, times } from '@terascope/utils';
+import { pDelay, once, times } from '@terascope/core-utils';
 import { TestContext } from '../helpers/test-context.js';
 import { Scheduler } from '../../../src/lib/workers/execution-controller/scheduler.js';
 describe('Scheduler', () => {

package/dist/test/workers/fixtures/ops/example-reader/slicer.js

@@ -1,5 +1,5 @@
 import { ParallelSlicer } from '@terascope/job-components';
-import { get } from '@terascope/utils';
+import { get } from '@terascope/core-utils';
 const defaultSlicerResults = [{ howdy: true }, null];
 export default class ExampleSlicer extends ParallelSlicer {
     async newSlicer(_id) {

package/dist/test/workers/fixtures/ops/new-reader/slicer.js

@@ -1,5 +1,5 @@
 import { ParallelSlicer } from '@terascope/job-components';
-import { pDelay, times } from '@terascope/utils';
+import { pDelay, times } from '@terascope/core-utils';
 export default class ExampleSlicer extends ParallelSlicer {
     async newSlicer(id) {
         const { countPerSlicer } = this.opConfig;

package/dist/test/workers/helpers/configs.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { withoutNil } from '@terascope/utils';
+import { withoutNil } from '@terascope/core-utils';
 // @ts-expect-error
 import Chance from 'chance';
 import { newId } from '../../../src/lib/utils/id_utils.js';

package/dist/test/workers/helpers/execution-controller-helper.js

@@ -1,4 +1,4 @@
-import { pDelay, pDefer } from '@terascope/utils';
+import { pDelay, pDefer } from '@terascope/core-utils';
 export function makeShutdownEarlyFn({ exController, enabled = false }) {
     let shutdownErr = {
         message: 'Shutdown never triggered'

package/dist/test/workers/helpers/test-context.js

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import path from 'node:path';
 import { createTempDirSync, cleanupTempDirs } from 'jest-fixtures';
 import { newTestSlice } from '@terascope/job-components';
-import { get, pWhile } from '@terascope/utils';
+import { get, pWhile } from '@terascope/core-utils';
 import { ClusterMaster } from '@terascope/teraslice-messaging';
 import { AssetsStorage, StateStorage, AnalyticsStorage, ExecutionStorage, JobsStorage } from '../../../src/lib/storage/index.js';
 import { initializeTestExecution } from '../../../src/lib/workers/helpers/job.js';

package/dist/test/workers/helpers/zip-directory.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { random } from '@terascope/utils';
+import { random } from '@terascope/core-utils';
 // @ts-expect-error
 import BufferStreams from 'bufferstreams';
 import archiver from 'archiver';

package/dist/test/workers/worker/slice-spec.js

@@ -1,5 +1,5 @@
 import { jest } from '@jest/globals';
-import { times } from '@terascope/utils';
+import { times } from '@terascope/core-utils';
 import { SliceExecution } from '../../../src/lib/workers/worker/slice.js';
 import { TestContext } from '../helpers/index.js';
 describe('Slice', () => {

package/dist/test/workers/worker/worker-spec.js

@@ -1,6 +1,6 @@
 import { jest } from '@jest/globals';
 import 'jest-extended';
-import { pDelay } from '@terascope/utils';
+import { pDelay } from '@terascope/core-utils';
 import { ExecutionController } from '@terascope/teraslice-messaging';
 import { findPort } from '../../../src/lib/utils/port_utils.js';
 import { Worker } from '../../../src/lib/workers/worker/index.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "teraslice",
   "displayName": "Teraslice",
-  "version": "3.0.0-dev.7",
+  "version": "3.0.0-dev.9",
   "description": "Distributed computing platform for processing JSON data",
   "homepage": "https://github.com/terascope/teraslice#readme",
   "bugs": {
@@ -39,11 +39,11 @@
   },
   "dependencies": {
     "@kubernetes/client-node": "~1.3.0",
-    "@terascope/elasticsearch-api": "~5.0.0-dev.6",
-    "@terascope/job-components": "~2.0.0-dev.6",
-    "@terascope/teraslice-messaging": "~2.0.0-dev.7",
-    "@terascope/types": "~2.0.0-dev.6",
-    "@terascope/utils": "~2.0.0-dev.6",
+    "@terascope/core-utils": "~2.0.0-dev.8",
+    "@terascope/elasticsearch-api": "~5.0.0-dev.8",
+    "@terascope/job-components": "~2.0.0-dev.8",
+    "@terascope/teraslice-messaging": "~2.0.0-dev.9",
+    "@terascope/types": "~2.0.0-dev.7",
     "async-mutex": "~0.5.0",
     "barbe": "~3.0.17",
     "body-parser": "~2.2.0",
@@ -61,11 +61,11 @@
     "semver": "~7.7.2",
     "socket.io": "~4.8.1",
     "socket.io-client": "~4.8.1",
-    "terafoundation": "~2.0.0-dev.6",
+    "terafoundation": "~2.0.0-dev.8",
     "uuid": "~13.0.0"
   },
   "devDependencies": {
-    "@terascope/opensearch-client": "~2.0.0-dev.6",
+    "@terascope/opensearch-client": "~2.0.0-dev.8",
     "@types/archiver": "~6.0.3",
     "@types/express": "~5.0.3",
     "@types/gc-stats": "~1.4.3",

package/worker-service.js

@@ -1,6 +1,6 @@
 import {
     logError, get, isEmpty, isPlainObject
-} from '@terascope/utils';
+} from '@terascope/core-utils';
 import { shutdownHandler } from './dist/src/lib/workers/helpers/worker-shutdown.js';
 import { safeDecode } from './dist/src/lib/utils/encoding_utils.js';
 import { makeExecutionContext } from './dist/src/lib/workers/context/execution-context.js';