From f1cb738321646ce3f80668b35fa15facd2b18653 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 11 Sep 2024 03:40:49 +1000
Subject: [PATCH] [8.15] [Automatic Import] Resolve http_endpoint config not
 loading correctly (#191964) (#192502)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Automatic Import] Resolve http_endpoint config not loading correctly
(#191964)](https://github.com/elastic/kibana/pull/191964)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Marius
Iversen","email":"marius.iversen@elastic.co"},"sourceCommit":{"committedDate":"2024-09-03T12:38:57Z","message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","backport:prev-minor","v8.16.0"],"title":"[Automatic
Import] Resolve http_endpoint config not loading
correctly","number":191964,"url":"https://github.com/elastic/kibana/pull/191964","mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/191964","number":191964,"mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}}]}]
BACKPORT-->

Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
---
 .../common/api/model/common_attributes.schema.yaml              | 2 +-
 .../integration_assistant/common/api/model/common_attributes.ts | 2 +-
 .../steps/data_stream_step/data_stream_step.tsx                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
index eafd318b40c33..4c4810b22f9be 100644
--- a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
+++ b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
@@ -109,7 +109,7 @@ components:
         - filestream
         - gcp-pubsub
         - gcs
-        - http-endpoint
+        - http_endpoint
         - journald
         - kafka
         - tcp
diff --git a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
index e5fa41c7f66da..d9e09b453cb41 100644
--- a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
+++ b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
@@ -123,7 +123,7 @@ export const InputType = z.enum([
   'filestream',
   'gcp-pubsub',
   'gcs',
-  'http-endpoint',
+  'http_endpoint',
   'journald',
   'kafka',
   'tcp',
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
index f78ec69639ca2..6e20d739532c5 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
@@ -36,7 +36,7 @@ export const InputTypeOptions: Array<EuiComboBoxOptionOption<InputType>> = [
   { value: 'filestream', label: 'File Stream' },
   { value: 'gcp-pubsub', label: 'GCP Pub/Sub' },
   { value: 'gcs', label: 'Google Cloud Storage' },
-  { value: 'http-endpoint', label: 'HTTP Endpoint' },
+  { value: 'http_endpoint', label: 'HTTP Endpoint' },
   { value: 'journald', label: 'Journald' },
   { value: 'kafka', label: 'Kafka' },
   { value: 'tcp', label: 'TCP' },