From f55d719cf79a58ca88a17a9fc5a9341910cae6e5 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Mon, 21 Aug 2023 16:40:22 -0700
Subject: [PATCH] [8.8] [OAS] Remove redundant connector properties (#163987)
 (#164361)

# Backport

This will backport the following commits from `main` to `8.8`:
- [[OAS] Remove redundant connector properties
(#163987)](https://github.com/elastic/kibana/pull/163987)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Lisa
Cawley","email":"lcawley@elastic.co"},"sourceCommit":{"committedDate":"2023-08-21T16:29:08Z","message":"[OAS]
Remove redundant connector properties
(#163987)","sha":"c1d2834f1aa675f2682793d83ac9ad07c3854990","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:ResponseOps","docs","Feature:Actions/ConnectorTypes","backport:prev-minor","v8.10.0","v8.11.0"],"number":163987,"url":"https://github.com/elastic/kibana/pull/163987","mergeCommit":{"message":"[OAS]
Remove redundant connector properties
(#163987)","sha":"c1d2834f1aa675f2682793d83ac9ad07c3854990"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/164338","number":164338,"state":"MERGED","mergeCommit":{"sha":"df9b17fb7ce2b90db9d954f17432a8906faee3b7","message":"[8.10]
[OAS] Remove redundant connector properties (#163987) (#164338)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.10`:\n- [[OAS] Remove redundant connector
properties\n(#163987)](https://github.com/elastic/kibana/pull/163987)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Lisa\nCawley\",\"email\":\"lcawley@elastic.co\"},\"sourceCommit\":{\"committedDate\":\"2023-08-21T16:29:08Z\",\"message\":\"[OAS]\nRemove
redundant connector
properties\n(#163987)\",\"sha\":\"c1d2834f1aa675f2682793d83ac9ad07c3854990\",\"branchLabelMapping\":{\"^v8.11.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:ResponseOps\",\"docs\",\"Feature:Actions/ConnectorTypes\",\"backport:prev-minor\",\"v8.10.0\",\"v8.11.0\"],\"number\":163987,\"url\":\"https://github.com/elastic/kibana/pull/163987\",\"mergeCommit\":{\"message\":\"[OAS]\nRemove
redundant connector
properties\n(#163987)\",\"sha\":\"c1d2834f1aa675f2682793d83ac9ad07c3854990\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.10\"],\"targetPullRequestStates\":[{\"branch\":\"8.10\",\"label\":\"v8.10.0\",\"labelRegex\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"},{\"branch\":\"main\",\"label\":\"v8.11.0\",\"labelRegex\":\"^v8.11.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/163987\",\"number\":163987,\"mergeCommit\":{\"message\":\"[OAS]\nRemove
redundant connector
properties\n(#163987)\",\"sha\":\"c1d2834f1aa675f2682793d83ac9ad07c3854990\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Lisa Cawley
<lcawley@elastic.co>"}},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163987","number":163987,"mergeCommit":{"message":"[OAS]
Remove redundant connector properties
(#163987)","sha":"c1d2834f1aa675f2682793d83ac9ad07c3854990"}}]}]
BACKPORT-->
---
 .../connector-apis-passthru.asciidoc          |  4 +--
 .../plugins/actions/docs/openapi/bundled.json | 34 ++++++++-----------
 .../plugins/actions/docs/openapi/bundled.yaml | 16 ++++-----
 .../update_connector_request_slack_api.yaml   |  2 --
 ...pdate_connector_request_slack_webhook.yaml |  2 --
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/docs/api-generated/connectors/connector-apis-passthru.asciidoc b/docs/api-generated/connectors/connector-apis-passthru.asciidoc
index bd28e90fdb006..0be4bbd800634 100644
--- a/docs/api-generated/connectors/connector-apis-passthru.asciidoc
+++ b/docs/api-generated/connectors/connector-apis-passthru.asciidoc
@@ -2454,7 +2454,7 @@ Any modifications made to this file will be overwritten.
     <div class='model-description'></div>
     <div class="field-items">
       <div class="param">name </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The display name for the connector. </div>
-<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#">secrets_properties_slack_api</a></span>  </div>
+<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#secrets_properties_slack_api">secrets_properties_slack_api</a></span>  </div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">
@@ -2462,7 +2462,7 @@ Any modifications made to this file will be overwritten.
     <div class='model-description'></div>
     <div class="field-items">
       <div class="param">name </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The display name for the connector. </div>
-<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#">secrets_properties_slack_webhook</a></span>  </div>
+<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#secrets_properties_slack_webhook">secrets_properties_slack_webhook</a></span>  </div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">
diff --git a/x-pack/plugins/actions/docs/openapi/bundled.json b/x-pack/plugins/actions/docs/openapi/bundled.json
index 84f433970f1ba..4f5f9e0e92104 100644
--- a/x-pack/plugins/actions/docs/openapi/bundled.json
+++ b/x-pack/plugins/actions/docs/openapi/bundled.json
@@ -12,18 +12,26 @@
       "url": "https://www.elastic.co/licensing/elastic-license"
     }
   },
-  "tags": [
-    {
-      "name": "connectors",
-      "description": "Connector APIs enable you to create and manage connectors."
-    }
-  ],
   "servers": [
     {
       "url": "http://localhost:5601",
       "description": "local"
     }
   ],
+  "security": [
+    {
+      "basicAuth": []
+    },
+    {
+      "apiKeyAuth": []
+    }
+  ],
+  "tags": [
+    {
+      "name": "connectors",
+      "description": "Connector APIs enable you to create and manage connectors."
+    }
+  ],
   "paths": {
     "/s/{spaceId}/api/actions/connector": {
       "post": {
@@ -3650,8 +3658,6 @@
             "description": "The display name for the connector."
           },
           "secrets": {
-            "type": "object",
-            "description": "The secrets object containing the necessary fields for authentication.",
             "$ref": "#/components/schemas/secrets_properties_slack_api"
           }
         }
@@ -3669,8 +3675,6 @@
             "description": "The display name for the connector."
           },
           "secrets": {
-            "type": "object",
-            "description": "The secrets object containing the necessary fields for authentication.",
             "$ref": "#/components/schemas/secrets_properties_slack_webhook"
           }
         }
@@ -4856,13 +4860,5 @@
         }
       }
     }
-  },
-  "security": [
-    {
-      "basicAuth": []
-    },
-    {
-      "apiKeyAuth": []
-    }
-  ]
+  }
 }
\ No newline at end of file
diff --git a/x-pack/plugins/actions/docs/openapi/bundled.yaml b/x-pack/plugins/actions/docs/openapi/bundled.yaml
index 978233686d278..1941ee08552f5 100644
--- a/x-pack/plugins/actions/docs/openapi/bundled.yaml
+++ b/x-pack/plugins/actions/docs/openapi/bundled.yaml
@@ -8,12 +8,15 @@ info:
   license:
     name: Elastic License 2.0
     url: https://www.elastic.co/licensing/elastic-license
-tags:
-  - name: connectors
-    description: Connector APIs enable you to create and manage connectors.
 servers:
   - url: http://localhost:5601
     description: local
+security:
+  - basicAuth: []
+  - apiKeyAuth: []
+tags:
+  - name: connectors
+    description: Connector APIs enable you to create and manage connectors.
 paths:
   /s/{spaceId}/api/actions/connector:
     post:
@@ -2504,8 +2507,6 @@ components:
           type: string
           description: The display name for the connector.
         secrets:
-          type: object
-          description: The secrets object containing the necessary fields for authentication.
           $ref: '#/components/schemas/secrets_properties_slack_api'
     update_connector_request_slack_webhook:
       title: Update Slack connector request
@@ -2518,8 +2519,6 @@ components:
           type: string
           description: The display name for the connector.
         secrets:
-          type: object
-          description: The secrets object containing the necessary fields for authentication.
           $ref: '#/components/schemas/secrets_properties_slack_webhook'
     update_connector_request_swimlane:
       title: Update Swimlane connector request
@@ -3358,6 +3357,3 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/action_response_properties'
-security:
-  - basicAuth: []
-  - apiKeyAuth: []
diff --git a/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml b/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml
index e85a0436a035b..1a0c99c1847a0 100644
--- a/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml
+++ b/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml
@@ -8,6 +8,4 @@ properties:
     type: string
     description: The display name for the connector.
   secrets:
-    type: object
-    description: The secrets object containing the necessary fields for authentication.
     $ref: 'secrets_properties_slack_api.yaml'
diff --git a/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml b/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml
index 4ed93f519f3c2..67b0f9bb310ad 100644
--- a/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml
+++ b/x-pack/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml
@@ -8,6 +8,4 @@ properties:
     type: string
     description: The display name for the connector.
   secrets:
-    type: object
-    description: The secrets object containing the necessary fields for authentication.
     $ref: 'secrets_properties_slack_webhook.yaml'