Skip to content

Commit

Permalink
[8.8] [OAS] Remove redundant connector properties (#163987) (#164361)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.8`:
- [[OAS] Remove redundant connector properties
(#163987)](#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":"[email protected]"},"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\":\"[email protected]\"},\"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
<[email protected]>"}},{"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-->
  • Loading branch information
lcawl authored Aug 21, 2023
1 parent 2c75c57 commit f55d719
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2454,15 +2454,15 @@ 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">
<h3><a name="update_connector_request_slack_webhook"><code>update_connector_request_slack_webhook</code> - Update Slack connector request</a> <a class="up" href="#__Models">Up</a></h3>
<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">
Expand Down
34 changes: 15 additions & 19 deletions x-pack/plugins/actions/docs/openapi/bundled.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
Expand All @@ -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"
}
}
Expand Down Expand Up @@ -4856,13 +4860,5 @@
}
}
}
},
"security": [
{
"basicAuth": []
},
{
"apiKeyAuth": []
}
]
}
}
16 changes: 6 additions & 10 deletions x-pack/plugins/actions/docs/openapi/bundled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -3358,6 +3357,3 @@ components:
application/json:
schema:
$ref: '#/components/schemas/action_response_properties'
security:
- basicAuth: []
- apiKeyAuth: []
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit f55d719

Please sign in to comment.