Skip to content

Commit

Permalink
[teraslice] Dependency updates 2024-09-19 (#3763)
Browse files Browse the repository at this point in the history
This PR makes the following changes:
- New dependency:
  - ajv-formats@^3.0.1 - ajv no longer includes formats by default

- `dependabot.yml` ignore field updated to remove dependencies that were
newer than the version being ignored and dependencies that have been
removed.

- Dependency updates:

| Package | From | To |
| ------------- | -------- | ------------- |
| @kubernetes/client-node | 0.21.0 | 0.22.0 |
| @types/diff | 5.2.1 | 5.2.2 |
| @types/jest | 29.5.12 | 29.5.13 |
| @types/uuid | 9.0.8 | 10.0.0 |
| @types/validator | 13.11.10 | 13.12.2 |
| ajv | 6.12.6 | 8.17.1 |
| auto-bind | 4.0.0 | 5.0.1 |
| chalk | 4.1.2 | 5.3.0 |
| debug | 4.3.6 | 4.3.7 |
| diff | 5.2.0 | 7.0.0 |
| express | 4.20.0 | 4.21.0 |
| geo-tz | 7.0.7 | 8.1.1 |
| ip-cidr | 3.1.0 | 4.0.2 |
| is-cidr | 4.0.2 | 5.1.0 |
| latlon-geohash | 1.1.0 | 2.0.0 |
| nanoid | 3.3.4 | 5.0.7 |
| p-event | 4.2.0 | 6.0.1 |
| p-map | 4.0.0 | 7.0.2 |
| package-json | 7.0.0 | 10.0.1 |
| pkg-up |3.1.0 | [email protected] (name change) |
| pretty-bites | 5.6.0 | 6.1.1 |
| sort-package-json | 1.57.0 | 2.10.1 |
| uuid | 9.0.1 | 10.0.0 |
  • Loading branch information
busma13 authored Sep 30, 2024
1 parent ef00edf commit 082345c
Show file tree
Hide file tree
Showing 30 changed files with 377 additions and 332 deletions.
39 changes: 0 additions & 39 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,9 @@ updates:
- sotojn
- busma13
ignore:
- dependency-name: aws-sdk
versions:
- '> 2.885.0'
- dependency-name: convict
versions:
- '> 4.4.1'
- dependency-name: convict
versions:
- '>= 5.a, < 6'
- dependency-name: '@types/convict'
versions:
- '>= 6'
- dependency-name: elasticsearch
versions:
- '> 15.5.0'
- dependency-name: kubernetes-client
versions:
- '>= 8.2.a, < 8.3'
- dependency-name: mongoose
versions:
- '> 5.11.20'
- dependency-name: socket.io
versions:
- '> 1.7.4'
Expand All @@ -47,27 +29,6 @@ updates:
- dependency-name: '@types/socket.io-client'
versions:
- 1.4.36
- dependency-name: sort-package-json
versions:
- '>= 1.42.a, < 1.43'
- dependency-name: tty-table
versions:
- '>= 3.a, < 4'
- dependency-name: redis
versions:
- '>= 3'
- dependency-name: mongoose
versions:
- '>= 5'
- dependency-name: graphql
versions:
- '>= 15'
- dependency-name: typedoc
versions:
- '>= 0.21.9'
- dependency-name: '@types/node'
versions:
- '>= 17.0.0'
- package-ecosystem: npm
directory: '/website'
schedule:
Expand Down
6 changes: 3 additions & 3 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
"devDependencies": {
"@terascope/types": "^1.1.0",
"bunyan": "^1.8.15",
"elasticsearch-store": "^1.1.1",
"elasticsearch-store": "^1.2.0",
"fs-extra": "^11.2.0",
"ms": "^2.1.3",
"nanoid": "^3.3.4",
"nanoid": "^5.0.7",
"semver": "^7.6.3",
"signale": "^1.4.0",
"uuid": "^9.0.1"
"uuid": "^10.0.0"
},
"engines": {
"node": ">=18.18.0",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "teraslice-workspace",
"displayName": "Teraslice",
"version": "2.3.2",
"version": "2.4.0",
"private": true,
"homepage": "https://github.com/terascope/teraslice",
"bugs": {
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"resolutions": {
"@types/lodash": "^4.17.7",
"debug": "^4.3.6",
"debug": "^4.3.7",
"ms": "^2.1.3",
"nan": "^2.19.0"
},
Expand All @@ -55,13 +55,13 @@
"@types/convict": "^6.1.6",
"@types/elasticsearch": "^5.0.43",
"@types/fs-extra": "^11.0.4",
"@types/jest": "^29.5.12",
"@types/jest": "^29.5.13",
"@types/lodash": "^4.17.7",
"@types/node": "^18.14.2",
"@types/uuid": "^9.0.8",
"@types/uuid": "^10.0.0",
"eslint": "^9.10.0",
"jest": "^29.7.0",
"jest-extended": "^3.2.4",
"jest-extended": "^4.0.2",
"jest-watch-typeahead": "^2.2.2",
"node-notifier": "^10.0.1",
"ts-jest": "^29.2.5",
Expand Down
16 changes: 8 additions & 8 deletions packages/data-mate/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/data-mate",
"displayName": "Data-Mate",
"version": "1.1.1",
"version": "1.2.0",
"description": "Library of data validations/transformations",
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-mate#readme",
"repository": {
Expand Down Expand Up @@ -30,28 +30,28 @@
"test:watch": "ts-scripts test --watch . --"
},
"dependencies": {
"@terascope/data-types": "^1.1.1",
"@terascope/data-types": "^1.2.0",
"@terascope/types": "^1.1.0",
"@terascope/utils": "^1.1.0",
"@types/validator": "^13.11.10",
"@terascope/utils": "^1.2.0",
"@types/validator": "^13.12.2",
"awesome-phonenumber": "^2.70.0",
"date-fns": "^2.30.0",
"ip-bigint": "^3.0.3",
"ip6addr": "^0.2.5",
"ipaddr.js": "^2.2.0",
"is-cidr": "^4.0.2",
"is-cidr": "^5.1.0",
"is-ip": "^5.0.1",
"jexl": "^2.2.2",
"lodash": "^4.17.21",
"mnemonist": "^0.39.8",
"uuid": "^9.0.1",
"uuid": "^10.0.0",
"valid-url": "^1.0.9",
"validator": "^13.12.0",
"xlucene-parser": "^1.1.0"
"xlucene-parser": "^1.2.0"
},
"devDependencies": {
"@types/ip6addr": "^0.2.6",
"@types/uuid": "^9.0.8",
"@types/uuid": "^10.0.0",
"benchmark": "^2.1.4",
"chance": "^1.1.12",
"lodash": "^4.17.21"
Expand Down
4 changes: 2 additions & 2 deletions packages/data-types/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/data-types",
"displayName": "Data Types",
"version": "1.1.1",
"version": "1.2.0",
"description": "A library for defining the data structures and mapping",
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-types#readme",
"bugs": {
Expand All @@ -28,7 +28,7 @@
},
"dependencies": {
"@terascope/types": "^1.1.0",
"@terascope/utils": "^1.1.0",
"@terascope/utils": "^1.2.0",
"graphql": "^16.9.0",
"lodash": "^4.17.21",
"yargs": "^17.7.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/docker-compose-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/docker-compose-js",
"displayName": "Docker Compose Js",
"version": "1.3.3",
"version": "1.4.0",
"description": "Node.js driver for controlling docker-compose testing environments.",
"keywords": [
"docker",
Expand Down Expand Up @@ -33,10 +33,10 @@
"test:watch": "ts-scripts test --watch . --"
},
"resolutions": {
"debug": "^4.3.6"
"debug": "^4.3.7"
},
"dependencies": {
"debug": "^4.3.6"
"debug": "^4.3.7"
},
"engines": {
"node": ">=18.18.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/elasticsearch-api/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/elasticsearch-api",
"displayName": "Elasticsearch API",
"version": "4.1.0",
"version": "4.2.0",
"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": {
Expand All @@ -25,15 +25,15 @@
},
"dependencies": {
"@terascope/types": "^1.1.0",
"@terascope/utils": "^1.1.0",
"@terascope/utils": "^1.2.0",
"bluebird": "^3.7.2",
"setimmediate": "^1.0.5"
},
"devDependencies": {
"@opensearch-project/opensearch": "^1.2.0",
"@types/elasticsearch": "^5.0.43",
"elasticsearch": "^15.4.1",
"elasticsearch-store": "^1.1.1",
"elasticsearch-store": "^1.2.0",
"elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
"elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
"elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0"
Expand Down
17 changes: 9 additions & 8 deletions packages/elasticsearch-store/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elasticsearch-store",
"displayName": "Elasticsearch Store",
"version": "1.1.1",
"version": "1.2.0",
"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": {
Expand Down Expand Up @@ -30,22 +30,23 @@
"test:watch": "ts-scripts test --watch . --"
},
"dependencies": {
"@terascope/data-mate": "^1.1.1",
"@terascope/data-types": "^1.1.1",
"@terascope/data-mate": "^1.2.0",
"@terascope/data-types": "^1.2.0",
"@terascope/types": "^1.1.0",
"@terascope/utils": "^1.1.0",
"ajv": "^6.12.6",
"@terascope/utils": "^1.2.0",
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
"elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
"elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0",
"opensearch1": "npm:@opensearch-project/opensearch@^1.2.0",
"opensearch2": "npm:@opensearch-project/opensearch@^2.2.1",
"setimmediate": "^1.0.5",
"uuid": "^9.0.1",
"xlucene-translator": "^1.1.0"
"uuid": "^10.0.0",
"xlucene-translator": "^1.2.0"
},
"devDependencies": {
"@types/uuid": "^9.0.8"
"@types/uuid": "^10.0.0"
},
"engines": {
"node": ">=18.18.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/elasticsearch-store/src/utils/errors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TSError, isString, get } from '@terascope/utils';
import ajv from 'ajv';
import { ErrorObject } from 'ajv';

export function getErrorMessages(errors: ErrorLike[]): string {
return errors.filter(Boolean).map(getErrorMessage)
Expand Down Expand Up @@ -43,5 +43,5 @@ export type ErrorLike =
statusCode?: number;
status?: number;
}
| ajv.ErrorObject
| ErrorObject
| string;
3 changes: 2 additions & 1 deletion packages/elasticsearch-store/src/utils/validation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ajv from 'ajv';
import addFormats from 'ajv-formats';
import {
isString, TSError, uniq,
castArray, Logger, getTypeOf,
Expand Down Expand Up @@ -47,7 +48,6 @@ export function makeDataValidator(
} = dataSchema;
const ajv = new Ajv({
useDefaults: true,
format: allFormatters ? 'full' : 'fast',
allErrors: true,
coerceTypes: true,
logger: {
Expand All @@ -56,6 +56,7 @@ export function makeDataValidator(
error: logger.warn,
},
});
addFormats(ajv, { mode: allFormatters ? 'full' : 'fast' });
const validate = ajv.compile(schema);

return (input: any, critical: boolean) => {
Expand Down
6 changes: 3 additions & 3 deletions packages/job-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/job-components",
"displayName": "Job Components",
"version": "1.3.1",
"version": "1.4.0",
"description": "A teraslice library for validating jobs schemas, registering apis, and defining and running new Job APIs",
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/job-components#readme",
"bugs": {
Expand Down Expand Up @@ -33,14 +33,14 @@
},
"dependencies": {
"@terascope/types": "^1.1.0",
"@terascope/utils": "^1.1.0",
"@terascope/utils": "^1.2.0",
"convict": "^6.2.4",
"convict-format-with-moment": "^6.2.0",
"convict-format-with-validator": "^6.2.0",
"datemath-parser": "^1.0.6",
"import-meta-resolve": "^4.0.0",
"prom-client": "^15.1.3",
"uuid": "^9.0.1"
"uuid": "^10.0.0"
},
"devDependencies": {
"benchmark": "^2.1.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@terascope/scripts",
"displayName": "Scripts",
"version": "1.1.2",
"version": "1.2.0",
"description": "A collection of terascope monorepo scripts",
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/scripts#readme",
"bugs": {
Expand Down Expand Up @@ -32,8 +32,8 @@
"typescript": "~5.2.2"
},
"dependencies": {
"@kubernetes/client-node": "^0.21.0",
"@terascope/utils": "^1.1.0",
"@kubernetes/client-node": "^0.22.0",
"@terascope/utils": "^1.2.0",
"codecov": "^3.8.3",
"execa": "9.4.0",
"fs-extra": "^11.2.0",
Expand All @@ -46,11 +46,11 @@
"micromatch": "^4.0.8",
"mnemonist": "^0.39.8",
"ms": "^2.1.3",
"package-json": "^7.0.0",
"pkg-up": "^3.1.0",
"package-json": "^10.0.1",
"package-up": "^5.0.0",
"semver": "^7.6.3",
"signale": "^1.4.0",
"sort-package-json": "~1.57.0",
"sort-package-json": "~2.10.1",
"toposort": "^2.0.2",
"typedoc": "^0.25.13",
"typedoc-plugin-markdown": "~4.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/scripts/src/helpers/misc.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'node:path';
import pkgUp from 'pkg-up';
import { packageUpSync } from 'package-up';
import fse from 'fs-extra';
import lodash from 'lodash';
import { isPlainObject, get, toTitleCase } from '@terascope/utils';
Expand All @@ -18,7 +18,7 @@ let rootDir: string | undefined;
export function getRootDir(cwd: string = process.cwd()): string {
if (rootDir) return rootDir;

const rootPkgJSON = pkgUp.sync({ cwd });
const rootPkgJSON = packageUpSync({ cwd });

if (!rootPkgJSON) {
throw new Error(`Unable to find root directory, run in the root of the repo. cwd is ${cwd}, rootPkgJSON is ${rootPkgJSON}`);
Expand Down
6 changes: 3 additions & 3 deletions packages/scripts/src/helpers/packages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import toposort from 'toposort';
// import MultiMap from 'mnemonist/multi-map'
import mem from 'mnemonist';

import packageJson from 'package-json';
import packageJson, { PackageNotFoundError, VersionNotFoundError } from 'package-json';
import sortPackageJson from 'sort-package-json';
import {
getRootDir, getRootInfo, getName,
Expand Down Expand Up @@ -331,7 +331,7 @@ export async function getRemotePackageVersion(
});
return version as string;
} catch (err) {
if (err instanceof packageJson.VersionNotFoundError) {
if (err instanceof VersionNotFoundError) {
if (tag === 'prerelease') {
// this will happen if there has never been a prerelease
// for this package, so lets check the latest so we
Expand All @@ -340,7 +340,7 @@ export async function getRemotePackageVersion(
}
return pkgInfo.version;
}
if (err instanceof packageJson.PackageNotFoundError) {
if (err instanceof PackageNotFoundError) {
return '0.1.0';
}
throw err;
Expand Down
Loading

0 comments on commit 082345c

Please sign in to comment.