From c7aafea3700343a38729cde98f6a63e1c0866ad0 Mon Sep 17 00:00:00 2001 From: Esteban Beltran Date: Tue, 25 Apr 2023 14:24:16 +0200 Subject: [PATCH] Toolkit: Remove deprecated `plugin:sign` command (#67130) --- packages/grafana-toolkit/src/cli/index.ts | 14 ++----- .../src/cli/tasks/plugin.sign.ts | 42 ------------------- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts index 037288731f0..dbf7d8e7ab0 100644 --- a/packages/grafana-toolkit/src/cli/index.ts +++ b/packages/grafana-toolkit/src/cli/index.ts @@ -5,7 +5,6 @@ import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker'; import { buildPackageTask } from './tasks/package.build'; import { pluginBuildTask } from './tasks/plugin.build'; import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci'; -import { pluginSignTask } from './tasks/plugin.sign'; import { pluginUpdateTask } from './tasks/plugin.update'; import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils'; import { bundleManagedTask } from './tasks/plugin/bundle.managed'; @@ -123,17 +122,12 @@ export const run = (includeInternalScripts = false) => { }, [] ) - .description('[Deprecated] Create a plugin signature') - .action(async (cmd) => { + .description('[removed] Use grafana sign-plugin instead') + .action(() => { console.log( - chalk.yellow('\n⚠️ DEPRECATED. This command is deprecated and will be removed in v10. ⚠️') + - '\nPlease migrate to grafana sign-plugin https://github.com/grafana/plugin-tools/tree/main/packages/sign-plugin' + 'No longer supported. Use grafana sign-plugin https://github.com/grafana/plugin-tools/tree/main/packages/sign-plugin\n' ); - await execTask(pluginSignTask)({ - signatureType: cmd.signatureType, - rootUrls: cmd.rootUrls, - silent: true, - }); + process.exit(1); }); program diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts deleted file mode 100644 index bec898243f1..00000000000 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts +++ /dev/null @@ -1,42 +0,0 @@ -import path from 'path'; - -import { assertRootUrlIsValid } from '../../config/utils/pluginValidation'; -import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest'; - -import { getToolkitVersion } from './plugin.utils'; -import { Task, TaskRunner } from './task'; -interface PluginSignOptions { - signatureType?: string; - rootUrls?: string[]; -} - -const pluginSignRunner: TaskRunner = async ({ signatureType, rootUrls }) => { - const distContentDir = path.resolve('dist'); - - try { - console.log('Building manifest...'); - const manifest = await buildManifest(distContentDir); - // console.log(manifest); - - console.log('Signing manifest...'); - if (signatureType) { - manifest.signatureType = signatureType; - } - if (rootUrls && rootUrls.length > 0) { - rootUrls.forEach(assertRootUrlIsValid); - manifest.rootUrls = rootUrls; - } - - manifest.toolkit = { version: getToolkitVersion() }; - const signedManifest = await signManifest(manifest); - - console.log('Saving signed manifest...'); - await saveManifest(distContentDir, signedManifest); - - console.log('Signed successfully'); - } catch (err) { - console.warn(err); - } -}; - -export const pluginSignTask = new Task('plugin:sign task', pluginSignRunner);