Skip to content

[7.x] Allow additive csp configuration (#102059)#103405

Merged
pgayvallet merged 1 commit intoelastic:7.xfrom
pgayvallet:backport/7.x/pr-102059
Jun 25, 2021
Merged

[7.x] Allow additive csp configuration (#102059)#103405
pgayvallet merged 1 commit intoelastic:7.xfrom
pgayvallet:backport/7.x/pr-102059

Conversation

@pgayvallet
Copy link
Copy Markdown
Contributor

Backports the following commits to 7.x:

* add additive csp configuration

* add unit tests for new class

* fix types

* adapt test utils

* fix tests

* more unit tests on config

* generated doc

* review comments

* update ascii doc

* update ascii doc links

* automatically add single quotes for keywords

* add missing csp directives

* add more tests

* add additional settings to asciidoc

* add null-check

* revert test config props

* fix usage collection usage

* some review comments

* last review comments

* add kibana-docker variables

* try to fix doc reference

* try to fix doc reference again

* fix tests
# Conflicts:
#	src/core/server/csp/config.ts
#	src/core/server/csp/csp_config.test.ts
@pgayvallet pgayvallet added the backport This PR is a backport of another PR label Jun 25, 2021
@pgayvallet pgayvallet enabled auto-merge (squash) June 25, 2021 18:50
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
core 1054 1055 +1

Public APIs missing exports

Total count of every type that is part of your API that should be exported but is not. This will cause broken links in the API documentation system. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats exports for more detailed information.

id before after diff
core 29 30 +1
Unknown metric groups

API count

id before after diff
core 2283 2284 +1

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@pgayvallet pgayvallet merged commit b02ddaf into elastic:7.x Jun 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants