Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sotojn committed Oct 10, 2023
1 parent f37b261 commit e04e571
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 84 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@types/jest": "^29.5.4",
"@types/node": "^18.14.2",
"elasticsearch": "^15.4.1",
"elasticsearch-store": "^0.67.3",
"elasticsearch-store": "^0.72.0",
"eslint": "^8.45.0",
"jest": "^29.6.4",
"jest-extended": "^4.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/elasticsearch-asset-apis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@
},
"dependencies": {
"@terascope/data-mate": "^0.47.0",
"@terascope/data-types": "^0.37.0",
"@terascope/data-types": "^0.42.0",
"@terascope/elasticsearch-api": "^3.11.0",
"@terascope/utils": "^0.46.0",
"datemath-parser": "^1.0.6",
"got": "^11.8.3",
"moment": "^2.29.4"
},
"devDependencies": {
"@terascope/data-types": "^0.42.0",
"@types/elasticsearch": "^5.0.40",
"elasticsearch": "^15.4.1"
},
Expand Down
155 changes: 73 additions & 82 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,11 @@
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.21.0":
version "7.22.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
version "7.23.1"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d"
integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==
dependencies:
regenerator-runtime "^0.13.11"
regenerator-runtime "^0.14.0"

"@babel/template@^7.22.15", "@babel/template@^7.3.3":
version "7.22.15"
Expand Down Expand Up @@ -699,30 +699,6 @@
dependencies:
defer-to-connect "^2.0.0"

"@terascope/data-mate@^0.42.0":
version "0.42.0"
resolved "https://registry.yarnpkg.com/@terascope/data-mate/-/data-mate-0.42.0.tgz#40ab7460436e9f3663784d96c8a77da24ee28f9a"
integrity sha512-ipdMVGK1+8RgUUXooUWA2b1thzgCV6JjQXUnkiAz8LO+VUqKBLR/9aqGbXDH3N4J/hWPTn0ctvcDYhv7VgDYhQ==
dependencies:
"@terascope/data-types" "^0.37.0"
"@terascope/types" "^0.11.2"
"@terascope/utils" "^0.46.0"
"@types/validator" "^13.7.17"
awesome-phonenumber "^2.70.0"
date-fns "^2.30.0"
ip-bigint "^3.0.3"
ip6addr "^0.2.5"
ipaddr.js "^2.0.1"
is-cidr "^4.0.2"
is-ip "^3.1.0"
jexl "^2.2.2"
lodash "^4.17.21"
mnemonist "^0.39.5"
uuid "^9.0.0"
valid-url "^1.0.9"
validator "^13.9.0"
xlucene-parser "^0.45.0"

"@terascope/data-mate@^0.47.0":
version "0.47.0"
resolved "https://registry.yarnpkg.com/@terascope/data-mate/-/data-mate-0.47.0.tgz#b6c58799c8960912ccb72d5ee756560859edb635"
Expand Down Expand Up @@ -1298,9 +1274,9 @@
"@types/node" "*"

"@types/lodash@^4.14.195":
version "4.14.196"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95"
integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==
version "4.14.199"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.199.tgz#c3edb5650149d847a277a8961a7ad360c474e9bf"
integrity sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==

"@types/minimatch@*":
version "5.1.2"
Expand Down Expand Up @@ -1335,9 +1311,9 @@
integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==

"@types/validator@^13.7.17":
version "13.7.17"
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.17.tgz#0a6d1510395065171e3378a4afc587a3aefa7cc1"
integrity sha512-aqayTNmeWrZcvnG2MG9eGYI6b7S5fl+yKgPs6bAjOTwPS316R5SxBGKvtSExfyoJU7pIeHJfsHI0Ji41RVMkvQ==
version "13.11.2"
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.11.2.tgz#a2502325a3c0bd29f36dbac3b763223edd801e17"
integrity sha512-nIKVVQKT6kGKysnNt+xLobr+pFJNssJRi2s034wgWeFBUx01fI8BeHTW2TcRp7VcFu9QCYG8IlChTuovcm0oKQ==

"@types/yargs-parser@*":
version "21.0.1"
Expand Down Expand Up @@ -2254,11 +2230,21 @@ defer-to-connect@^2.0.0:
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==

define-data-property@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451"
integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==
dependencies:
get-intrinsic "^1.2.1"
gopd "^1.0.1"
has-property-descriptors "^1.0.0"

define-properties@^1.1.3, define-properties@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
version "1.2.1"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
dependencies:
define-data-property "^1.0.1"
has-property-descriptors "^1.0.0"
object-keys "^1.1.1"

Expand Down Expand Up @@ -2316,15 +2302,15 @@ drange@^1.0.2:
resolved "https://registry.yarnpkg.com/drange/-/drange-1.1.1.tgz#b2aecec2aab82fcef11dbbd7b9e32b83f8f6c0b8"
integrity sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==

elasticsearch-store@^0.67.3:
version "0.67.3"
resolved "https://registry.yarnpkg.com/elasticsearch-store/-/elasticsearch-store-0.67.3.tgz#2436715761b071c471a7a7b493034a681591d17e"
integrity sha512-GmwOYwb1849dZXelhW6qRHM1DK6iKCiUBlm9U87JcpeDT4/WvdXwvf1MRUI+yZ1zz/YWmwaY9JlRdl2DmulaKg==
elasticsearch-store@^0.72.0:
version "0.72.0"
resolved "https://registry.yarnpkg.com/elasticsearch-store/-/elasticsearch-store-0.72.0.tgz#6848835231e45369811ac8cb3b152b72e5642c3e"
integrity sha512-M/bSwcF3r3JTDotYirZFJU5faBDXo7MaBOeabpEmCaWX49bswW+XRkWxLZly4gYiGmS4yKY+YSobtT2h3OLjaA==
dependencies:
"@terascope/data-mate" "^0.42.0"
"@terascope/data-types" "^0.37.0"
"@terascope/data-mate" "^0.47.0"
"@terascope/data-types" "^0.42.0"
"@terascope/types" "^0.11.2"
"@terascope/utils" "^0.46.0"
"@terascope/utils" "^0.51.0"
ajv "^6.12.6"
elasticsearch "^15.4.1"
elasticsearch6 "npm:@elastic/elasticsearch@^6.7.0"
Expand All @@ -2334,7 +2320,7 @@ elasticsearch-store@^0.67.3:
opensearch2 "npm:@opensearch-project/opensearch@^2.2.1"
setimmediate "^1.0.5"
uuid "^9.0.0"
xlucene-translator "^0.30.0"
xlucene-translator "^0.35.0"

"elasticsearch6@npm:@elastic/elasticsearch@^6.7.0":
version "6.8.8"
Expand Down Expand Up @@ -3020,7 +3006,7 @@ get-caller-file@^2.0.5:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==

get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
Expand All @@ -3030,7 +3016,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
has-proto "^1.0.1"
has-symbols "^1.0.3"

get-intrinsic@^1.1.0, get-intrinsic@^1.1.3:
get-intrinsic@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
Expand Down Expand Up @@ -3141,6 +3127,13 @@ globby@^11.0.4, globby@^11.1.0:
merge2 "^1.4.1"
slash "^3.0.0"

gopd@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
dependencies:
get-intrinsic "^1.1.3"

got@^11.4.0, got@^11.8.2:
version "11.8.5"
resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
Expand Down Expand Up @@ -3266,11 +3259,9 @@ has-unicode@^2.0.1:
integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==

has@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies:
function-bind "^1.1.1"
version "1.0.4"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==

hpagent@^0.1.1:
version "0.1.2"
Expand Down Expand Up @@ -4516,11 +4507,6 @@ neo-async@^2.6.0:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==

netmask@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==

nock@^13.3.3:
version "13.3.3"
resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.3.tgz#179759c07d3f88ad3e794ace885629c1adfd3fe7"
Expand Down Expand Up @@ -5065,24 +5051,24 @@ readable-stream@^3.0.2:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"

regenerator-runtime@^0.13.11:
version "0.13.11"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==

regenerator-runtime@^0.13.4:
version "0.13.9"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==

regenerator-runtime@^0.14.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==

regexp.prototype.flags@^1.2.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
version "1.5.1"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
dependencies:
call-bind "^1.0.2"
define-properties "^1.2.0"
functions-have-names "^1.2.3"
set-function-name "^2.0.0"

regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
version "1.4.3"
Expand Down Expand Up @@ -5243,6 +5229,15 @@ semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
dependencies:
lru-cache "^6.0.0"

set-function-name@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
dependencies:
define-data-property "^1.0.1"
functions-have-names "^1.2.3"
has-property-descriptors "^1.0.0"

setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
Expand Down Expand Up @@ -5807,11 +5802,16 @@ valid-url@^1.0.9:
resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
integrity sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==

validator@^13.6.0, validator@^13.9.0:
validator@^13.6.0:
version "13.9.0"
resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==

validator@^13.9.0:
version "13.11.0"
resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b"
integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==

[email protected]:
version "1.10.0"
resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
Expand Down Expand Up @@ -5903,15 +5903,6 @@ write-file-atomic@^4.0.2:
imurmurhash "^0.1.4"
signal-exit "^3.0.7"

xlucene-parser@^0.45.0:
version "0.45.0"
resolved "https://registry.yarnpkg.com/xlucene-parser/-/xlucene-parser-0.45.0.tgz#7debd89666628f5ec80cdde45d478e3d185fc039"
integrity sha512-1FECtVkrR4VMKNTTgnkJohWI0eYR4xsNu9wwPJ0zB1kzSZPe6RyydsatMjHYYSSOzZnBYZ0woQ8KFXWZSnoRkg==
dependencies:
"@terascope/types" "^0.11.2"
"@terascope/utils" "^0.46.0"
netmask "^2.0.2"

xlucene-parser@^0.50.0:
version "0.50.0"
resolved "https://registry.yarnpkg.com/xlucene-parser/-/xlucene-parser-0.50.0.tgz#1f4125545d87c36bf2bf2c7eef792fbcecb88577"
Expand All @@ -5920,15 +5911,15 @@ xlucene-parser@^0.50.0:
"@terascope/types" "^0.11.2"
"@terascope/utils" "^0.51.0"

xlucene-translator@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/xlucene-translator/-/xlucene-translator-0.30.0.tgz#7cf2bc1a295a2fe206b4395a24f1707d2a2a42ea"
integrity sha512-yZFEUINeh4MtvtgiVMCVbGKzL8pBzt3Jxy5S+MhjbidXwm6+MqppwV1uMObZFQlNTjxfFCTpp6bfCaaDbmouJQ==
xlucene-translator@^0.35.0:
version "0.35.0"
resolved "https://registry.yarnpkg.com/xlucene-translator/-/xlucene-translator-0.35.0.tgz#49a964d415ba91bd8bc0bbdd6cfe7c539072c915"
integrity sha512-2A9vE/h3AiHZBfSCNLObZSrV0jWjYbGbTnFpsdFbd6yaqSrI6OqOJ3p/l78Xnwj/lWrwT3pedyBZzh6yLczjow==
dependencies:
"@terascope/types" "^0.11.2"
"@terascope/utils" "^0.46.0"
"@terascope/utils" "^0.51.0"
"@types/elasticsearch" "^5.0.40"
xlucene-parser "^0.45.0"
xlucene-parser "^0.50.0"

xtend@^4.0.0:
version "4.0.2"
Expand Down

0 comments on commit e04e571

Please sign in to comment.