fix hbs format

kaiyan-sheng · kaiyan-sheng · commit 378b40e4e0d9 · 2024-07-17T18:32:30.000-06:00
diff --git a/packages/aws/data_stream/awshealth/fields/fields.yml b/packages/aws/data_stream/awshealth/fields/fields.yml
@@ -5,6 +5,7 @@
       type: group
       description: >
         AWS Health metrics.
+
       fields:
         - name: affected_entities_others
           type: float
@@ -116,3 +117,4 @@
           type: keyword
           description: >
             The unique identifier for the affected entities. The entity ARN has the format: `arn:aws:health:<entity-region>:<aws-account>:entity/<entity-id>`. For example, `arn:aws:health:us-east-1:111222333444:entity/AVh5GGT7ul1arKr1sE1K`.
+
diff --git a/packages/aws/data_stream/awshealth/manifest.yml b/packages/aws/data_stream/awshealth/manifest.yml
@@ -47,5 +47,6 @@ streams:
         show_user: false
         description: >
           Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the events are shipped. See [Processors](https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html) for details.
+
     title: AWS Health metrics
     description: Collect AWS Health metrics
diff --git a/packages/aws/data_stream/cloudfront_logs/agent/stream/aws-s3.yml.hbs b/packages/aws/data_stream/cloudfront_logs/agent/stream/aws-s3.yml.hbs
@@ -18,12 +18,6 @@ bucket_list_prefix: {{bucket_list_prefix}}
 {{#if queue_url}}
 queue_url: {{queue_url}}
 {{/if}}
-{{#if credential_profile_name}}
-credential_profile_name: {{credential_profile_name}}
-{{/if}}
-{{#if shared_credential_file}}
-shared_credential_file: {{shared_credential_file}}
-{{/if}}
 {{#if visibility_timeout}}
 visibility_timeout: {{visibility_timeout}}
 {{/if}}
@@ -33,6 +27,14 @@ api_timeout: {{api_timeout}}
 {{#if max_number_of_messages}}
 max_number_of_messages: {{max_number_of_messages}}
 {{/if}}
+
+{{/if}}
+{{#if credential_profile_name}}
+credential_profile_name: {{credential_profile_name}}
+{{/if}}
+{{#if shared_credential_file}}
+shared_credential_file: {{shared_credential_file}}
+{{/if}}
 {{#if endpoint}}
 endpoint: {{endpoint}}
 {{/if}}
diff --git a/packages/aws/data_stream/s3access/agent/stream/aws-s3.yml.hbs b/packages/aws/data_stream/s3access/agent/stream/aws-s3.yml.hbs
@@ -18,12 +18,6 @@ bucket_list_prefix: {{bucket_list_prefix}}
 {{#if queue_url}}
 queue_url: {{queue_url}}
 {{/if}}
-{{#if credential_profile_name}}
-credential_profile_name: {{credential_profile_name}}
-{{/if}}
-{{#if shared_credential_file}}
-shared_credential_file: {{shared_credential_file}}
-{{/if}}
 {{#if visibility_timeout}}
 visibility_timeout: {{visibility_timeout}}
 {{/if}}
@@ -33,6 +27,14 @@ api_timeout: {{api_timeout}}
 {{#if max_number_of_messages}}
 max_number_of_messages: {{max_number_of_messages}}
 {{/if}}
+
+{{/if}}
+{{#if credential_profile_name}}
+credential_profile_name: {{credential_profile_name}}
+{{/if}}
+{{#if shared_credential_file}}
+shared_credential_file: {{shared_credential_file}}
+{{/if}}
 {{#if endpoint}}
 endpoint: {{endpoint}}
 {{/if}}
diff --git a/packages/aws/data_stream/waf/agent/stream/aws-s3.yml.hbs b/packages/aws/data_stream/waf/agent/stream/aws-s3.yml.hbs
@@ -18,13 +18,6 @@ bucket_list_prefix: {{bucket_list_prefix}}
 {{#if queue_url}}
 queue_url: {{queue_url}}
 {{/if}}
-content_type: application/json
-{{#if credential_profile_name}}
-credential_profile_name: {{credential_profile_name}}
-{{/if}}
-{{#if shared_credential_file}}
-shared_credential_file: {{shared_credential_file}}
-{{/if}}
 {{#if visibility_timeout}}
 visibility_timeout: {{visibility_timeout}}
 {{/if}}
@@ -34,6 +27,14 @@ api_timeout: {{api_timeout}}
 {{#if max_number_of_messages}}
 max_number_of_messages: {{max_number_of_messages}}
 {{/if}}
+
+{{/if}}
+{{#if credential_profile_name}}
+credential_profile_name: {{credential_profile_name}}
+{{/if}}
+{{#if shared_credential_file}}
+shared_credential_file: {{shared_credential_file}}
+{{/if}}
 {{#if endpoint}}
 endpoint: {{endpoint}}
 {{/if}}
diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
@@ -78,7 +78,7 @@ vars:
     show_user: false
     description: URL to proxy connections in the form of http\[s\]://<user>:<password>@<server name/ip>:<port>
 policy_templates:
-  - name: awshealth 
+  - name: awshealth
     title: AWS Health
     description: Collect AWS Health metrics with Elastic Agent (experimental)
     data_streams:
