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

[kbn-es] Support platform specific distributions (#29678)

Browse source 
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
This commit is contained in:
Tyler Smalley 2019-01-31 08:41:29 -08:00 • committed by GitHub
parent 528e533528
commit c70aeec6fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
packages/kbn-es/src/install/source.js
View file

@ -20,6 +20,7 @@
const execa = require('execa');
const path = require('path');
const fs = require('fs');
const os = require('os');
const readline = require('readline');
const chalk = require('chalk');
const crypto = require('crypto');
@ -27,7 +28,7 @@ const simpleGit = require('simple-git/promise');
const { installArchive } = require('./archive');
const { createCliError } = require('../errors');
const { findMostRecentlyChanged, log: defaultLog, cache } = require('../utils');
const { GRADLE_BIN, ES_ARCHIVE_PATTERN, ES_OSS_ARCHIVE_PATTERN, BASE_PATH } = require('../paths');
const { GRADLE_BIN, BASE_PATH } = require('../paths');
const onceEvent = (emitter, event) => new Promise(resolve => emitter.once(event, resolve));
@ -89,6 +90,7 @@ async function sourceInfo(cwd, license, log = defaultLog) {
const git = simpleGit(cwd);
const { task, ext } = archiveForPlatform(os.platform(), license);
const status = await git.status();
const branch = status.current;
const sha = (await git.revparse(['HEAD'])).trim();
@ -110,8 +112,8 @@ async function sourceInfo(cwd, license, log = defaultLog) {
.digest('hex')
.substr(0, 8);
const basename = `${branch}${license === 'oss' ? '-oss-' : '-'}${cwdHash}`;
const filename = `${basename}.tar.gz`;
const basename = `${branch}-${task}-${cwdHash}`;
const filename = `${basename}.${ext}`;
return {
etag: etag.digest('hex'),
@ -129,10 +131,18 @@ async function sourceInfo(cwd, license, log = defaultLog) {
* @property {String} options.sourcePath
* @property {ToolingLog} options.log
* @returns {Object} containing archive and optional plugins
*
* Gradle tasks:
* :distribution:archives:darwin-tar:assemble
* :distribution:archives:linux-tar:assemble
* :distribution:archives:windows-zip:assemble
* :distribution:archives:oss-darwin-tar:assemble
* :distribution:archives:oss-linux-tar:assemble
* :distribution:archives:oss-windows-zip:assemble
*/
async function createSnapshot({ license, sourcePath, log = defaultLog }) {
const tarTask = license === 'oss' ? 'oss-tar' : 'tar';
const buildArgs = [`:distribution:archives:${tarTask}:assemble`];
const { task, ext } = archiveForPlatform(os.platform(), license);
const buildArgs = [`:distribution:archives:${task}:assemble`];
log.info('%s %s', GRADLE_BIN, buildArgs.join(' '));
@ -157,12 +167,27 @@ async function createSnapshot({ license, sourcePath, log = defaultLog }) {
throw createCliError('unable to build ES');
}
const archivePattern = license === 'oss' ? ES_OSS_ARCHIVE_PATTERN : ES_ARCHIVE_PATTERN;
const esTarballPath = findMostRecentlyChanged(path.resolve(sourcePath, archivePattern));
const archivePattern = `distribution/archives/${task}/build/distributions/elasticsearch-*.${ext}`;
const esArchivePath = findMostRecentlyChanged(path.resolve(sourcePath, archivePattern));
if (!esTarballPath) {
if (!esArchivePath) {
throw createCliError('could not locate ES distribution');
}
return esTarballPath;
return esArchivePath;
}
function archiveForPlatform(platform, license) {
const taskPrefix = license === 'oss' ? 'oss-' : '';
switch (platform) {
case 'darwin':
return { format: 'tar', ext: 'tar.gz', task: `${taskPrefix}darwin-tar`, platform: 'darwin' };
case 'win32':
return { format: 'zip', ext: 'zip', task: `${taskPrefix}windows-zip`, platform: 'windows' };
case 'linux':
return { format: 'tar', ext: 'tar.gz', task: `${taskPrefix}linux-tar`, platform: 'linux' };
default:
throw new Error(`unknown platform: ${platform}`);
}
}

5
packages/kbn-es/src/paths.js
View file

@ -33,8 +33,3 @@ exports.ES_BIN = useBat('bin/elasticsearch');
exports.ES_CONFIG = 'config/elasticsearch.yml';
exports.ES_KEYSTORE_BIN = useBat('./bin/elasticsearch-keystore');
exports.ES_ARCHIVE_PATTERN =
'distribution/archives/tar/build/distributions/elasticsearch-*-SNAPSHOT.tar.gz';
exports.ES_OSS_ARCHIVE_PATTERN =
'distribution/archives/oss-tar/build/distributions/elasticsearch-*-SNAPSHOT.tar.gz';