maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Env contains distributable flag (#40361)

Browse source 
* env contains distributable flag

* make sure flag is always boolean
This commit is contained in:
Mikhail Shustov 2019-07-05 13:47:03 +02:00 committed by GitHub
parent 10cbd3c914
commit 9e147f5b17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/server/config/__snapshots__/env.test.ts.snap generated
View file

@ -31,6 +31,7 @@ Env {
"branch": "feature-v1",
"buildNum": 9007199254740991,
"buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"dist": false,
"version": "v1",
},
"pluginSearchPaths": Array [
@ -74,6 +75,7 @@ Env {
"branch": "feature-v1",
"buildNum": 9007199254740991,
"buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"dist": false,
"version": "v1",
},
"pluginSearchPaths": Array [
@ -116,6 +118,7 @@ Env {
"branch": "some-branch",
"buildNum": 9007199254740991,
"buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"dist": false,
"version": "some-version",
},
"pluginSearchPaths": Array [
@ -158,6 +161,7 @@ Env {
"branch": "feature-v1",
"buildNum": 100,
"buildSha": "feature-v1-build-sha",
"dist": true,
"version": "v1",
},
"pluginSearchPaths": Array [
@ -200,6 +204,7 @@ Env {
"branch": "feature-v1",
"buildNum": 9007199254740991,
"buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"dist": false,
"version": "v1",
},
"pluginSearchPaths": Array [
@ -242,6 +247,7 @@ Env {
"branch": "feature-v1",
"buildNum": 100,
"buildSha": "feature-v1-build-sha",
"dist": true,
"version": "v1",
},
"pluginSearchPaths": Array [

4
src/core/server/config/env.ts
View file

@ -28,6 +28,7 @@ export interface PackageInfo {
branch: string;
buildNum: number;
buildSha: string;
dist: boolean;
}
export interface EnvironmentMode {
@ -132,12 +133,13 @@ export class Env {
prod: !isDevMode,
});
const isKibanaDistributable = pkg.build && pkg.build.distributable === true;
const isKibanaDistributable = Boolean(pkg.build && pkg.build.distributable === true);
this.packageInfo = Object.freeze({
branch: pkg.branch,
buildNum: isKibanaDistributable ? pkg.build.number : Number.MAX_SAFE_INTEGER,
buildSha: isKibanaDistributable ? pkg.build.sha : 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
version: pkg.version,
dist: isKibanaDistributable,
});
}
}

1
src/core/server/plugins/discovery/plugin_manifest_parser.test.ts
View file

@ -31,6 +31,7 @@ const packageInfo = {
buildNum: 1,
buildSha: '',
version: '7.0.0-alpha1',
dist: false,
};
afterEach(() => {