feat: dial-unified-config — dial-cli (Picocli + Quarkus CLI)

Dockerfile

@@ -6,6 +6,7 @@ COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN --mount=type=secret,id=GPR_USERNAME,env=GPR_USERNAME --mount=type=secret,id=GPR_PASSWORD,env=GPR_PASSWORD gradle --no-daemon build --stacktrace -PdisableCompression=true -x test
 RUN mkdir /build && tar -xf /home/gradle/src/server/build/distributions/server*.tar --strip-components=1 -C /build
+RUN cp /home/gradle/src/cli/build/cli-*-runner.jar /tmp/dial-cli.jar
 
 FROM eclipse-temurin:21-jdk-alpine
 
@@ -24,6 +25,13 @@ RUN adduser -u 1001 --disabled-password --gecos "" appuser
 COPY --from=builder --chown=appuser:appuser /build/ .
 RUN chown -R appuser:appuser /app
 
+# dial-cli alpha distribution: same image doubles as a CLI runner via
+# `docker run <img> dial-cli …`; docker-entrypoint.sh exec's non-empty argv as-is.
+RUN mkdir -p /opt/cli && chown appuser:appuser /opt/cli
+COPY --from=builder --chown=appuser:appuser /tmp/dial-cli.jar /opt/cli/dial-cli.jar
+RUN printf '#!/bin/sh\nexec java -jar /opt/cli/dial-cli.jar "$@"\n' > /usr/local/bin/dial-cli \
+    && chmod +x /usr/local/bin/dial-cli
+
 COPY --chown=appuser:appuser docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 

cli/build.gradle

@@ -0,0 +1,38 @@
+plugins {
+    id 'io.quarkus' version "3.16.4"
+}
+
+dependencies {
+    // Quarkus BOM — pins Picocli, Jackson, Arc, JUnit 5 versions transitively.
+    implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:3.16.4")
+
+    implementation "io.quarkus:quarkus-picocli"
+    implementation "io.quarkus:quarkus-arc"
+    implementation "com.fasterxml.jackson.core:jackson-databind"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+
+    // Reuse DIAL Core data classes (Config, Model, Application, …) — design 05 §6.
+    implementation project(':config')
+
+    testImplementation "org.junit.jupiter:junit-jupiter"
+    testImplementation "org.assertj:assertj-core:3.27.3"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "org.mockito:mockito-junit-jupiter"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+}
+
+application {
+    mainClass = 'com.epam.aidial.cli.DialCli'
+}
+
+test {
+    useJUnitPlatform()
+}
+
+// Quarkus registers `build/classes/java/quarkus-generated-sources/{grpc,avdl,avpr,avsc}` as
+// source dirs of the main source set, and `compileQuarkusGeneratedSourcesJava` outputs into
+// the same locations that `generateEffectiveLombokConfig` walks. Without this dependency
+// Gradle 8.10+ flags an implicit-dependency validation error and the CI build fails.
+tasks.matching { it.name == 'generateEffectiveLombokConfig' }.configureEach {
+    mustRunAfter('compileQuarkusGeneratedSourcesJava')
+}

cli/src/main/java/com/epam/aidial/cli/ApplicationCommand.java

@@ -0,0 +1,206 @@
+package com.epam.aidial.cli;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Spec;
+import picocli.CommandLine.UseDefaultConverter;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+@Command(
+        name = "application",
+        description = "Manage DIAL application entities.",
+        mixinStandardHelpOptions = true,
+        subcommands = {ApplicationCommand.Get.class, ApplicationCommand.List.class,
+                ApplicationCommand.Add.class, ApplicationCommand.Update.class,
+                ApplicationCommand.Delete.class, ApplicationCommand.Validate.class,
+                ApplicationCommand.Promote.class, ApplicationCommand.Diff.class}
+)
+public class ApplicationCommand {
+
+    static final String TYPE = "applications";
+    static final String BUCKET = "public";
+    static final String KIND = "Application";
+    static final String CANONICAL_PREFIX = TYPE + "/" + BUCKET + "/";
+
+    @ParentCommand
+    DialCli parent;
+
+    @Command(name = "get", description = "Get a single application by name (or canonical id).")
+    static class Get implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Parameters(index = "0", description = "Application name or canonical id (applications/<bucket>/<name>).")
+        String name;
+        @Option(names = "--source", description = "Config source: ${COMPLETION-CANDIDATES} (default: ${DEFAULT-VALUE}).", defaultValue = "api")
+        ConfigSource source;
+
+        @Override
+        public Integer call() {
+            return source == ConfigSource.FILE
+                    ? EntityReader.readConfigFileEntity(cmd.parent, spec, TYPE, name)
+                    : EntityReader.readEntity(cmd.parent, spec, TYPE, name);
+        }
+    }
+
+    @Command(name = "list", description = "List applications in the public bucket.")
+    static class List implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Option(names = "--source", description = "Config source: ${COMPLETION-CANDIDATES} (default: ${DEFAULT-VALUE}).", defaultValue = "api")
+        ConfigSource source;
+
+        @Override
+        public Integer call() {
+            return source == ConfigSource.FILE
+                    ? EntityReader.listConfigFileEntities(cmd.parent, spec, TYPE)
+                    : EntityReader.listEntities(cmd.parent, spec, TYPE);
+        }
+    }
+
+    @Command(name = "add", description = "Create an application (PUT with If-None-Match: *). Fails with exit 5 if it already exists.")
+    static class Add implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Option(names = "--name", required = true,
+                description = "Canonical id (applications/public/<name>).")
+        String name;
+        @Option(names = "--from-file", required = true,
+                description = "JSON or YAML file with the application spec (.yaml/.yml parsed as YAML).")
+        Path fromFile;
+        @Option(names = "--template", description = "Template name from CLI profile to apply.")
+        String template;
+        @Option(names = "--param", description = "Template parameter 'key=value' (repeatable).", converter = {UseDefaultConverter.class, ParamValueConverter.class})
+        Map<String, Object> params = new HashMap<>();
+
+        @Override
+        public Integer call() {
+            EntityWriter.addEntity(cmd.parent, spec, TYPE, KIND, BUCKET, name, fromFile, template, params);
+            return 0;
+        }
+    }
+
+    @Command(name = "update",
+            description = "Update an application (PUT). Fails with exit 4 if it does not exist, 6 on stale ETag.")
+    static class Update implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Parameters(index = "0", description = "Canonical id (applications/public/<name>).")
+        String name;
+        @Option(names = "--set", description = "Field override 'dot.path=value' (repeatable). Keys are dot-paths; values are JSON-coerced.",
+                converter = {UseDefaultConverter.class, JsonNodeValueConverter.class})
+        Map<String, JsonNode> sets;
+        @Option(names = "--if-match", description = "ETag for optimistic concurrency. Defaults to the GET response's ETag.")
+        String ifMatch;
+
+        @Override
+        public Integer call() {
+            EntityWriter.updateEntity(cmd.parent, spec, TYPE, BUCKET, name, sets, ifMatch);
+            return 0;
+        }
+    }
+
+    @Command(name = "delete", description = "Delete an application (DELETE). Fails with exit 4 if missing, 6 on stale ETag.")
+    static class Delete implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Parameters(index = "0", description = "Canonical id (applications/public/<name>).")
+        String name;
+        @Option(names = "--if-match", description = "ETag for optimistic concurrency.")
+        String ifMatch;
+
+        @Override
+        public Integer call() {
+            EntityWriter.deleteEntity(cmd.parent, spec, TYPE, BUCKET, name, ifMatch);
+            return 0;
+        }
+    }
+
+    @Command(name = "validate",
+            description = "Validate a proposed application spec via POST /v1/admin/validate (no write).")
+    static class Validate implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Option(names = "--name", required = true,
+                description = "Canonical id (applications/public/<name>).")
+        String name;
+        @Option(names = "--from-file", required = true,
+                description = "JSON or YAML file with the application spec (.yaml/.yml parsed as YAML).")
+        Path fromFile;
+        @Option(names = "--template", description = "Template name from CLI profile to apply.")
+        String template;
+        @Option(names = "--param", description = "Template parameter 'key=value' (repeatable).", converter = {UseDefaultConverter.class, ParamValueConverter.class})
+        Map<String, Object> params = new HashMap<>();
+
+        @Override
+        public Integer call() {
+            return EntityWriter.validateEntity(cmd.parent, spec, TYPE, KIND, BUCKET, name, fromFile, template, params);
+        }
+    }
+
+    @Command(name = "promote",
+            description = "Promote an application from one environment to another via POST /v1/admin/apply.")
+    static class Promote implements Callable<Integer> {
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Option(names = "--from", required = true, description = "Source environment.")
+        String fromEnv;
+        @Option(names = "--to", required = true, description = "Target environment.")
+        String toEnv;
+        @Option(names = "--name", required = true,
+                description = "Canonical id (applications/public/<name>).")
+        String name;
+        @Option(names = "--template",
+                description = "Template name from CLI profile, or 'auto' to reverse-match against the source entity.")
+        String template;
+        @Option(names = "--param", description = "Template parameter 'key=value' (repeatable).", converter = {UseDefaultConverter.class, ParamValueConverter.class})
+        Map<String, Object> params = new HashMap<>();
+
+        @Override
+        public Integer call() {
+            return EntityWriter.promoteEntity(cmd.parent, spec, TYPE, KIND, BUCKET, name, fromEnv, toEnv, template, params);
+        }
+    }
+
+    @Command(name = "diff",
+            description = "Structural diff of a single application (with --name) or all applications between two environments.")
+    static class Diff implements Callable<Integer> {
+
+        @ParentCommand
+        ApplicationCommand cmd;
+        @Spec
+        CommandSpec spec;
+        @Option(names = "--source", required = true, description = "Source environment.")
+        String sourceEnv;
+        @Option(names = "--target", required = true, description = "Target environment.")
+        String targetEnv;
+        @Option(names = "--name", description = "Optional canonical id (applications/public/<name>) for a single-entity diff.")
+        String name;
+
+        @Override
+        public Integer call() {
+            return EntityDiff.run(cmd.parent, spec, TYPE, BUCKET, CANONICAL_PREFIX, sourceEnv, targetEnv, name);
+        }
+    }
+}