Merge branch 'master' into directory-enforcement

Author: ibodrov

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>

server/plugins/noderoster/impl/src/main/java/com/walmartlabs/concord/server/plugins/noderoster/processor/AnsibleEventsProcessor.java

@@ -112,31 +112,45 @@ public List<AnsibleEvent> list(EventMarker marker, OffsetDateTime startTimestamp
             return txResult(tx -> {
                 ProcessQueue pq = PROCESS_QUEUE.as("pq");
                 ProcessEvents pe = PROCESS_EVENTS.as("pe");
-                Field<String> username = tx.select(USERS.USERNAME).from(USERS).where(USERS.USER_ID.eq(pq.INITIATOR_ID)).asField();
-
                 Field<Object> eventData = function("jsonb_strip_nulls", Object.class, pe.EVENT_DATA);
-                SelectConditionStep<Record9<UUID, Long, UUID, OffsetDateTime, OffsetDateTime, Object, String, UUID, UUID>> s = tx.select(
-                        pe.EVENT_ID,
-                        pe.EVENT_SEQ,
-                        pe.INSTANCE_ID,
-                        pe.INSTANCE_CREATED_AT,
-                        pe.EVENT_DATE,
-                        eventData,
-                        username,
-                        pq.INITIATOR_ID,
-                        pq.PROJECT_ID)
-                        .from(pe)
-                        .innerJoin(pq).on(pq.INSTANCE_ID.eq(pe.INSTANCE_ID).and(pq.CREATED_AT.eq(pe.INSTANCE_CREATED_AT)))
-                        .where(pe.EVENT_TYPE.eq("ANSIBLE")
-                                .and(pe.EVENT_SEQ.greaterThan(marker.eventSeq())));
+
+                SelectConditionStep<Record6<UUID, Long, UUID, OffsetDateTime, OffsetDateTime, Object>> selectEventsSubQuery =
+                        tx.select(pe.EVENT_ID,
+                                pe.EVENT_SEQ,
+                                pe.INSTANCE_ID,
+                                pe.INSTANCE_CREATED_AT,
+                                pe.EVENT_DATE,
+                                eventData.as("event_data"))
+                            .from(pe)
+                            .where(pe.EVENT_TYPE.eq("ANSIBLE"))
+                            .and(pe.EVENT_SEQ.greaterThan(marker.eventSeq()));
 
                 if (startTimestamp != null) {
-                    s.and(pe.INSTANCE_CREATED_AT.greaterOrEqual(startTimestamp));
+                    selectEventsSubQuery.and(pe.INSTANCE_CREATED_AT.greaterOrEqual(startTimestamp));
                 }
 
-                return s.orderBy(pe.EVENT_SEQ)
+                Table<Record6<UUID, Long, UUID, OffsetDateTime, OffsetDateTime, Object>> eventsAlias = selectEventsSubQuery
+                        .orderBy(pe.EVENT_SEQ)
                         .limit(count)
-                        .fetch(this::toEntity);
+                        .asTable("events_batch");
+
+                SelectOnConditionStep<Record9<UUID, Long, UUID, OffsetDateTime, OffsetDateTime, Object, String, UUID, UUID>> s = tx.select(
+                                eventsAlias.field("event_id", UUID.class),
+                                eventsAlias.field("event_seq", Long.class),
+                                eventsAlias.field("instance_id", UUID.class),
+                                eventsAlias.field("instance_created_at", OffsetDateTime.class),
+                                eventsAlias.field("event_date", OffsetDateTime.class),
+                                eventsAlias.field("event_data", Object.class),
+                                USERS.USERNAME,
+                                pq.INITIATOR_ID,
+                                pq.PROJECT_ID
+                        )
+                        .from(eventsAlias)
+                        .leftOuterJoin(pq)
+                                .on(pq.INSTANCE_ID.eq(eventsAlias.field("instance_id", UUID.class)))
+                        .leftOuterJoin(USERS).on(USERS.USER_ID.eq(pq.INITIATOR_ID));
+
+                return s.fetch(this::toEntity);
             });
         }