github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade LaunchDarkly clients (#185884)

Browse source
This commit is contained in:
Alejandro Fernández Haro 2024-06-11 01:38:48 +02:00 • committed by GitHub
parent 7094c8e1d8
commit cb825d046a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 53 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -929,6 +929,7 @@
"@langchain/openai": "^0.0.25",
"@langtrase/trace-attributes": "^3.0.8",
"@langtrase/typescript-sdk": "^2.2.1",
"@launchdarkly/node-server-sdk": "^9.4.5",
"@loaders.gl/core": "^3.4.7",
"@loaders.gl/json": "^3.4.7",
"@loaders.gl/shapefile": "^3.4.7",
@ -1065,8 +1066,7 @@
"kea": "^2.6.0",
"langchain": "^0.1.30",
"langsmith": "^0.1.14",
"launchdarkly-js-client-sdk": "^3.1.4",
"launchdarkly-node-server-sdk": "^7.0.3",
"launchdarkly-js-client-sdk": "^3.3.0",
"load-json-file": "^6.2.0",
"lodash": "^4.17.21",
"lru-cache": "^4.1.5",

2
renovate.json
View file

@ -46,7 +46,7 @@
},
{
"groupName": "LaunchDarkly",
"matchDepNames": ["launchdarkly-js-client-sdk", "launchdarkly-node-server-sdk"],
"matchDepNames": ["launchdarkly-js-client-sdk", "@launchdarkly/node-server-sdk"],
"reviewers": ["team:kibana-security", "team:kibana-core"],
"matchBaseBranches": ["main"],
"labels": ["release_note:skip", "Team:Security", "Team:Core", "backport:prev-minor"],

4
x-pack/plugins/cloud_integrations/cloud_experiments/server/launch_darkly_client/launch_darkly_client.test.mock.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import type { LDClient } from 'launchdarkly-node-server-sdk';
import type { LDClient } from '@launchdarkly/node-server-sdk';
export function createLaunchDarklyClientMock(): jest.Mocked<LDClient> {
return {
@ -19,7 +19,7 @@ export function createLaunchDarklyClientMock(): jest.Mocked<LDClient> {
export const ldClientMock = createLaunchDarklyClientMock();
jest.doMock('launchdarkly-node-server-sdk', () => ({
jest.doMock('@launchdarkly/node-server-sdk', () => ({
init: () => ldClientMock,
basicLogger: jest.fn(),
}));

2
x-pack/plugins/cloud_integrations/cloud_experiments/server/launch_darkly_client/launch_darkly_client.test.ts
View file

@ -7,7 +7,7 @@
import { loggerMock, type MockedLogger } from '@kbn/logging-mocks';
import { ldClientMock } from './launch_darkly_client.test.mock';
import LaunchDarkly from 'launchdarkly-node-server-sdk';
import LaunchDarkly from '@launchdarkly/node-server-sdk';
import { LaunchDarklyClient, type LaunchDarklyClientConfig } from './launch_darkly_client';
describe('LaunchDarklyClient - server', () => {

9
x-pack/plugins/cloud_integrations/cloud_experiments/server/launch_darkly_client/launch_darkly_client.ts
View file

@ -5,12 +5,13 @@
* 2.0.
*/
import LaunchDarkly, {
import {
type LDClient,
type LDFlagSet,
type LDLogLevel,
type LDSingleKindContext,
} from 'launchdarkly-node-server-sdk';
} from '@launchdarkly/node-server-sdk';
import { init, basicLogger } from '@launchdarkly/node-server-sdk';
import type { Logger } from '@kbn/core/server';
export interface LaunchDarklyClientConfig {
@ -44,9 +45,9 @@ export class LaunchDarklyClient {
private launchDarklyUser?: LDSingleKindContext;
constructor(ldConfig: LaunchDarklyClientConfig, private readonly logger: Logger) {
this.launchDarklyClient = LaunchDarkly.init(ldConfig.sdk_key, {
this.launchDarklyClient = init(ldConfig.sdk_key, {
application: { id: `kibana-server`, version: ldConfig.kibana_version },
logger: LaunchDarkly.basicLogger({ level: ldConfig.client_log_level }),
logger: basicLogger({ level: ldConfig.client_log_level }),
// For some reason, the stream API does not work in Kibana. `.waitForInitialization()` hangs forever (doesn't throw, neither logs any errors).
// Using polling for now until we resolve that issue.
// Relevant issue: https://github.com/launchdarkly/node-server-sdk/issues/132

82
yarn.lock
View file

@ -6959,6 +6959,28 @@
node-loader "^2.0.0"
tiktoken "^1.0.13"
"@launchdarkly/js-sdk-common@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@launchdarkly/js-sdk-common/-/js-sdk-common-2.5.0.tgz#d1dc595034bf6ee09b0313add5b8901fe9b82f26"
integrity sha512-sVwwUpXwAZsQowdbNN4ckprzR9DMEkurYWFuLjpyaaHtUmB6g7WnIz3lGGIXz/nE3QoUlwtC+eR8Nqb+XdonKw==
"@launchdarkly/js-server-sdk-common@2.4.3":
version "2.4.3"
resolved "https://registry.yarnpkg.com/@launchdarkly/js-server-sdk-common/-/js-server-sdk-common-2.4.3.tgz#4d2a1bb71982dadecbadb0411d1068fb7945f54a"
integrity sha512-1YQ6fMpO0gcWt2Pme5XyUdokQxU5fMcoWAUpHJwxiHAt1+ygDqRD3wuUPCnbJ8KzJprcj51fpCG/9h3KSW9mHA==
dependencies:
"@launchdarkly/js-sdk-common" "2.5.0"
semver "7.5.4"
"@launchdarkly/node-server-sdk@^9.4.5":
version "9.4.5"
resolved "https://registry.yarnpkg.com/@launchdarkly/node-server-sdk/-/node-server-sdk-9.4.5.tgz#4a64319de7917fc149e51a9e22c1a5243d76d849"
integrity sha512-GXYhvfFG7wGgeFoyWUa7Srso4CwMHo+c/WLQzoB1A5EPQ76oVkvYJbrgCym1ZLdIpm06bNRQ75NOn2hRn1SjfQ==
dependencies:
"@launchdarkly/js-server-sdk-common" "2.4.3"
https-proxy-agent "^5.0.1"
launchdarkly-eventsource "2.0.3"
"@leichtgewicht/ip-codec@^2.0.1":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
@ -12445,7 +12467,7 @@ async@^1.4.2:
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
async@^3.2.0, async@^3.2.3, async@^3.2.4:
async@^3.2.0, async@^3.2.3:
version "3.2.4"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
@ -14064,16 +14086,16 @@ clone-stats@^1.0.0:
resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
clone@2.x, clone@^2.1.1, clone@^2.1.2, clone@~2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
clone@^1.0.2, clone@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
clone@^2.1.1, clone@^2.1.2, clone@~2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
cloneable-readable@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
@ -21667,41 +21689,28 @@ latest-version@^7.0.0:
dependencies:
package-json "^8.1.0"
launchdarkly-eventsource@1.4.4:
version "1.4.4"
resolved "https://registry.yarnpkg.com/launchdarkly-eventsource/-/launchdarkly-eventsource-1.4.4.tgz#fa595af8602e487c61520787170376c6a1104459"
integrity sha512-GL+r2Y3WccJlhFyL2buNKel+9VaMnYpbE/FfCkOST5jSNSFodahlxtGyrE8o7R+Qhobyq0Ree4a7iafJDQi9VQ==
launchdarkly-eventsource@2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/launchdarkly-eventsource/-/launchdarkly-eventsource-2.0.3.tgz#8a7b8da5538153f438f7d452b1c87643d900f984"
integrity sha512-VhFjppK7jXlcEKaS7bxdoibB5j01NKyeDR7a8XfssdDGNWCTsbF0/5IExSmPi44eDncPhkoPNxlSZhEZvrbD5w==
launchdarkly-js-client-sdk@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-3.1.4.tgz#e613cb53412533c07ccf140ae570fc994c59758d"
integrity sha512-yq0FeklpVuHMSRz7jfUAfyM7I/659RvGztqJ0Y9G5eN/ZrG1o2W61ZU0Nrv/gqZCtLXjarh/u1otxSFFBjTpHw==
launchdarkly-js-client-sdk@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-3.3.0.tgz#33573b884438b63f1501039c4bf0b174694a06d0"
integrity sha512-Hb+EF/5m43jsKrkXLPrdklX5g+XUJiwJQlVfa4y+ZPEqSnP4w4GrFp+Iv5ftWCcRhhpQuw/rygoNZlL1e1vmgg==
dependencies:
escape-string-regexp "^4.0.0"
launchdarkly-js-sdk-common "5.0.3"
launchdarkly-js-sdk-common "5.2.0"
launchdarkly-js-sdk-common@5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-5.0.3.tgz#345f899f5779be8b03d6599978c855eb838d8b7f"
integrity sha512-wKG8UsVbPVq8+7eavgAm5CVmulQWN6Ddod2ZoA3euZ1zPvJPwIQ2GrOYaCJr3cFrrMIX+nQyBJHBHYxUAPcM+Q==
launchdarkly-js-sdk-common@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-5.2.0.tgz#be9fadc59786c060087a3b818d15af700faf0fd2"
integrity sha512-aLv2ZrUv229RIwLtFhdILu2aJS/fqGSJzTk4L/bCDZA8RuIh7PutI3ui/AJeNnzPzjKzdEQZw6wVhkVc84baog==
dependencies:
base64-js "^1.3.0"
fast-deep-equal "^2.0.1"
uuid "^8.0.0"
launchdarkly-node-server-sdk@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/launchdarkly-node-server-sdk/-/launchdarkly-node-server-sdk-7.0.3.tgz#d7a8b996d992b0ca5d4972db5df1ae49332b094c"
integrity sha512-uSkBezAiQ9nwv8N6CmI7OmyJ9e3xpueJzYOso8+5vMf7VtBtPjz6RRsUkUsSzUDo7siclmW8USjCwqn9aX2EbQ==
dependencies:
async "^3.2.4"
launchdarkly-eventsource "1.4.4"
lru-cache "^6.0.0"
node-cache "^5.1.0"
semver "^7.5.4"
tunnel "0.0.6"
uuid "^8.3.2"
lazy-ass@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
@ -23607,13 +23616,6 @@ node-addon-api@^6.1.0:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
node-cache@^5.1.0:
version "5.1.2"
resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d"
integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==
dependencies:
clone "2.x"
node-dir@^0.1.10:
version "0.1.17"
resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@ -30293,7 +30295,7 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
tunnel@0.0.6, tunnel@^0.0.6:
tunnel@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==