Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Adam Locke <[email protected]>
  • Loading branch information
watson and Adam Locke authored Sep 14, 2021
1 parent 8c1f182 commit a7abfb8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions x-pack/plugins/security/server/config_deprecations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ describe('Config Deprecations', () => {
expect(migrated).toEqual(config);
expect(messages).toMatchInlineSnapshot(`
Array [
"Enabling or disabling the Security plugin in Kibana is deprecated. To enable or disable security, set \\"xpack.security.enabled\\" to true or false in elasticsearch.yml.",
"Enabling or disabling the Security plugin in Kibana is deprecated. Configure security in Elasticsearch instead.",
]
`);
});
Expand All @@ -409,7 +409,7 @@ describe('Config Deprecations', () => {
expect(migrated).toEqual(config);
expect(messages).toMatchInlineSnapshot(`
Array [
"Enabling or disabling the Security plugin in Kibana is deprecated. To enable or disable security, set \\"xpack.security.enabled\\" to true or false in elasticsearch.yml.",
"Enabling or disabling the Security plugin in Kibana is deprecated. Configure security in Elasticsearch instead.",
]
`);
});
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/security/server/config_deprecations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,18 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
}),
message: i18n.translate('xpack.security.deprecations.enabledMessage', {
defaultMessage:
'Enabling or disabling the Security plugin in Kibana is deprecated. To enable or disable security, set "xpack.security.enabled" to true or false in elasticsearch.yml.',
'Enabling or disabling the Security plugin in Kibana is deprecated. Configure security in Elasticsearch instead.',
}),
documentationUrl:
'https://www.elastic.co/guide/en/elasticsearch/reference/current/secure-cluster.html',
correctiveActions: {
manualSteps: [
i18n.translate('xpack.security.deprecations.enabled.manualStepOneMessage', {
defaultMessage: 'Remove "xpack.security.enabled" from your Kibana configuration.',
defaultMessage: 'Remove "xpack.security.enabled" from kibana.yml.',
}),
i18n.translate('xpack.security.deprecations.enabled.manualStepTwoMessage', {
defaultMessage:
'Set "xpack.security.enabled" accordingly in elasticsearch.yml instead.',
'Set "xpack.security.enabled" to true or false in elasticsearch.yml to enable or disable security.',
}),
],
},
Expand Down

0 comments on commit a7abfb8

Please sign in to comment.