github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove sourcemap:write field from api keys creation (#139383)

Browse source 
* Remove sourcemap:write field from api keys creation

* Fix types
This commit is contained in:
Miriam 2022-08-26 14:19:21 +01:00 • committed by GitHub
parent 5cb0c01072
commit a1e0b989ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/apm/common/privilege_type.ts
View file

@ -8,14 +8,12 @@
import * as t from 'io-ts';
export const enum PrivilegeType {
SOURCEMAP = 'sourcemap:write',
EVENT = 'event:write',
AGENT_CONFIG = 'config_agent:read',
}
export const privilegesTypeRt = t.array(
t.union([
t.literal(PrivilegeType.SOURCEMAP),
t.literal(PrivilegeType.EVENT),
t.literal(PrivilegeType.AGENT_CONFIG),
])

28
x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key.tsx
View file

@ -43,12 +43,11 @@ export function CreateAgentKeyFlyout({ onCancel, onSuccess, onError }: Props) {
const [agentKeyBody, setAgentKeyBody] = useState({
name: '',
sourcemap: true,
event: true,
agentConfig: true,
});
const { name, sourcemap, event, agentConfig } = agentKeyBody;
const { name, event, agentConfig } = agentKeyBody;
const currentUser = useCurrentUser();
@ -73,10 +72,6 @@ export function CreateAgentKeyFlyout({ onCancel, onSuccess, onError }: Props) {
try {
const privileges: PrivilegeType[] = [];
if (sourcemap) {
privileges.push(PrivilegeType.SOURCEMAP);
}
if (event) {
privileges.push(PrivilegeType.EVENT);
}
@ -206,27 +201,6 @@ export function CreateAgentKeyFlyout({ onCancel, onSuccess, onError }: Props) {
/>
</EuiFormRow>
<EuiSpacer size="s" />
<EuiFormRow
helpText={i18n.translate(
'xpack.apm.settings.agentKeys.createKeyFlyout.sourcemaps',
{
defaultMessage: 'Required for uploading sourcemaps.',
}
)}
>
<EuiCheckbox
id={htmlIdGenerator()()}
label="sourcemap:write"
checked={sourcemap}
onChange={() =>
setAgentKeyBody((state) => ({
...state,
sourcemap: !state.sourcemap,
}))
}
/>
</EuiFormRow>
<EuiSpacer size="s" />
</EuiFormFieldset>
</EuiForm>
</EuiFlyoutBody>

1
x-pack/plugins/translations/translations/fr-FR.json
View file

@ -7374,7 +7374,6 @@
"xpack.apm.settings.agentKeys.createKeyFlyout.namePlaceholder": "Par exemple, apm-key",
"xpack.apm.settings.agentKeys.createKeyFlyout.nameTitle": "Nom",
"xpack.apm.settings.agentKeys.createKeyFlyout.privilegesFieldset": "Attribuer des privilèges",
"xpack.apm.settings.agentKeys.createKeyFlyout.sourcemaps": "Requis pour le téléchargement des cartes sources.",
"xpack.apm.settings.agentKeys.createKeyFlyout.userTitle": "Utilisateur",
"xpack.apm.settings.agentKeys.deleteConfirmModal.cancel": "Annuler",
"xpack.apm.settings.agentKeys.deleteConfirmModal.delete": "Supprimer",

1
x-pack/plugins/translations/translations/ja-JP.json
View file

@ -7363,7 +7363,6 @@
"xpack.apm.settings.agentKeys.createKeyFlyout.namePlaceholder": "例：apm-key",
"xpack.apm.settings.agentKeys.createKeyFlyout.nameTitle": "名前",
"xpack.apm.settings.agentKeys.createKeyFlyout.privilegesFieldset": "権限を割り当て",
"xpack.apm.settings.agentKeys.createKeyFlyout.sourcemaps": "ソースマップのアップロードに必要です。",
"xpack.apm.settings.agentKeys.createKeyFlyout.userTitle": "ユーザー",
"xpack.apm.settings.agentKeys.deleteConfirmModal.cancel": "キャンセル",
"xpack.apm.settings.agentKeys.deleteConfirmModal.delete": "削除",

1
x-pack/plugins/translations/translations/zh-CN.json
View file

@ -7377,7 +7377,6 @@
"xpack.apm.settings.agentKeys.createKeyFlyout.namePlaceholder": "例如，apm-key",
"xpack.apm.settings.agentKeys.createKeyFlyout.nameTitle": "名称",
"xpack.apm.settings.agentKeys.createKeyFlyout.privilegesFieldset": "分配权限",
"xpack.apm.settings.agentKeys.createKeyFlyout.sourcemaps": "上传源地图所必需。",
"xpack.apm.settings.agentKeys.createKeyFlyout.userTitle": "用户",
"xpack.apm.settings.agentKeys.deleteConfirmModal.cancel": "取消",
"xpack.apm.settings.agentKeys.deleteConfirmModal.delete": "删除",

2
x-pack/test/apm_api_integration/common/authentication.ts
View file

@ -78,7 +78,7 @@ const customRoles = {
applications: [
{
application: 'apm',
privileges: [PrivilegeType.AGENT_CONFIG, PrivilegeType.EVENT, PrivilegeType.SOURCEMAP],
privileges: [PrivilegeType.AGENT_CONFIG, PrivilegeType.EVENT],
resources: ['*'],
},
],

6
x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
View file

@ -17,11 +17,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
const esClient = getService('es');
const agentKeyName = 'test';
const allApplicationPrivileges = [
PrivilegeType.AGENT_CONFIG,
PrivilegeType.EVENT,
PrivilegeType.SOURCEMAP,
];
const allApplicationPrivileges = [PrivilegeType.AGENT_CONFIG, PrivilegeType.EVENT];
async function createAgentKey(apiClient: ApmApiSupertest, privileges = allApplicationPrivileges) {
return await apiClient({