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

packages/grafana-toolkit/src/cli/index.ts

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

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

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

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

@@ -4,6 +4,8 @@ import { GitHubRelease } from '../utils/githubRelease';
 import { getPluginId } from '../../config/utils/getPluginId';
 import { getCiFolder } from '../../plugins/env';
 import { useSpinner } from '../utils/useSpinner';
+import { readFileSync } from 'fs';
+
 import path = require('path');
 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 {
   commitHash?: string;
   githubToken: string;

packages/grafana-toolkit/src/plugins/types.ts

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