@forge/cli
12.14.1-next.0-experimental-1dcd59312.14.1-next.3-experimental-112266b
out/command-line/register-show-commands.js~
out/command-line/register-show-commands.jsModified+48−14
Index: package/out/command-line/register-show-commands.js
===================================================================
--- package/out/command-line/register-show-commands.js
+++ package/out/command-line/register-show-commands.js
@@ -138,36 +138,70 @@
return;
}
containers = specifiedService.containers.filter((ct) => ct.key === container);
}
+ const processedContainers = containers.map((ct) => {
+ if (!ct.instances || !ct.instances.length) {
+ return {
+ key: ct.key,
+ imageRepository: '',
+ instances: []
+ };
+ }
+ const firstInstanceImageURI = ct.instances[0].imageURI;
+ const { imageRepo: imageRepository } = (0, utils_1.formatImageUri)(firstInstanceImageURI);
+ return {
+ key: ct.key,
+ imageRepository,
+ instances: ct.instances.map((instance) => {
+ const { imageTag } = (0, utils_1.formatImageUri)(instance.imageURI);
+ return {
+ imageTag,
+ containerInstanceId: instance.id,
+ healthStatus: instance.healthStatus,
+ containerStatus: instance.containerStatus,
+ cpu: instance.cpu,
+ memory: instance.memory,
+ createdAt: instance.createdAt,
+ imageURI: instance.imageURI
+ };
+ })
+ };
+ });
if (json) {
- ui.info(JSON.stringify(containers, null, 2));
+ ui.info(JSON.stringify(processedContainers, null, 2));
}
else {
- for (const ct of containers) {
+ for (const ct of processedContainers) {
if (!ct.instances || !ct.instances.length) {
ui.info(cli_shared_1.Text.show.containers.noInstancesFoundForContainer(ct.key, service, environment));
ui.emptyLine();
continue;
}
ui.emptyLine();
+ const imageUriText = ct.imageRepository
+ ? cli_shared_1.Text.show.containers.specifyImageRepository(ct.imageRepository)
+ : '';
+ const preMessageText = cli_shared_1.Text.show.containers.specificContainer(ct.key) + '\n\n' + imageUriText;
ui.table([
- ['id', 'ID'],
+ ['imageTag', 'Image Tag'],
['health', 'Health'],
['status', 'Status'],
- ['imageURI', 'ImageURI'],
['cpu', 'CPU'],
['memory', 'Memory'],
- ['createdAt', 'Created at']
- ], ct.instances.map((c) => ({
- id: c.id,
- health: c.healthStatus,
- status: c.containerStatus,
- imageURI: c.imageURI,
- cpu: (0, utils_1.formatCpu)(c.cpu),
- memory: (0, utils_1.formatMemory)(c.memory),
- createdAt: c.createdAt
- })), { preMessage: cli_shared_1.Text.show.containers.specificContainer(ct.key) });
+ ['createdAt', 'Created at'],
+ ['containerInstanceId', 'Container Instance ID']
+ ], ct.instances.map((c) => {
+ return {
+ imageTag: c.imageTag,
+ containerInstanceId: c.containerInstanceId,
+ health: c.healthStatus,
+ status: c.containerStatus,
+ cpu: (0, utils_1.formatCpu)(c.cpu),
+ memory: (0, utils_1.formatMemory)(c.memory),
+ createdAt: c.createdAt
+ };
+ }), { preMessage: preMessageText });
}
}
ui.emptyLine();
});