From 5dfaad6ccb0228a74332b2a5228536ed0253fb0a Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 14 Dec 2021 12:03:41 +0100 Subject: [PATCH] Toolkit: Fix bug with rootUrls not being properly parsed when signing a private plugin. (#43014) (#43081) * fix plugin sign * modify urls * back to urls... * code format (cherry picked from commit e79254d9aa37c26083fef8e452c5df1dc4c3707a) Co-authored-by: Dessen Xu <41524013+dessen-xu@users.noreply.github.com> --- packages/grafana-toolkit/src/cli/index.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts index 2ff2f2f01e4..797684d4d9d 100644 --- a/packages/grafana-toolkit/src/cli/index.ts +++ b/packages/grafana-toolkit/src/cli/index.ts @@ -200,7 +200,21 @@ export const run = (includeInternalScripts = false) => { program .command('plugin:sign') .option('--signatureType ', 'Signature Type') - .option('--rootUrls ', 'Root URLs') + .option( + '--rootUrls ', + 'Root URLs', + function (url: string, urls: string[]) { + if (typeof url !== 'string') { + return urls; + } + + const parts = url.split(','); + urls.push(...parts); + + return urls; + }, + [] + ) .description('Create a plugin signature') .action(async (cmd) => { await execTask(pluginSignTask)({