From 962d49554bb08394e0c52e71d3134f05f5f62267 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Thu, 19 Dec 2024 07:52:46 -0500
Subject: [PATCH] Fix aws logs duplicated keys in agent template (#12100)

---
 packages/aws_logs/changelog.yml                            | 7 ++++++-
 .../data_stream/generic/agent/stream/aws-s3.yml.hbs        | 7 +------
 packages/aws_logs/manifest.yml                             | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/aws_logs/changelog.yml b/packages/aws_logs/changelog.yml
index 45afe22da49..0c773d8f9ae 100644
--- a/packages/aws_logs/changelog.yml
+++ b/packages/aws_logs/changelog.yml
@@ -1,3 +1,8 @@
+- version: 1.5.2
+  changes:
+    - description: Fix dupplicated keys buffer_size, fips_enabled, in agent template.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/12100
 - version: "1.5.1"
   changes:
     - description: Add required permissions for Custom AWS Logs.
@@ -20,7 +25,7 @@
       link: https://github.com/elastic/integrations/pull/11681
 - version: "1.4.0"
   changes:
-    - description: Update file_selectors field to be able to receive multiline configuration 
+    - description: Update file_selectors field to be able to receive multiline configuration
       type: enhancement
       link: https://github.com/elastic/integrations/pull/10789
 - version: "1.3.1"
diff --git a/packages/aws_logs/data_stream/generic/agent/stream/aws-s3.yml.hbs b/packages/aws_logs/data_stream/generic/agent/stream/aws-s3.yml.hbs
index 27f81c074d6..d2d6cb80d3f 100644
--- a/packages/aws_logs/data_stream/generic/agent/stream/aws-s3.yml.hbs
+++ b/packages/aws_logs/data_stream/generic/agent/stream/aws-s3.yml.hbs
@@ -65,9 +65,7 @@ encoding: {{ encoding }}
 {{#if expand_event_list_from_field }}
 expand_event_list_from_field: {{ expand_event_list_from_field }}
 {{/if}}
-{{#if buffer_size }}
-buffer_size: {{ buffer_size }}
-{{/if}}
+
 {{#if fips_enabled }}
 fips_enabled: {{ fips_enabled }}
 {{/if}}
@@ -128,9 +126,6 @@ session_token: {{session_token}}
 {{#if role_arn}}
 role_arn: {{role_arn}}
 {{/if}}
-{{#if fips_enabled}}
-fips_enabled: {{fips_enabled}}
-{{/if}}
 {{#if proxy_url }}
 proxy_url: {{proxy_url}}
 {{/if}}
diff --git a/packages/aws_logs/manifest.yml b/packages/aws_logs/manifest.yml
index 65f3f6bef38..6c242ef67e4 100644
--- a/packages/aws_logs/manifest.yml
+++ b/packages/aws_logs/manifest.yml
@@ -3,7 +3,7 @@ name: aws_logs
 title: Custom AWS Logs
 description: Collect raw logs from AWS S3 or CloudWatch with Elastic Agent.
 type: integration
-version: "1.5.1"
+version: "1.5.2"
 categories:
   - observability
   - custom