fix template free text parameters

elastic · Jun 19, 2024 · 44d0f1f · 44d0f1f
1 parent 2f81934
commit 44d0f1f
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 46 deletions.
diff --git a/x-pack/plugins/integration_assistant/server/integration_builder/build_integration.ts b/x-pack/plugins/integration_assistant/server/integration_builder/build_integration.ts
@@ -137,7 +137,7 @@ function createPackageManifest(packageDir: string, integration: Integration): vo
     package_name: integration.name,
     package_version: '0.1.0',
     package_description: integration.description,
-    package_owner: `'@elastic/custom-integrations'`,
+    package_owner: '@elastic/custom-integrations',
     min_version: '^8.13.0',
     inputs: uniqueInputsList,
   });

diff --git a/...k/plugins/integration_assistant/server/templates/manifest/aws_cloudwatch_manifest.yml.njk b/...k/plugins/integration_assistant/server/templates/manifest/aws_cloudwatch_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: aws-cloudwatch
   template_path: aws-cloudwatch.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: log_group_arn
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/aws_s3_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/aws_s3_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: aws-s3
   template_path: aws-s3.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: bucket_arn
       type: text

diff --git a/...ugins/integration_assistant/server/templates/manifest/azure_blob_storage_manifest.yml.njk b/...ugins/integration_assistant/server/templates/manifest/azure_blob_storage_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: azure-blob-storage
   template_path: azure-blob-storage.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: storage_url
       type: text

diff --git a/...k/plugins/integration_assistant/server/templates/manifest/azure_eventhub_manifest.yml.njk b/...k/plugins/integration_assistant/server/templates/manifest/azure_eventhub_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: azure-eventhub
   template_path: azure-eventhub.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: eventhub
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/cloudfoundry_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/cloudfoundry_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: cloudfoundry
   template_path: cloudfoundry.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: api_address
       type: text
@@ -30,31 +32,36 @@
       title: Shard ID
       required: false
       show_user: false
-      description: Shard ID for the connection with Cloud Foundry. Use the same ID across multiple filebeat to shard the load of events. Default: "(generated UUID)".
+      description: |
+        Shard ID for the connection with Cloud Foundry. Use the same ID across multiple filebeat to shard the load of events. Default: "(generated UUID)".
     - name: version
       type: text
       title: Cloud Foundry API Version
       required: false
       show_user: false
-      description: Consumer API version to connect with Cloud Foundry to collect events. Use v1 to collect events using Doppler/Traffic Control. Use v2 to collect events from the RLP Gateway. Default: "v1".
+      description: |
+        Consumer API version to connect with Cloud Foundry to collect events. Use v1 to collect events using Doppler/Traffic Control. Use v2 to collect events from the RLP Gateway. Default: "v1".
     - name: doppler_address
       type: text
       title: Doppler Address
       required: false
       show_user: false
-      description: The URL of the Cloud Foundry Doppler Websocket. Optional. Default: "(value from ${api_address}/v2/info)".
+      description: |
+        The URL of the Cloud Foundry Doppler Websocket. Optional. Default: "(value from ${api_address}/v2/info)".
     - name: uaa_address
       type: text
       title: UAA Address
       required: false
       show_user: false
-      description: The URL of the Cloud Foundry UAA API. Optional. Default: "(value from ${api_address}/v2/info)".
+      description: |
+        The URL of the Cloud Foundry UAA API. Optional. Default: "(value from ${api_address}/v2/info)".
     - name: rlp_address
       type: text
       title: RLP Address
       required: false
       show_user: false
-      description: The URL of the Cloud Foundry RLP Gateway. Optional. Default: "(log-stream subdomain under the same domain as api_server)".
+      description: |
+        The URL of the Cloud Foundry RLP Gateway. Optional. Default: "(log-stream subdomain under the same domain as api_server)".
     - name: custom
       type: yaml
       title: Additional Log Configuration Options

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/data_stream.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/data_stream.yml.njk
@@ -1,4 +1,5 @@
-title: {{ title }}
+title: |
+  {{ title }}
 type: logs
 streams:{% for data_stream in data_streams %}
 {{ data_stream | indent(2, true) }}{% endfor %}
diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/filestream_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/filestream_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: filestream
   template_path: filestream.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: paths
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/gcp_pubsub_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/gcp_pubsub_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: gcp-pubsub
   template_path: gcp-pubsub.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: project_id
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/gcs_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/gcs_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: gcs
   template_path: gcs.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: project_id
       type: text

diff --git a/...ck/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk b/...ck/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: http_endpoint
   template_path: http_endpoint.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: listen_address
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/journald_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/journald_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: journald
   template_path: journald.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: include_matches
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: kafka
   template_path: kafka.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: hosts
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/logfile_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/logfile_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: logfile
   template_path: logfile.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: paths
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/package_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/package_manifest.yml.njk
@@ -1,8 +1,9 @@
-format_version: {{ format_version }}
+format_version: "{{ format_version }}"
 name: {{ package_name }}
-title: {{ package_title }}
+title: |
+  {{ package_title }}
 version: {{ package_version }}
-description: {{ package_description }}
+description: "{{ package_description }}"
 type: integration
 categories:
   - security
@@ -12,17 +13,19 @@ conditions:
     version: {{ min_version }}
 icons:
   - src: /img/logo.svg
-    title: {{ package_name }} Logo
+    title: "{{ package_name }} Logo"
     size: 32x32
     type: image/svg+xml
 policy_templates:
   - name: {{ package_name }}
-    title: {{ package_title }}
-    description: {{ package_description}}
+    title: |
+      {{ package_title }}
+    description: "{{ package_description}}"
     inputs: {% for input in inputs %}
       - type: {{ input.type }}
-        title: {{ input.title }}
+        title: |
+          {{ input.title }}
         description: {{ input.description }} {% endfor %}
 owner:
-  github: {{ package_owner }}
+  github: "{{ package_owner }}"
   type: elastic
diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/ssl_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/ssl_manifest.yml.njk
@@ -36,21 +36,24 @@
     multi: true
     required: false
     show_user: false
-    description: The list of root certificates for verifications is required. If certificate_authorities is empty or not set, the system keystore is used. Example: /etc/pki/root/ca.pem
+    description: |
+      The list of root certificates for verifications is required. If certificate_authorities is empty or not set, the system keystore is used. Example: /etc/pki/root/ca.pem
   - name: ssl_certificate
     type: text
     title: SSL Certificate
     multi: false
     required: false
     show_user: false
-    description: Path to the SSL certificate file to be used. Example: /etc/pki/client/cert.pem
+    description: |
+      Path to the SSL certificate file to be used. Example: /etc/pki/client/cert.pem
   - name: ssl_certificate_key
     type: text
     title: SSL Certificate Key
     multi: false
     required: false
     show_user: false
-    description: Path to the SSL certificate key file to be used. Example: /etc/pki/client/cert.key
+    description: |
+      Path to the SSL certificate key file to be used. Example: /etc/pki/client/cert.key
   - name: ssl_certificate_key_passphrase
     type: text
     title: SSL Certificate Key Passphrase

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/tcp_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/tcp_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: tcp
   template_path: tcp.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: listen_address
       type: text

diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/udp_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/udp_manifest.yml.njk
@@ -1,7 +1,9 @@
 - input: udp
   template_path: udp.yml.hbs
-  title: {{ data_stream_title }}
-  description: {{ data_stream_description }}
+  title: |
+    {{ data_stream_title }}
+  description: |
+    {{ data_stream_description }}
   vars:
     - name: listen_address
       type: text