Skip to content

[7.x] Remove string as a valid registry var type value (#94174) #94752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2021
Merged

[7.x] Remove string as a valid registry var type value (#94174) #94752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export interface RegistryElasticsearch {
'index_template.mappings'?: object;
}

export type RegistryVarType = 'integer' | 'bool' | 'password' | 'text' | 'yaml' | 'string';
export enum RegistryVarsEntryKeys {
name = 'name',
title = 'title',
Expand All @@ -286,7 +287,6 @@ export enum RegistryVarsEntryKeys {
os = 'os',
}

export type RegistryVarType = 'integer' | 'bool' | 'password' | 'text' | 'yaml' | 'string';
// EPR types this as `[]map[string]interface{}`
// which means the official/possible type is Record<string, any>
// but we effectively only see this shape
Expand Down
12 changes: 2 additions & 10 deletions ...leet/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,7 @@ export const validatePackagePolicyConfig = (
})
);
}
if (
(varDef.type === 'text' || varDef.type === 'string') &&
parsedValue &&
Array.isArray(parsedValue)
) {
if (varDef.type === 'text' && parsedValue && Array.isArray(parsedValue)) {
const invalidStrings = parsedValue.filter((cand) => /^[*&]/.test(cand));
// only show one error if multiple strings in array are invalid
if (invalidStrings.length > 0) {
Expand All @@ -247,11 +243,7 @@ export const validatePackagePolicyConfig = (
}
}

if (
(varDef.type === 'text' || varDef.type === 'string') &&
parsedValue &&
!Array.isArray(parsedValue)
) {
if (varDef.type === 'text' && parsedValue && !Array.isArray(parsedValue)) {
if (/^[*&]/.test(parsedValue)) {
errors.push(
i18n.translate('xpack.fleet.packagePolicyValidation.quoteStringErrorMessage', {
Expand Down
16 changes: 8 additions & 8 deletions x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ my-package:
{{{ search }}} | streamstats`;

const vars = {
asteriskOnly: { value: '"*"', type: 'string' },
startsWithAsterisk: { value: '"*lala"', type: 'string' },
numeric: { value: '100', type: 'string' },
mixed: { value: '1s', type: 'string' },
a: { value: '/opt/package/*', type: 'string' },
b: { value: '/logs/my.log*', type: 'string' },
c: { value: '/opt/*/package/', type: 'string' },
d: { value: 'logs/*my.log', type: 'string' },
asteriskOnly: { value: '"*"', type: 'text' },
startsWithAsterisk: { value: '"*lala"', type: 'text' },
numeric: { value: '100', type: 'text' },
mixed: { value: '1s', type: 'text' },
a: { value: '/opt/package/*', type: 'text' },
b: { value: '/logs/my.log*', type: 'text' },
c: { value: '/opt/*/package/', type: 'text' },
d: { value: 'logs/*my.log', type: 'text' },
search: { value: 'search sourcetype="access*"', type: 'text' },
};

Expand Down