From d20545f31625f7fe21e934d344dbfa72c5d30cb2 Mon Sep 17 00:00:00 2001 From: David Mihalcik Date: Thu, 15 Aug 2024 12:19:13 -0400 Subject: [PATCH] feat(cmd): Adds command `--mime-type` opt --- .github/workflows/checks.yaml | 2 +- cmdline/src/main/java/io/opentdf/platform/Command.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index d3f909ff..78b2404f 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -139,7 +139,7 @@ jobs: --client-secret=secret \ --platform-endpoint=localhost:8080 \ -i \ - encrypt --kas-url=localhost:8080 -f data -m 'here is some metadata' > test.tdf + encrypt --kas-url=localhost:8080 --mime-type=text/plain -f data -m 'here is some metadata' > test.tdf java -jar target/cmdline.jar \ --client-id=opentdf-sdk \ diff --git a/cmdline/src/main/java/io/opentdf/platform/Command.java b/cmdline/src/main/java/io/opentdf/platform/Command.java index 8303d22c..5545b19e 100644 --- a/cmdline/src/main/java/io/opentdf/platform/Command.java +++ b/cmdline/src/main/java/io/opentdf/platform/Command.java @@ -50,7 +50,8 @@ class Command { void encrypt( @Option(names = {"-f", "--file"}, defaultValue = Option.NULL_VALUE) Optional file, @Option(names = {"-k", "--kas-url"}, required = true) List kas, - @Option(names = {"-m", "--metadata"}, defaultValue = Option.NULL_VALUE) Optional metadata) throws + @Option(names = {"-m", "--metadata"}, defaultValue = Option.NULL_VALUE) Optional metadata, + @Option(names = {"--mime-type"}, defaultValue = Option.NULL_VALUE) Optional mimeType) throws IOException, JOSEException { var sdk = buildSDK(); @@ -63,6 +64,7 @@ void encrypt( List> configs = new ArrayList<>(); configs.add(Config.withKasInformation(kasInfos)); metadata.map(Config::withMetaData).ifPresent(configs::add); + mimeType.map(Config::withMimeType).ifPresent(configs::add); var tdfConfig = Config.newTDFConfig(configs.toArray(Consumer[]::new)); try (var in = file.isEmpty() ? new BufferedInputStream(System.in) : new FileInputStream(file.get())) {