From 5e0ff7865b2377b3a8a1828d5f3209102b3da1b7 Mon Sep 17 00:00:00 2001 From: Dan Torrey Date: Thu, 4 Dec 2025 13:59:47 -0600 Subject: [PATCH] Look up final input before returning summary (#24421) * Restore input ID assignment on create * Add change log * Revert input save changes, look up input after saving --- changelog/unreleased/issue-12248.toml | 2 +- .../org/graylog/aws/inputs/cloudtrail/api/CloudTrailDriver.java | 2 +- .../java/org/graylog/integrations/aws/service/AWSService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog/unreleased/issue-12248.toml b/changelog/unreleased/issue-12248.toml index 89f1fce3d3..cace62ed44 100644 --- a/changelog/unreleased/issue-12248.toml +++ b/changelog/unreleased/issue-12248.toml @@ -2,4 +2,4 @@ type = "a" message = "Improved Inputs Overview Page: The page has been revamped with pagination and various UI enhancements to improve navigation." pulls = ["24245", "Graylog2/graylog-plugin-enterprise#12538"] -issues = ["12248"] +issues = ["12248", "graylog-plugin-enterprise#24421"] diff --git a/graylog2-server/src/main/java/org/graylog/aws/inputs/cloudtrail/api/CloudTrailDriver.java b/graylog2-server/src/main/java/org/graylog/aws/inputs/cloudtrail/api/CloudTrailDriver.java index 4da28af498..595cc857b0 100644 --- a/graylog2-server/src/main/java/org/graylog/aws/inputs/cloudtrail/api/CloudTrailDriver.java +++ b/graylog2-server/src/main/java/org/graylog/aws/inputs/cloudtrail/api/CloudTrailDriver.java @@ -124,7 +124,7 @@ public class CloudTrailDriver { final String newInputId = inputService.save(input); LOG.info("New CloudTrail input created. id [{}] request [{}]", newInputId, request); - return input; + return inputService.find(newInputId); } catch (NoSuchInputTypeException e) { LOG.error("There is no such input type registered. {}", ExceptionUtils.getRootCauseMessage(e)); throw new NotFoundException("There is no such input type registered.", e); diff --git a/graylog2-server/src/main/java/org/graylog/integrations/aws/service/AWSService.java b/graylog2-server/src/main/java/org/graylog/integrations/aws/service/AWSService.java index d5af0ee8dc..1e7ff72b89 100644 --- a/graylog2-server/src/main/java/org/graylog/integrations/aws/service/AWSService.java +++ b/graylog2-server/src/main/java/org/graylog/integrations/aws/service/AWSService.java @@ -154,7 +154,7 @@ public class AWSService { final Input input = this.inputService.create(messageInput.asMap()); final String newInputId = inputService.save(input); LOG.debug("New AWS input created. id [{}] request [{}]", newInputId, request); - return input; + return inputService.find(newInputId); } catch (NoSuchInputTypeException e) { LOG.error("There is no such input type registered.", e); throw new NotFoundException("There is no such input type registered.", e);