From 00ec9452b33a7fece3a189746eab7fbaad4f7bfb Mon Sep 17 00:00:00 2001 From: Joseph Soto Date: Fri, 30 Aug 2024 15:39:35 -0700 Subject: [PATCH] Fix file extension in data mate and minio in scripts (#3737) This PR makes the following changes: - Reverts a fix that allowed the default minio version `RELEASE.2022-06-11T19-55-32Z` to work - This was related to an issue with minio that was later fixed in `RELEASE.2022-09-22T18-57-27Z` - https://github.com/minio/minio/issues/15733 - https://github.com/terascope/teraslice/pull/3708 - Updates default minio to `RELEASE.2022-09-22T18-57-27Z` - Fixes file extension in `data-mate` - Bumps the following packages: - **@terascope/scripts** from `v1.0.1` to `v1.0.2` - **@terascope/data-mate** from `v1.0.3` to `v1.0.4` - **elasticsearch-store** from `v1.0.3` to `v1.0.4` - **terafoundation** from `v1.2.3` to `v1.2.4` - **ts-transforms** from `v1.0.3` to `v1.0.4` --- e2e/package.json | 2 +- packages/data-mate/package.json | 2 +- packages/data-mate/src/index.ts | 2 +- packages/elasticsearch-api/package.json | 2 +- packages/elasticsearch-store/package.json | 4 ++-- packages/scripts/package.json | 2 +- packages/scripts/src/helpers/config.ts | 6 +----- .../scripts/src/helpers/test-runner/services.ts | 14 +++++--------- packages/terafoundation/package.json | 4 ++-- packages/teraslice/package.json | 2 +- packages/ts-transforms/package.json | 4 ++-- 11 files changed, 18 insertions(+), 26 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index a085d3d5206..e304bf3a6a7 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@terascope/types": "^1.0.0", "bunyan": "^1.8.15", - "elasticsearch-store": "^1.0.3", + "elasticsearch-store": "^1.0.4", "fs-extra": "^11.2.0", "ms": "^2.1.3", "nanoid": "^3.3.4", diff --git a/packages/data-mate/package.json b/packages/data-mate/package.json index 66423809c24..26dbd584c12 100644 --- a/packages/data-mate/package.json +++ b/packages/data-mate/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/data-mate", "displayName": "Data-Mate", - "version": "1.0.3", + "version": "1.0.4", "description": "Library of data validations/transformations", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-mate#readme", "repository": { diff --git a/packages/data-mate/src/index.ts b/packages/data-mate/src/index.ts index 57eb0166500..ea89343d350 100644 --- a/packages/data-mate/src/index.ts +++ b/packages/data-mate/src/index.ts @@ -22,7 +22,7 @@ const RecordTransform = { RecordTransform.repository.transformRecord = transformRecordConfig; RecordTransform.transformRecord = transformRecord; -declare module './aggregation-frame/AggregationFrame' { +declare module './aggregation-frame/AggregationFrame.d.ts' { interface AggregationFrame> { /** * Run aggregations and flatten the grouped data into a DataFrame diff --git a/packages/elasticsearch-api/package.json b/packages/elasticsearch-api/package.json index 7ee8541b546..cb45c3b6765 100644 --- a/packages/elasticsearch-api/package.json +++ b/packages/elasticsearch-api/package.json @@ -33,7 +33,7 @@ "@opensearch-project/opensearch": "^1.2.0", "@types/elasticsearch": "^5.0.43", "elasticsearch": "^15.4.1", - "elasticsearch-store": "^1.0.3", + "elasticsearch-store": "^1.0.4", "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0", "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0", "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0" diff --git a/packages/elasticsearch-store/package.json b/packages/elasticsearch-store/package.json index a041c04e13d..3d2255b6269 100644 --- a/packages/elasticsearch-store/package.json +++ b/packages/elasticsearch-store/package.json @@ -1,7 +1,7 @@ { "name": "elasticsearch-store", "displayName": "Elasticsearch Store", - "version": "1.0.3", + "version": "1.0.4", "description": "An API for managing an elasticsearch index, with versioning and migration support.", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-store#readme", "bugs": { @@ -30,7 +30,7 @@ "test:watch": "ts-scripts test --watch . --" }, "dependencies": { - "@terascope/data-mate": "^1.0.3", + "@terascope/data-mate": "^1.0.4", "@terascope/data-types": "^1.0.0", "@terascope/types": "^1.0.0", "@terascope/utils": "^1.0.0", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index f1e6c46a616..a014690f7bb 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/scripts", "displayName": "Scripts", - "version": "1.0.1", + "version": "1.0.2", "description": "A collection of terascope monorepo scripts", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/scripts#readme", "bugs": { diff --git a/packages/scripts/src/helpers/config.ts b/packages/scripts/src/helpers/config.ts index 8375a26a25a..63416ea6d7e 100644 --- a/packages/scripts/src/helpers/config.ts +++ b/packages/scripts/src/helpers/config.ts @@ -1,7 +1,4 @@ import ipPkg from 'ip'; -import fs from 'node:fs'; -import os from 'node:os'; -import path from 'node:path'; import { toBoolean, toSafeString, isCI, toIntegerOrThrow } from '@terascope/utils'; @@ -71,11 +68,10 @@ export const MINIO_HOSTNAME = process.env.MINIO_HOSTNAME || HOST_IP; export const MINIO_PORT = process.env.MINIO_PORT || '49000'; export const ENCRYPT_MINIO = toBoolean(process.env.ENCRYPT_MINIO ?? false); export const MINIO_HOST = `http${ENCRYPT_MINIO ? 's' : ''}://${MINIO_HOSTNAME}:${MINIO_PORT}`; -export const MINIO_VERSION = process.env.MINIO_VERSION || 'RELEASE.2022-06-11T19-55-32Z'; +export const MINIO_VERSION = process.env.MINIO_VERSION || 'RELEASE.2022-09-22T18-57-27Z'; export const MINIO_DOCKER_IMAGE = process.env.MINIO_DOCKER_IMAGE || 'minio/minio'; export const MINIO_ACCESS_KEY = process.env.MINIO_ACCESS_KEY || 'minioadmin'; export const MINIO_SECRET_KEY = process.env.MINIO_SECRET_KEY || 'minioadmin'; -export const MINIO_VOLUME = fs.mkdtempSync(path.join(os.tmpdir(), 'ts-minio')); export const RABBITMQ_VERSION = process.env.RABBITMQ_VERSION || '3.8.16-management-alpine'; export const RABBITMQ_DOCKER_IMAGE = process.env.RABBITMQ_DOCKER_IMAGE || 'rabbitmq'; diff --git a/packages/scripts/src/helpers/test-runner/services.ts b/packages/scripts/src/helpers/test-runner/services.ts index 6b3db1dfbce..fc9f79ce052 100644 --- a/packages/scripts/src/helpers/test-runner/services.ts +++ b/packages/scripts/src/helpers/test-runner/services.ts @@ -129,17 +129,13 @@ const services: Readonly>> = { [Service.Minio]: { image: config.MINIO_DOCKER_IMAGE, name: `${config.TEST_NAMESPACE}_${config.MINIO_NAME}`, - /// We will be able to go back and use this on a later version of minio - /// Minio issue ref: https://github.com/minio/minio/issues/15733 - // tmpfs: config.SERVICES_USE_TMPFS - // ? ['/data'] - // : undefined, + tmpfs: config.SERVICES_USE_TMPFS + ? ['/data'] + : undefined, ports: [`${config.MINIO_PORT}:${config.MINIO_PORT}`], mount: config.ENCRYPT_MINIO - ? [`type=bind,source=${path.join(getRootDir(), '/e2e/test/certs')},target=/opt/certs`, - `type=bind,source=${config.MINIO_VOLUME},target=/data` - ] - : [`type=bind,source=${config.MINIO_VOLUME},target=/data`], + ? [`type=bind,source=${path.join(getRootDir(), '/e2e/test/certs')},target=/opt/certs`] + : [], env: { MINIO_ACCESS_KEY: config.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: config.MINIO_SECRET_KEY, diff --git a/packages/terafoundation/package.json b/packages/terafoundation/package.json index fddc6dee525..4e1bb7a824d 100644 --- a/packages/terafoundation/package.json +++ b/packages/terafoundation/package.json @@ -1,7 +1,7 @@ { "name": "terafoundation", "displayName": "Terafoundation", - "version": "1.2.3", + "version": "1.2.4", "description": "A Clustering and Foundation tool for Terascope Tools", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/terafoundation#readme", "bugs": { @@ -37,7 +37,7 @@ "convict-format-with-moment": "^6.2.0", "convict-format-with-validator": "^6.2.0", "elasticsearch": "^15.4.1", - "elasticsearch-store": "^1.0.3", + "elasticsearch-store": "^1.0.4", "express": "^4.19.2", "js-yaml": "^4.1.0", "nanoid": "^3.3.4", diff --git a/packages/teraslice/package.json b/packages/teraslice/package.json index 9a03ee946fb..aca2c49d82c 100644 --- a/packages/teraslice/package.json +++ b/packages/teraslice/package.json @@ -64,7 +64,7 @@ "semver": "^7.6.3", "socket.io": "^1.7.4", "socket.io-client": "^1.7.4", - "terafoundation": "^1.2.3", + "terafoundation": "^1.2.4", "uuid": "^9.0.1" }, "devDependencies": { diff --git a/packages/ts-transforms/package.json b/packages/ts-transforms/package.json index ddffb3b3b47..05d230c1527 100644 --- a/packages/ts-transforms/package.json +++ b/packages/ts-transforms/package.json @@ -1,7 +1,7 @@ { "name": "ts-transforms", "displayName": "TS Transforms", - "version": "1.0.3", + "version": "1.0.4", "description": "An ETL framework built upon xlucene-evaluator", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/ts-transforms#readme", "bugs": { @@ -36,7 +36,7 @@ "test:watch": "ts-scripts test --watch . --" }, "dependencies": { - "@terascope/data-mate": "^1.0.3", + "@terascope/data-mate": "^1.0.4", "@terascope/types": "^1.0.0", "@terascope/utils": "^1.0.0", "awesome-phonenumber": "^2.70.0",