feat(core): Add autoconfigure for key splitting

.github/workflows/checks.yaml

@@ -139,7 +139,7 @@ jobs:
  --client-secret=secret \
  --platform-endpoint=localhost:8080 \
  -i \
- encrypt --kas-url=localhost:8080 --mime-type=text/plain --attr https://example.com/attr/attr1/value/value1 -f data -m 'here is some metadata' > test.tdf
+ encrypt --kas-url=localhost:8080 --mime-type=text/plain --attr https://example.com/attr/attr1/value/value1 --autoconfigure=false -f data -m 'here is some metadata' > test.tdf
 
  java -jar target/cmdline.jar \
  --client-id=opentdf-sdk \

cmdline/src/main/java/io/opentdf/platform/Command.java

@@ -13,12 +13,10 @@
 import javax.crypto.NoSuchPaddingException;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Path;
@@ -30,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
 @CommandLine.Command(name = "tdf")
@@ -54,8 +53,9 @@ void encrypt(
  @Option(names = {"-m", "--metadata"}, defaultValue = Option.NULL_VALUE) Optional<String> metadata,
  // cant split on optional parameters
  @Option(names = {"-a", "--attr"}, defaultValue = Option.NULL_VALUE) Optional<String> attributes,
+ @Option(names = {"-c", "--autoconfigure"}, defaultValue = Option.NULL_VALUE) Optional<Boolean> autoconfigure,
  @Option(names = {"--mime-type"}, defaultValue = Option.NULL_VALUE) Optional<String> mimeType) throws
- IOException, JOSEException {
+ IOException, JOSEException, AutoConfigureException, InterruptedException, ExecutionException {
 
  var sdk = buildSDK();
  var kasInfos = kas.stream().map(k -> {
@@ -67,15 +67,18 @@ void encrypt(
  List<Consumer<Config.TDFConfig>> configs = new ArrayList<>();
  configs.add(Config.withKasInformation(kasInfos));
  metadata.map(Config::withMetaData).ifPresent(configs::add);
+ autoconfigure.map(Config::withAutoconfigure).ifPresent(configs::add);
  mimeType.map(Config::withMimeType).ifPresent(configs::add);
- attributes.ifPresent(attr -> {
- configs.add(Config.withDataAttributes(attr.split(",")));
- });
-
+ if (attributes.isPresent()){
+ configs.add(Config.withDataAttributes(attributes.get().split(",")));
+ }
  var tdfConfig = Config.newTDFConfig(configs.toArray(Consumer[]::new));
  try (var in = file.isEmpty() ? new BufferedInputStream(System.in) : new FileInputStream(file.get())) {
  try (var out = new BufferedOutputStream(System.out)) {
- new TDF().createTDF(in, out, tdfConfig, sdk.getServices().kas());
+ new TDF().createTDF(in, out, tdfConfig, 
+ sdk.getServices().kas(), 
+ sdk.getServices().attributes()
+ );
  }
  }
  }

sdk/pom.xml

@@ -127,5 +127,13 @@
  <artifactId>java-json-canonicalization</artifactId>
  <version>1.1</version>
  </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ </dependency>
  </dependencies>
 </project>

sdk/src/main/java/io/opentdf/platform/sdk/AutoConfigureException.java

@@ -0,0 +1,15 @@
+package io.opentdf.platform.sdk;
+
+public class AutoConfigureException extends RuntimeException {
+ public AutoConfigureException(String message) {
+ super(message);
+ }
+
+ public AutoConfigureException(Exception e) {
+ super(e);
+ }
+
+ public AutoConfigureException(String message, Exception e) {
+ super(message, e);
+ }
+}