diff --git a/packages/rulesets/generated/spectral/az-arm.js b/packages/rulesets/generated/spectral/az-arm.js index a0eedbcb..ed7ae74d 100644 --- a/packages/rulesets/generated/spectral/az-arm.js +++ b/packages/rulesets/generated/spectral/az-arm.js @@ -265,7 +265,7 @@ function getRequiredProperties(schema) { }); } if (schema.required) { - requires = [...schema.required, ...requires]; + requires = [...schema.required, requires]; } return requires; } @@ -2040,14 +2040,14 @@ const patchBodyParameters = (parameters, _opts, paths) => { if (parameters === null || parameters.schema === undefined || parameters.in !== "body") { return []; } - if (parameters.schema.description && parameters.schema.description.includes("Managed service identity")) { - return []; - } const path = paths.path || []; const properties = getProperties(parameters.schema); const requiredProperties = getRequiredProperties(parameters.schema); const errors = []; for (const prop of Object.keys(properties)) { + if (prop.toLowerCase() === "identity") { + continue; + } if (properties[prop].default) { errors.push({ message: `Properties of a PATCH request body must not have default value, property:${prop}.`, diff --git a/packages/rulesets/src/spectral/functions/patch-body-parameters.ts b/packages/rulesets/src/spectral/functions/patch-body-parameters.ts index 71dbe9c3..9550525a 100644 --- a/packages/rulesets/src/spectral/functions/patch-body-parameters.ts +++ b/packages/rulesets/src/spectral/functions/patch-body-parameters.ts @@ -7,18 +7,18 @@ const patchBodyParameters = (parameters: any, _opts: any, paths: any): IFunction return [] } - // skip validation for MSI(managed service identity), - // as it is being referenced from common-types - if (parameters.schema.description && parameters.schema.description.includes("Managed service identity")) { - return [] - } - const path = paths.path || [] const properties: object = getProperties(parameters.schema) const requiredProperties = getRequiredProperties(parameters.schema) const errors = [] for (const prop of Object.keys(properties)) { + // skip validation for identity property + // as it refers MSI(managed service identity) from common-types + if (prop.toLowerCase() === "identity") { + continue + } + if (properties[prop].default) { errors.push({ message: `Properties of a PATCH request body must not have default value, property:${prop}.`,