@enspirit/emb 0.22.1 → 0.24.0

package/dist/src/cli/commands/components/shell.js

@@ -4,7 +4,7 @@ import { ComposeExecShellOperation } from '../../../docker/index.js';
 import { ShellExitError } from '../../../errors.js';
 export default class ComponentShellCommand extends BaseCommand {
     static aliases = ['shell'];
-    static description = 'Get a shell on a running component.';
+    static description = 'Get a shell on a running service.';
     static enableJsonFlag = false;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
@@ -16,18 +16,20 @@ export default class ComponentShellCommand extends BaseCommand {
         }),
     };
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component you want to get a shell on',
+        service: Args.string({
+            name: 'service',
+            description: 'The service you want to get a shell on',
             required: true,
         }),
     };
     async run() {
         const { flags, args } = await this.parse(ComponentShellCommand);
-        const { monorepo } = await getContext();
+        const { monorepo, compose } = getContext();
+        // Validate service exists in docker-compose.yml
+        await compose.validateService(args.service);
         try {
             await monorepo.run(new ComposeExecShellOperation(), {
-                service: args.component,
+                service: args.service,
                 shell: flags.shell,
             });
         }

package/dist/src/cli/commands/down.d.ts

@@ -4,5 +4,9 @@ export default class DownCommand extends FlavoredCommand<typeof DownCommand> {
     static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {};
+    static args: {
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static strict: boolean;
     run(): Promise<void>;
 }

package/dist/src/cli/commands/down.js

@@ -1,4 +1,4 @@
-import { Listr } from 'listr2';
+import { Args } from '@oclif/core';
 import { FlavoredCommand, getContext } from '../index.js';
 import { ComposeDownOperation } from '../../docker/index.js';
 export default class DownCommand extends FlavoredCommand {
@@ -6,17 +6,22 @@ export default class DownCommand extends FlavoredCommand {
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {};
+    static args = {
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to stop and remove',
+        }),
+    };
+    static strict = false;
     async run() {
-        const { monorepo } = getContext();
-        const runner = new Listr([
-            {
-                rendererOptions: { persistentOutput: true },
-                async task(ctx, task) {
-                    return monorepo.run(new ComposeDownOperation(task.stdout()), {});
-                },
-                title: 'Stopping project',
-            },
-        ]);
-        await runner.run();
+        const { argv } = await this.parse(DownCommand);
+        const { monorepo, compose } = getContext();
+        let services;
+        if (argv.length > 0) {
+            services = await compose.validateServices(argv);
+        }
+        await monorepo.run(new ComposeDownOperation(), {
+            services,
+        });
     }
 }

package/dist/src/cli/commands/kubernetes/logs.js

@@ -2,7 +2,7 @@ import { Log } from '@kubernetes/client-node';
 import { Args, Flags } from '@oclif/core';
 import { PassThrough } from 'node:stream';
 import { KubernetesCommand } from '../../index.js';
-import { GetDeploymentPodsOperation } from '../../../kubernetes/operations/GetDeploymentPodsOperation.js';
+import { GetComponentPodOperation } from '../../../kubernetes/operations/index.js';
 export default class KubernetesLogs extends KubernetesCommand {
     static description = 'Follow kubernetes logs.';
     static enableJsonFlag = false;
@@ -26,23 +26,18 @@ export default class KubernetesLogs extends KubernetesCommand {
     async run() {
         const { flags, args } = await this.parse(KubernetesLogs);
         const { monorepo, kubernetes } = this.context;
-        // Check the component name is valid (would raise otherwise)
-        monorepo.component(args.component);
-        const pods = await monorepo.run(new GetDeploymentPodsOperation(), {
-            namespace: flags.namespace,
-            deployment: args.component,
+        const namespace = this.resolveNamespace(flags.namespace);
+        const component = monorepo.component(args.component);
+        const { pod, container } = await monorepo.run(new GetComponentPodOperation(), {
+            namespace,
+            component,
         });
-        if (pods.length === 0) {
-            throw new Error(`No running pod found for component ${args.component}`);
-        }
         const k8sLogs = new Log(kubernetes.config);
         const transform = new PassThrough();
         transform.on('data', (chunk) => {
             process.stdout.write(chunk);
         });
-        const pod = pods[0];
-        const container = pod.spec.containers[0];
-        await k8sLogs.log(flags.namespace, pod.metadata.name, container.name, transform, {
+        await k8sLogs.log(namespace, pod.metadata.name, container, transform, {
             follow: flags.follow,
             tailLines: 50,
             pretty: false,

package/dist/src/cli/commands/kubernetes/ps.js

@@ -15,8 +15,9 @@ export default class KPSCommand extends KubernetesCommand {
     async run() {
         const { flags } = await this.parse(KPSCommand);
         const { kubernetes } = getContext();
+        const namespace = this.resolveNamespace(flags.namespace);
         const { items } = await kubernetes.core.listNamespacedPod({
-            namespace: flags.namespace,
+            namespace,
         });
         const pods = items.map((i) => {
             const restarts = i.status?.containerStatuses

package/dist/src/cli/commands/kubernetes/restart.js

@@ -14,8 +14,9 @@ export default class KRestartCommand extends KubernetesCommand {
     async run() {
         const { flags, argv } = await this.parse(KRestartCommand);
         const { monorepo } = getContext();
+        const namespace = this.resolveNamespace(flags.namespace);
         await monorepo.run(new PodsRestartOperation(), {
-            namespace: flags.namespace,
+            namespace,
             deployments: argv.length > 0 ? argv : undefined,
         });
     }

package/dist/src/cli/commands/kubernetes/shell.js

@@ -1,7 +1,7 @@
 import { Exec } from '@kubernetes/client-node';
 import { Args, Flags } from '@oclif/core';
 import { getContext, KubernetesCommand } from '../../index.js';
-import { GetDeploymentPodsOperation } from '../../../kubernetes/operations/GetDeploymentPodsOperation.js';
+import { GetComponentPodOperation } from '../../../kubernetes/operations/index.js';
 import { enableRawMode } from '../../../utils/streams.js';
 export default class PodShellCommand extends KubernetesCommand {
     static aliases = ['shell'];
@@ -26,18 +26,15 @@ export default class PodShellCommand extends KubernetesCommand {
     async run() {
         const { flags, args } = await this.parse(PodShellCommand);
         const { monorepo, kubernetes } = await getContext();
-        const pods = await monorepo.run(new GetDeploymentPodsOperation(), {
-            namespace: flags.namespace,
-            deployment: args.component,
+        const namespace = this.resolveNamespace(flags.namespace);
+        const component = monorepo.component(args.component);
+        const { pod, container } = await monorepo.run(new GetComponentPodOperation(), {
+            namespace,
+            component,
         });
-        if (pods.length === 0) {
-            throw new Error(`No running pod found for component ${args.component}`);
-        }
-        const pod = pods[0];
-        const container = pod.spec.containers[0];
         const exec = new Exec(kubernetes.config);
         enableRawMode(process.stdin);
-        const res = await exec.exec(flags.namespace, pod.metadata.name, container.name, [flags.shell], process.stdout, process.stderr, process.stdin, true);
+        const res = await exec.exec(namespace, pod.metadata.name, container, [flags.shell], process.stdout, process.stderr, process.stdin, true);
         res.on('close', () => {
             // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
             process.exit(0);

package/dist/src/cli/commands/logs/archive.d.ts

@@ -10,7 +10,7 @@ export default class LogsArchive extends BaseCommand {
         output: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }

package/dist/src/cli/commands/logs/archive.js

@@ -2,7 +2,7 @@ import { Args, Flags } from '@oclif/core';
 import { BaseCommand, getContext } from '../../index.js';
 import { ComposeLogsArchiveOperation } from '../../../docker/index.js';
 export default class LogsArchive extends BaseCommand {
-    static description = 'Archive docker compose logs to files (one file per component).';
+    static description = 'Archive docker compose logs to files (one file per service).';
     static enableJsonFlag = true;
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -26,22 +26,23 @@ export default class LogsArchive extends BaseCommand {
         }),
     };
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component(s) to archive logs for (all if omitted)',
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to archive logs for (all if omitted)',
             required: false,
         }),
     };
     async run() {
         const { flags, argv } = await this.parse(LogsArchive);
-        const { monorepo } = await getContext();
-        const componentNames = argv;
-        // Validate that all specified components exist
-        if (componentNames.length > 0) {
-            componentNames.forEach((name) => monorepo.component(name));
+        const { monorepo, compose } = getContext();
+        const serviceNames = argv;
+        // Validate that all specified services exist in docker-compose.yml
+        let services;
+        if (serviceNames.length > 0) {
+            services = await compose.validateServices(serviceNames);
         }
         const result = await monorepo.run(new ComposeLogsArchiveOperation(), {
-            components: componentNames.length > 0 ? componentNames : undefined,
+            services,
             outputDir: flags.output,
             timestamps: flags.timestamps,
             tail: flags.tail,
@@ -52,7 +53,7 @@ export default class LogsArchive extends BaseCommand {
         else {
             this.log('Archived logs:');
             for (const file of result) {
-                this.log(`  ${file.component}: ${file.path}`);
+                this.log(`  ${file.service}: ${file.path}`);
             }
         }
     }

package/dist/src/cli/commands/logs/index.d.ts

@@ -8,7 +8,7 @@ export default class Logs extends BaseCommand {
         follow: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }

package/dist/src/cli/commands/logs/index.js

@@ -2,7 +2,7 @@ import { Args, Flags } from '@oclif/core';
 import { BaseCommand, getContext } from '../../index.js';
 import { ComposeLogsOperation } from '../../../docker/index.js';
 export default class Logs extends BaseCommand {
-    static description = 'Get components logs.';
+    static description = 'Get service logs.';
     static enableJsonFlag = false;
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -21,23 +21,23 @@ export default class Logs extends BaseCommand {
         }),
     };
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component(s) you want to see the logs of (all if omitted)',
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) you want to see the logs of (all if omitted)',
             required: false,
         }),
     };
     async run() {
         const { flags, argv } = await this.parse(Logs);
-        const { monorepo } = await getContext();
-        const componentNames = argv;
-        // Validate that all specified components exist
-        const services = componentNames.map((name) => {
-            const component = monorepo.component(name);
-            return component.name;
-        });
+        const { monorepo, compose } = getContext();
+        const serviceNames = argv;
+        // Validate that all specified services exist in docker-compose.yml
+        let services;
+        if (serviceNames.length > 0) {
+            services = await compose.validateServices(serviceNames);
+        }
         await monorepo.run(new ComposeLogsOperation(), {
-            services: services.length > 0 ? services : undefined,
+            services,
             follow: flags.follow,
         });
     }

package/dist/src/cli/commands/restart.d.ts

@@ -7,7 +7,7 @@ export default class RestartComand extends BaseCommand {
         'no-deps': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static strict: boolean;
     run(): Promise<void>;

package/dist/src/cli/commands/restart.js

@@ -9,26 +9,27 @@ export default class RestartComand extends BaseCommand {
         'no-deps': Flags.boolean({
             char: 'f',
             default: false,
-            description: "Don't restart depdendent components",
+            description: "Don't restart dependent services",
             name: 'no-deps',
         }),
     };
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component(s) to restart',
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to restart',
         }),
     };
     static strict = false;
     async run() {
         const { flags, argv } = await this.parse(RestartComand);
-        const { monorepo } = getContext();
-        const components = argv.length > 0
-            ? argv.map((name) => monorepo.component(name))
-            : undefined;
+        const { monorepo, compose } = getContext();
+        let services;
+        if (argv.length > 0) {
+            services = await compose.validateServices(argv);
+        }
         await monorepo.run(new ComposeRestartOperation(), {
             noDeps: flags['no-deps'],
-            services: components?.map((c) => c.name),
+            services,
         });
     }
 }

package/dist/src/cli/commands/start.d.ts

@@ -5,7 +5,7 @@ export default class StartCommand extends BaseCommand {
     static examples: string[];
     static flags: {};
     static args: {
-        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static strict: boolean;
     run(): Promise<void>;

package/dist/src/cli/commands/start.js

@@ -7,24 +7,21 @@ export default class StartCommand extends BaseCommand {
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {};
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component(s) to start',
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to start',
         }),
     };
     static strict = false;
     async run() {
         const { argv } = await this.parse(StartCommand);
-        const { monorepo } = getContext();
-        let components;
+        const { monorepo, compose } = getContext();
+        let services;
         if (argv.length > 0) {
-            components =
-                argv.length > 0
-                    ? argv.map((name) => monorepo.component(name))
-                    : undefined;
+            services = await compose.validateServices(argv);
         }
         await monorepo.run(new ComposeStartOperation(), {
-            services: components?.map((c) => c.name),
+            services,
         });
     }
 }

package/dist/src/cli/commands/stop.d.ts

@@ -4,5 +4,9 @@ export default class StopCommand extends FlavoredCommand<typeof StopCommand> {
     static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {};
+    static args: {
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static strict: boolean;
     run(): Promise<void>;
 }

package/dist/src/cli/commands/stop.js

@@ -1,4 +1,4 @@
-import { Listr } from 'listr2';
+import { Args } from '@oclif/core';
 import { FlavoredCommand, getContext } from '../index.js';
 import { ComposeStopOperation } from '../../docker/index.js';
 export default class StopCommand extends FlavoredCommand {
@@ -6,17 +6,22 @@ export default class StopCommand extends FlavoredCommand {
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {};
+    static args = {
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to stop',
+        }),
+    };
+    static strict = false;
     async run() {
-        const { monorepo } = getContext();
-        const runner = new Listr([
-            {
-                rendererOptions: { persistentOutput: true },
-                async task(ctx, task) {
-                    return monorepo.run(new ComposeStopOperation(task.stdout()), {});
-                },
-                title: 'Stopping project',
-            },
-        ]);
-        await runner.run();
+        const { argv } = await this.parse(StopCommand);
+        const { monorepo, compose } = getContext();
+        let services;
+        if (argv.length > 0) {
+            services = await compose.validateServices(argv);
+        }
+        await monorepo.run(new ComposeStopOperation(), {
+            services,
+        });
     }
 }

package/dist/src/cli/commands/up.d.ts

@@ -7,7 +7,7 @@ export default class UpCommand extends FlavoredCommand<typeof UpCommand> {
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        service: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static strict: boolean;
     run(): Promise<void>;

package/dist/src/cli/commands/up.js

@@ -15,27 +15,25 @@ export default class UpCommand extends FlavoredCommand {
         }),
     };
     static args = {
-        component: Args.string({
-            name: 'component',
-            description: 'The component(s) to build and start',
+        service: Args.string({
+            name: 'service',
+            description: 'The service(s) to build and start',
         }),
     };
     static strict = false;
     async run() {
         const { flags, argv } = await this.parse(UpCommand);
-        const { monorepo } = getContext();
-        const buildFlags = [];
-        if (flags.force) {
-            buildFlags.push('--force');
-        }
-        let components;
+        const { monorepo, compose } = getContext();
+        let services;
         let resources;
         if (argv.length > 0) {
-            components =
-                argv.length > 0
-                    ? argv.map((name) => monorepo.component(name))
-                    : monorepo.components;
-            resources = components.reduce((resources, component) => {
+            // Validate service names against docker-compose.yml
+            services = await compose.validateServices(argv);
+            // Build resources for services that have corresponding components
+            const componentNames = new Set(monorepo.components.map((c) => c.name));
+            const componentsToBuild = services.filter((s) => componentNames.has(s));
+            resources = componentsToBuild.reduce((resources, name) => {
+                const component = monorepo.component(name);
                 return [
                     ...resources,
                     ...Object.values(component.resources).map((r) => r.id),
@@ -45,13 +43,16 @@ export default class UpCommand extends FlavoredCommand {
         else {
             resources = monorepo.resources.map((r) => r.id);
         }
-        await monorepo.run(new BuildResourcesOperation(), {
-            force: flags.force,
-            resources,
-        });
+        // Only build resources if there are any to build
+        if (resources && resources.length > 0) {
+            await monorepo.run(new BuildResourcesOperation(), {
+                force: flags.force,
+                resources,
+            });
+        }
         await monorepo.run(new ComposeUpOperation(), {
             forceRecreate: flags.force,
-            components: components?.map((c) => c.name),
+            services,
         });
     }
 }

package/dist/src/config/schema.d.ts

@@ -18,7 +18,7 @@ export type TaskConfig = TaskConfig1 & {
         [k: string]: unknown;
     };
     pre?: QualifiedIdentifier[];
-    executors?: ("local" | "container")[];
+    executors?: ("local" | "container" | "kubernetes")[];
     /**
      * Whether the task is interactive (requires TTY)
      */
@@ -107,6 +107,24 @@ export interface DefaultsConfig {
         };
         [k: string]: unknown;
     };
+    kubernetes?: KubernetesConfig;
+}
+/**
+ * Kubernetes configuration for the project
+ */
+export interface KubernetesConfig {
+    /**
+     * Default Kubernetes namespace to use
+     */
+    namespace?: string;
+    /**
+     * Kubernetes context to use from kubeconfig
+     */
+    context?: string;
+    /**
+     * Label name used in pod selectors. Defaults to 'app.kubernetes.io/component'
+     */
+    selectorLabel?: string;
 }
 export interface ComponentConfig {
     /**
@@ -126,6 +144,7 @@ export interface ComponentConfig {
     flavors?: {
         [k: string]: ComponentFlavorConfig;
     };
+    kubernetes?: ComponentKubernetesConfig;
 }
 export interface ComponentFlavorConfig {
     patches?: JsonPatchOperation[];
@@ -154,6 +173,19 @@ export interface JsonPatchCopyOperation {
     path: string;
     from: string;
 }
+/**
+ * Kubernetes configuration for a component
+ */
+export interface ComponentKubernetesConfig {
+    /**
+     * Label selector to find pods (e.g., 'app=api,tier=backend'). Defaults to '{componentLabel}={component}'
+     */
+    selector?: string;
+    /**
+     * Container name for multi-container pods
+     */
+    container?: string;
+}
 export interface ProjectFlavorConfig {
     patches?: JsonPatchOperation[];
 }

package/dist/src/config/schema.json

@@ -71,6 +71,40 @@
             "type": "string",
             "pattern": "^([a-zA-Z]+[\\w._-]+:)?[a-zA-Z]+[\\w._-]+$"
         },
+        "KubernetesConfig": {
+            "type": "object",
+            "description": "Kubernetes configuration for the project",
+            "properties": {
+                "namespace": {
+                    "type": "string",
+                    "description": "Default Kubernetes namespace to use"
+                },
+                "context": {
+                    "type": "string",
+                    "description": "Kubernetes context to use from kubeconfig"
+                },
+                "selectorLabel": {
+                    "type": "string",
+                    "description": "Label name used in pod selectors. Defaults to 'app.kubernetes.io/component'"
+                }
+            },
+            "additionalProperties": false
+        },
+        "ComponentKubernetesConfig": {
+            "type": "object",
+            "description": "Kubernetes configuration for a component",
+            "properties": {
+                "selector": {
+                    "type": "string",
+                    "description": "Label selector to find pods (e.g., 'app=api,tier=backend'). Defaults to '{componentLabel}={component}'"
+                },
+                "container": {
+                    "type": "string",
+                    "description": "Container name for multi-container pods"
+                }
+            },
+            "additionalProperties": false
+        },
         "DefaultsConfig": {
             "type": "object",
             "description": "Default settings for build aspects",
@@ -103,6 +137,9 @@
                             }
                         }
                     }
+                },
+                "kubernetes": {
+                    "$ref": "#/definitions/KubernetesConfig"
                 }
             }
         },
@@ -138,7 +175,8 @@
                     "items": {
                         "anyOf": [
                             { "const": "local" },
-                            { "const": "container" }
+                            { "const": "container" },
+                            { "const": "kubernetes" }
                         ]
                     }
                 },
@@ -200,6 +238,9 @@
                     "additionalProperties": {
                         "$ref": "#/definitions/ComponentFlavorConfig"
                     }
+                },
+                "kubernetes": {
+                    "$ref": "#/definitions/ComponentKubernetesConfig"
                 }
             },
             "additionalProperties": false