Merge remote-tracking branch 'oss/master' into bb/noderoster-optimize-query

Author: benbroadaway

cli/src/main/java/com/walmartlabs/concord/cli/AbortException.java

@@ -0,0 +1,28 @@
+package com.walmartlabs.concord.cli;
+
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2025 Walmart Inc.
+ * -----
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =====
+ */
+
+public class AbortException extends RuntimeException {
+
+    public AbortException() {
+        super("Aborted");
+    }
+}

cli/src/main/java/com/walmartlabs/concord/cli/CliConfig.java

@@ -20,6 +20,7 @@
  * =====
  */
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -38,7 +39,8 @@
 public record CliConfig(Map<String, CliConfigContext> contexts) {
 
     public static CliConfig load(Path path) throws IOException {
-        var mapper = new YAMLMapper();
+        var mapper = new YAMLMapper()
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
         JsonNode defaults = mapper.readTree(readDefaultConfig());
 

cli/src/main/java/com/walmartlabs/concord/cli/runner/secrets/RemoteSecretsProvider.java

@@ -20,6 +20,7 @@
  * =====
  */
 
+import com.walmartlabs.concord.cli.AbortException;
 import com.walmartlabs.concord.cli.Version;
 import com.walmartlabs.concord.client2.*;
 import com.walmartlabs.concord.common.secret.BinaryDataSecret;
@@ -190,8 +191,7 @@ private void askForAccessConfirmation(String orgName, String secretName) throws
         int response = System.in.read();
         // y == 121, Y == 89
         if (response != 121 && response != 89) {
-            System.out.println(ansi().fgRed().a("Aborting.").reset());
-            System.exit(-1);
+            throw new AbortException();
         }
     }
 }

pom.xml

@@ -130,6 +130,7 @@
                     <processStartTag>*****</processStartTag>
                     <sectionDelimiter>-----</sectionDelimiter>
                     <processEndTag>=====</processEndTag>
+                    <trimHeaderLine>true</trimHeaderLine>
                     <roots>
                         <root>src/main/java</root>
                         <root>src/test/java</root>