diff --git a/.changeset/shiny-snakes-tan.md b/.changeset/shiny-snakes-tan.md new file mode 100644 index 0000000000..256bcd1559 --- /dev/null +++ b/.changeset/shiny-snakes-tan.md @@ -0,0 +1,7 @@ +--- +"@janus-idp/cli": major +--- + +changes to `package-dynamic-plugins` command: + +- Removed `-m` (`--marketplace`) flag. This flag will be replaced with more generic implementation see: https://issues.redhat.com/browse/RHIDP-5290 diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts index 8fd9a336b8..55ea5538e2 100644 --- a/packages/cli/src/commands/index.ts +++ b/packages/cli/src/commands/index.ts @@ -186,10 +186,6 @@ export function registerScriptCommand(program: Command) { 'By defult, the command uses podman to build the container image. Use this flag to use docker instead.', false, ) - .option( - '-m, --marketplace-file ', - 'Marketplace yaml file. This is a Plugin entity definition for Marketplace.', - ) .option( '--platform ', 'Platform to use when building the container image. Default is "linux/amd64". Can be set to "" to not set --platfrom flag in builder command.', diff --git a/packages/cli/src/commands/package-dynamic-plugins/command.ts b/packages/cli/src/commands/package-dynamic-plugins/command.ts index d760a6a67f..fe7f3b1ff6 100644 --- a/packages/cli/src/commands/package-dynamic-plugins/command.ts +++ b/packages/cli/src/commands/package-dynamic-plugins/command.ts @@ -13,15 +13,8 @@ import { paths } from '../../lib/paths'; import { Task } from '../../lib/tasks'; export async function command(opts: OptionValues): Promise { - const { - exportTo, - forceExport, - preserveTempDir, - tag, - useDocker, - marketplaceFile, - platform, - } = opts; + const { exportTo, forceExport, preserveTempDir, tag, useDocker, platform } = + opts; if (!exportTo && !tag) { Task.error( `Neither ${chalk.white('--export-to')} or ${chalk.white('--tag')} was specified, either specify ${chalk.white('--export-to')} to export plugins to a directory or ${chalk.white('--tag')} to export plugins to a container image`, @@ -40,19 +33,6 @@ export async function command(opts: OptionValues): Promise { return; } } - const maketplaceInfo: Object[] = []; - if (marketplaceFile) { - if (!fs.existsSync(marketplaceFile)) { - Task.error(`Marketplace file ${marketplaceFile} does not exist`); - return; - } - const yamlDocuments = YAML.parseAllDocuments( - fs.readFileSync(marketplaceFile).toLocaleString(), - ); - for (const document of yamlDocuments) { - maketplaceInfo.push(document.toJS()); - } - } const workspacePackage = (await fs.readJson( paths.resolveTarget('package.json'), )) as PackageJson; @@ -226,17 +206,6 @@ export async function command(opts: OptionValues): Promise { const flags = [ `--annotation io.backstage.dynamic-packages='${Buffer.from(JSON.stringify(pluginRegistryMetadata)).toString('base64')}'`, ]; - - for (const pluginInfo of maketplaceInfo) { - const base64pluginInfo = Buffer.from( - JSON.stringify(pluginInfo), - ).toString('base64'); - const pluginName = (pluginInfo as { metadata: { name: string } }) - .metadata.name; - flags.push( - `--annotation io.backstage.marketplace/${pluginName}='${base64pluginInfo}'`, - ); - } if (platform) { flags.push(`--platform ${platform}`); }