Skip to content

Commit 6574beb

Browse files
author
akhilailla
committed
Update logic to check for the property name and not description
1 parent f6d917e commit 6574beb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packages/rulesets/generated/spectral/az-arm.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ function getRequiredProperties(schema) {
265265
});
266266
}
267267
if (schema.required) {
268-
requires = [...schema.required, ...requires];
268+
requires = [...schema.required, requires];
269269
}
270270
return requires;
271271
}
@@ -2040,14 +2040,14 @@ const patchBodyParameters = (parameters, _opts, paths) => {
20402040
if (parameters === null || parameters.schema === undefined || parameters.in !== "body") {
20412041
return [];
20422042
}
2043-
if (parameters.schema.description && parameters.schema.description.includes("Managed service identity")) {
2044-
return [];
2045-
}
20462043
const path = paths.path || [];
20472044
const properties = getProperties(parameters.schema);
20482045
const requiredProperties = getRequiredProperties(parameters.schema);
20492046
const errors = [];
20502047
for (const prop of Object.keys(properties)) {
2048+
if (prop.toLowerCase() === "identity") {
2049+
continue;
2050+
}
20512051
if (properties[prop].default) {
20522052
errors.push({
20532053
message: `Properties of a PATCH request body must not have default value, property:${prop}.`,

packages/rulesets/src/spectral/functions/patch-body-parameters.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ const patchBodyParameters = (parameters: any, _opts: any, paths: any): IFunction
77
return []
88
}
99

10-
// skip validation for MSI(managed service identity),
11-
// as it is being referenced from common-types
12-
if (parameters.schema.description && parameters.schema.description.includes("Managed service identity")) {
13-
return []
14-
}
15-
1610
const path = paths.path || []
1711

1812
const properties: object = getProperties(parameters.schema)
1913
const requiredProperties = getRequiredProperties(parameters.schema)
2014
const errors = []
2115
for (const prop of Object.keys(properties)) {
16+
// skip validation for identity property
17+
// as it refers MSI(managed service identity) from common-types
18+
if (prop.toLowerCase() === "identity") {
19+
continue
20+
}
21+
2222
if (properties[prop].default) {
2323
errors.push({
2424
message: `Properties of a PATCH request body must not have default value, property:${prop}.`,

0 commit comments

Comments
 (0)