IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore(toolkit): add toolkit version to signing (#44326)

Browse Source
This commit is contained in:
Timur Olzhabayev 2022-01-31 09:55:21 +01:00 committed by GitHub
parent d2f80c3a6f
commit 9fe034e5ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grafana-toolkit/src/cli/index.ts
View File

@ -1,7 +1,6 @@
// @ts-ignore // @ts-ignore
import chalk from 'chalk'; import chalk from 'chalk';
import { program } from 'commander'; import { program } from 'commander';
import { promises as fs } from 'fs';
import { execTask } from './utils/execTask'; import { execTask } from './utils/execTask';
import { startTask } from './tasks/core.start'; import { startTask } from './tasks/core.start';
import { changelogTask } from './tasks/changelog'; import { changelogTask } from './tasks/changelog';
@ -13,7 +12,7 @@ import { pluginTestTask } from './tasks/plugin.tests';
import { searchTestDataSetupTask } from './tasks/searchTestDataSetup'; import { searchTestDataSetupTask } from './tasks/searchTestDataSetup';
import { closeMilestoneTask } from './tasks/closeMilestone'; import { closeMilestoneTask } from './tasks/closeMilestone';
import { pluginDevTask } from './tasks/plugin.dev'; import { pluginDevTask } from './tasks/plugin.dev';
import { githubPublishTask } from './tasks/plugin.utils'; import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
import { pluginUpdateTask } from './tasks/plugin.update'; import { pluginUpdateTask } from './tasks/plugin.update';
import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci'; import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci';
import { buildPackageTask } from './tasks/package.build'; import { buildPackageTask } from './tasks/package.build';
@ -132,8 +131,7 @@ export const run = (includeInternalScripts = false) => {
} }
program.option('-v, --version', 'Toolkit version').action(async () => { program.option('-v, --version', 'Toolkit version').action(async () => {
const pkg = await fs.readFile(`${__dirname}/../../package.json`, 'utf8'); const version = getToolkitVersion();
const { version } = JSON.parse(pkg);
console.log(`v${version}`); console.log(`v${version}`);
}); });

4
packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts
View File

@ -1,7 +1,7 @@
import path from 'path'; import path from 'path';
import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest'; import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest';
import { Task, TaskRunner } from './task'; import { Task, TaskRunner } from './task';
import { getToolkitVersion } from './plugin.utils';
interface PluginSignOptions { interface PluginSignOptions {
signatureType?: string; signatureType?: string;
rootUrls?: string[]; rootUrls?: string[];
@ -23,8 +23,8 @@ const pluginSignRunner: TaskRunner<PluginSignOptions> = async ({ signatureType,
manifest.rootUrls = rootUrls; manifest.rootUrls = rootUrls;
} }
manifest.toolkit = { version: getToolkitVersion() };
const signedManifest = await signManifest(manifest); const signedManifest = await signManifest(manifest);
// console.log(signedManifest);
console.log('Saving signed manifest...'); console.log('Saving signed manifest...');
await saveManifest(distContentDir, signedManifest); await saveManifest(distContentDir, signedManifest);

10
packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
View File

@ -4,6 +4,8 @@ import { GitHubRelease } from '../utils/githubRelease';
import { getPluginId } from '../../config/utils/getPluginId'; import { getPluginId } from '../../config/utils/getPluginId';
import { getCiFolder } from '../../plugins/env'; import { getCiFolder } from '../../plugins/env';
import { useSpinner } from '../utils/useSpinner'; import { useSpinner } from '../utils/useSpinner';
import { readFileSync } from 'fs';
import path = require('path'); import path = require('path');
import execa = require('execa'); import execa = require('execa');
@ -140,6 +142,14 @@ const prepareRelease = ({ dryrun, verbose }: any) =>
} }
}); });
export const getToolkitVersion = () => {
const pkg = readFileSync(`${__dirname}/../../../package.json`, 'utf8');
const { version } = JSON.parse(pkg);
if (!version) {
throw `Could not find the toolkit version`;
}
return version;
};
interface GithubPublishReleaseOptions { interface GithubPublishReleaseOptions {
commitHash?: string; commitHash?: string;
githubToken: string; githubToken: string;

3
packages/grafana-toolkit/src/plugins/types.ts
View File

@ -98,4 +98,7 @@ export interface ManifestInfo {
plugin: string; plugin: string;
version: string; version: string;
files: Record<string, string>; files: Record<string, string>;
toolkit?: {
version: string;
};
} }