diff --git a/CHANGELOG.md b/CHANGELOG.md index 888e9717..9f601963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.1-beta-1] - 2026-08-04 + +### Fixed + +- OAR014 / OAR015 - ResourceLevel - Issue message now interpolates the configured level values (min-level/max-level for OAR014, max-level-allowed for OAR015). +- OAR004 / OAR040 - Wso2Scopes - Issue message now includes the configured `pattern` (passed through `AbstractPatternWso2ScopesCheck`). +- OAR038 - StandardCreateResponse - Issue message now interpolates the configured `data-property` instead of the hardcoded `data`. +- OAR082 - BinaryOrByteFormat - Issue message now shows the configured `fields-to-apply`. +- OAR085 - OpenAPIVersion - Issue message now shows the configured `valid-versions`. +- OAR037 - StringFormat - Issue message now interpolates the configured `formats-allowed`. + + ## [1.5.0] - 2026-07-28 ### Added diff --git a/pom.xml b/pom.xml index 55865267..3fb1bbc9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.apiaddicts.apitools.dosonarapi sonaropenapi-rules-community - 1.5.0 + 1.5.1-beta-1 sonar-plugin SonarQube OpenAPI Community Rules diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/apim/wso2/AbstractPatternWso2ScopesCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/apim/wso2/AbstractPatternWso2ScopesCheck.java index 8e5fb60e..9a487453 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/apim/wso2/AbstractPatternWso2ScopesCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/apim/wso2/AbstractPatternWso2ScopesCheck.java @@ -35,18 +35,19 @@ protected void visitScope(JsonNode scope) { if (fieldNode == null || fieldNode.isNull() || fieldNode.isMissing()) return; + String patternStr = getPatternStr() != null ? getPatternStr() : defaultPatternValue; List elements = fieldNode.elements(); if (!elements.isEmpty()) { for (JsonNode element : elements) { String roleText = element.getTokenValue(); if (roleText != null && !pattern.matcher(roleText).matches()) { - addIssue(ruleKey, translate(messageKey), element); + addIssue(ruleKey, translate(messageKey, patternStr), element); } } } else { String fieldText = fieldNode.getTokenValue(); if (fieldText != null && !pattern.matcher(fieldText).matches()) { - addIssue(ruleKey, translate(messageKey), fieldNode); + addIssue(ruleKey, translate(messageKey, patternStr), fieldNode); } } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/format/OAR037StringFormatCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/format/OAR037StringFormatCheck.java index 96e58d22..5b64fb36 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/format/OAR037StringFormatCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/format/OAR037StringFormatCheck.java @@ -34,13 +34,13 @@ public void validate(String type, String format, JsonNode typeNode, JsonNode nod .map(f -> f.trim().toLowerCase()) .collect(Collectors.toSet()); if (!validFormats.contains(format.toLowerCase())) { - addIssue(KEY, translate(MESSAGE), typeNode.key()); + addIssue(KEY, translate(MESSAGE, formatsAllowed), typeNode.key()); } return; } if (!hasValidPattern(node)) { - addIssue(KEY, translate(MESSAGE), typeNode.key()); + addIssue(KEY, translate(MESSAGE, formatsAllowed), typeNode.key()); } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/operations/AbstractResourceLevelCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/operations/AbstractResourceLevelCheck.java index ac94b477..d8deba40 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/operations/AbstractResourceLevelCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/operations/AbstractResourceLevelCheck.java @@ -15,8 +15,6 @@ public abstract class AbstractResourceLevelCheck extends BaseCheck { - private static final String MESSAGE = "generic.path-level"; - private String key; protected AbstractResourceLevelCheck(String key) { @@ -31,9 +29,13 @@ public Set subscribedKinds() { @Override public void visitNode(JsonNode node) { String path = node.key().getTokenValue(); - if (matchLevel(path)) addIssue(key, translate(MESSAGE), node.key()); + if (matchLevel(path)) addIssue(key, translate(messageKey(), messageArgs()), node.key()); } + protected abstract String messageKey(); + + protected abstract Object[] messageArgs(); + private boolean matchLevel(String path) { long literalCount = Stream.of(path.split("/")) .filter(s -> !s.trim().isEmpty()) diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR014ResourceLevelWithinNonSuggestedRangeCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR014ResourceLevelWithinNonSuggestedRangeCheck.java index 504aabe0..a429360f 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR014ResourceLevelWithinNonSuggestedRangeCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR014ResourceLevelWithinNonSuggestedRangeCheck.java @@ -34,4 +34,14 @@ public OAR014ResourceLevelWithinNonSuggestedRangeCheck() { boolean matchLevel(long level) { return minLevel <= level && level <= maxLevel; } + + @Override + protected String messageKey() { + return "OAR014.error"; + } + + @Override + protected Object[] messageArgs() { + return new Object[] { minLevel, maxLevel }; + } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR015ResourceLevelMaxAllowedCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR015ResourceLevelMaxAllowedCheck.java index 2320e732..c570ba67 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR015ResourceLevelMaxAllowedCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR015ResourceLevelMaxAllowedCheck.java @@ -25,4 +25,14 @@ public OAR015ResourceLevelMaxAllowedCheck() { boolean matchLevel(long level) { return maxLevelAllowed < level; } + + @Override + protected String messageKey() { + return "OAR015.error"; + } + + @Override + protected Object[] messageArgs() { + return new Object[] { maxLevelAllowed }; + } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR038StandardCreateResponseCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR038StandardCreateResponseCheck.java index 57e27ce6..c613cac0 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR038StandardCreateResponseCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/operations/OAR038StandardCreateResponseCheck.java @@ -49,12 +49,12 @@ protected void visitV2ExplicitNode(JsonNode node) { addIssue(KEY, translate("OAR038.error-required-one-property"), entry.getValue().key()); } } else { - addIssue(KEY, translate("OAR038.error"), entry.getValue().key()); + addIssue(KEY, translate("OAR038.error", dataNode), entry.getValue().key()); } } if (properties.isEmpty()) { - addIssue(KEY, translate("OAR038.error"), schemaNode.key()); + addIssue(KEY, translate("OAR038.error", dataNode), schemaNode.key()); } } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR082BinaryOrByteFormatCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR082BinaryOrByteFormatCheck.java index cbaf2ad1..2f619e19 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR082BinaryOrByteFormatCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR082BinaryOrByteFormatCheck.java @@ -62,7 +62,7 @@ private void visitV2Node(JsonNode node) { if ("string".equals(type)) { String format = fieldNode.get("format").getTokenValue(); if (!"binary".equals(format) && !"byte".equals(format)) { - addIssue(KEY, translate(MESSAGE), typeNode.key()); + addIssue(KEY, translate(MESSAGE, fieldsApply), typeNode.key()); } } } diff --git a/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR085OpenAPIVersionCheck.java b/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR085OpenAPIVersionCheck.java index 7422bc70..4ba0c578 100644 --- a/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR085OpenAPIVersionCheck.java +++ b/src/main/java/apiaddicts/sonar/openapi/checks/security/OAR085OpenAPIVersionCheck.java @@ -38,7 +38,7 @@ protected void visitFile(JsonNode root) { List validVersions = Arrays.asList(validVersionsStr.split(",")); if (version == null || !validVersions.contains(version)) { - addIssue(KEY, translate(MESSAGE, version), root.key()); + addIssue(KEY, translate(MESSAGE, validVersionsStr), root.key()); } } diff --git a/src/main/resources/messages/errors.properties b/src/main/resources/messages/errors.properties index 78ab417f..ab992b90 100644 --- a/src/main/resources/messages/errors.properties +++ b/src/main/resources/messages/errors.properties @@ -5,13 +5,15 @@ OAR001.error-v3-https=Protocol https in server url is mandatory OAR002.error=WSO2 scopes definition is wrong OAR002.error-property=WSO2 scope ''{0}'' is required OAR003.error=WSO2 scope ''description'' is recommended -OAR004.error=WSO2 scope roles value is not valid +OAR004.error=WSO2 scope role does not match the required pattern: {0} OAR005.error=WSO2 scope definition does not exists OAR008.error=Http verb ({0}) not encouraged OAR010.error-request-body-not-allowed=requestBody not allowed with operation ''{0}'' OAR011.error=The base path and resource names with more than two words must be compliant with the standard naming convention: {0} OAR012.error=Path params names, query params names, object names and property names with more than two words must be compliant with the standard naming convention: {0} OAR013.error=Default response is required +OAR014.error=Resources depth level must not fall within the non-suggested range {0} to {1} +OAR015.error=Resources depth level must be smaller than or equal to {0} OAR016.error=Numeric types requires a valid format OAR017.error=Resource path should alternate static and parametrized parts OAR017.error-patterns=Pattern ''{0}'' not allowed @@ -37,12 +39,12 @@ OAR032.error=Ambiguous path parts not encouraged: {0} OAR033.error-header-required=''{0}'' header must be required OAR035.error=Response code {0} must be defined for operations with security schemes defined OAR036.error=Cookie use is forbidden as a session mechanism -OAR037.error=String types require a valid format, or a valid pattern when no format is defined -OAR038.error=''data'' or ''error'' property is required +OAR037.error=String types require one of the allowed formats ({0}), or a valid pattern when no format is defined +OAR038.error=''{0}'' or ''error'' property is required OAR038.error-required-schema=Response schema is required OAR038.error-required-one-property=At least you have to define the identifier property OAR039.error=Response code {0} must be defined -OAR040.error=WSO2 scope name value is non compliant with the standard +OAR040.error=WSO2 scope name does not match the required pattern: {0} OAR041.error=WSO2 x-scope requires x-auth-type definition OAR042.error-version=Last path part must be the API version, indicated with the prefix ''v'' and the version number as integer OAR042.error-path-short=Path has to few parts @@ -92,10 +94,10 @@ OAR078.error=All API methods must have security OAR079.error=Paths parameters, should have not found (404) response OAR080.error=The security scheme must be among those allowed by the organization and must be complete. OAR081.error=Fields of type password should be string with format password -OAR082.error=The string properties of the specified parameters must define a byte or binary format. +OAR082.error=The string properties among {0} must define a byte or binary format OAR083.error=The parameter {0} should not pass through this querystring OAR084.error=The format {0} should not pass through this querystring -OAR085.error=The OpenAPI version should be one of the allowed by the organization +OAR085.error=The OpenAPI version must be one of: {0} OAR086.error=Descriptions must begin with a capital letter, end with a period and not be empty OAR087.error=Summaries must begin with a capital letter, end with a period and not be empty OAR088.error=The $ref of a parameter must end with the suffix {0} diff --git a/src/main/resources/messages/errors_es.properties b/src/main/resources/messages/errors_es.properties index 7b509b68..e1006a49 100644 --- a/src/main/resources/messages/errors_es.properties +++ b/src/main/resources/messages/errors_es.properties @@ -5,13 +5,15 @@ OAR001.error-v3-https=El protocolo https en la URL del servidor es obligatorio OAR002.error=La definición de los scopes es errónea OAR002.error-property=EL apartado ''{0}'' del scope es obligatorio OAR003.error=Se recomienda definir el apartado ''description'' de este scope -OAR004.error=El valor del campo roles de este scope no es válido +OAR004.error=El rol del scope de WSO2 no cumple con el patrón requerido: {0} OAR005.error=La definición de este scope no existe OAR008.error=Verbo http ({0}) no recomendado OAR010.error-request-body-not-allowed=requestBody no permitido con la operación ''{0}'' OAR011.error=La ruta base y los nombres de recursos con más de dos palabras deben cumplir con la convención de nombres estándar: {0} OAR012.error=Los nombres de parámetros de ruta, parámetros de consulta, objetos y propiedades con más de dos palabras deben ajustarse a la convención de nomenclatura estándar: {0} OAR013.error=La respuesta por defecto es obligatoria +OAR014.error=El nivel de profundidad de los recursos no debe estar dentro del rango no sugerido de {0} a {1} +OAR015.error=El nivel de profundidad de los recursos debe ser menor o igual a {0} OAR016.error=Tipos numéricos requieren un formato válido OAR017.error=El path del recurso debe de alternar entre partes estáticas y parametrizadas OAR017.error-patterns=Patrón ''{0}'' no permitido @@ -37,12 +39,12 @@ OAR032.error=Nombres de partes de path ambiguos no permitidos: {0} OAR033.error-header-required=La cabecera ''{0}'' debe ser obligatoria OAR035.error=El código de respuesta {0} debe estar definido cuando la operación tiene esquemas de seguridad definidos OAR036.error=El uso de cookies está prohibido como mecanismo de sesión -OAR037.error=Las propiedades de tipo string deben definir un formato válido o, si no hay formato, un pattern válido -OAR038.error=La propiedad ''data'' o ''error'' es obligatoria +OAR037.error=Las propiedades de tipo string deben definir uno de los formatos permitidos ({0}) o, si no hay formato, un pattern válido +OAR038.error=La propiedad ''{0}'' o ''error'' es obligatoria OAR038.error-required-schema=El esquema de respuesta es obligatorio OAR038.error-required-one-property=Se debe de definir al menos una propiedad OAR039.error=Código de respuesta {0} debe ser definido -OAR040.error=El nombre del scope de WSO2 no cumple con el estándar +OAR040.error=El nombre del scope de WSO2 no cumple con el patrón requerido: {0} OAR041.error=La sección x-scope de WSO2 obliga a definir la sección x-auth-type OAR042.error-version=La última parte de la ruta debe ser la versión de la API, indicada con el prefijo ''v'' y el número de versión como entero OAR042.error-path-short=El path tiene muy pocas partes @@ -92,10 +94,10 @@ OAR078.error=Todos los métodos de una API deben tener seguridad OAR079.error=Los parámetros in PATH debem tener una respuesta Not Found (404) OAR080.error=El esquema de seguridad debe ser entre los permitidos de la organización, además debe estar completo OAR081.error=Los campos de tipo password deben ser string con formato password -OAR082.error=Las propiedades de tipo string de los parámetros especificados,deben definir un formato bite o binary +OAR082.error=Las propiedades de tipo string entre {0} deben definir un formato byte o binary OAR083.error=El parámetro {0} no debe pasar por este querystring OAR084.error=El formato {0} no debe pasar por este querystring -OAR085.error=La versión del OpenAPI debe estar entre los permitidos de la organización +OAR085.error=La versión del OpenAPI debe ser una de: {0} OAR086.error=Las descripciones no pueden estar vacías, deben empezar con mayúsculas y terminar con un punto OAR087.error=Los summary no pueden estar vacíos, deben empezar con mayúsculas y terminar con un punto OAR088.error=El $ref de un parámetro debe terminar con el sufijo {0} diff --git a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.json b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.json index c33df6db..1a341339 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.json +++ b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.yaml b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.yaml index cbfa1337..0cddad70 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.yaml +++ b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-array-roles.yaml @@ -12,5 +12,5 @@ x-wso2-security: key: read roles: - ROLE_READ - - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records diff --git a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.json b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.json index 5a767b89..42c40f92 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.json +++ b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.yaml b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.yaml index 5ff4ea53..c4b2e498 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.yaml +++ b/src/test/resources/checks/v2/apim/wso2/OAR004/with-invalid-roles.yaml @@ -10,5 +10,5 @@ x-wso2-security: x-wso2-scopes: - name: read key: read - roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records \ No newline at end of file diff --git a/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.json b/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.json index 9cd3db7a..64d230cb 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.json +++ b/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.json @@ -10,13 +10,13 @@ "x-wso2-security" : { "apim" : { "x-wso2-scopes" : [ { - "name" : "app" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} } ] } } diff --git a/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.yaml b/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.yaml index 795fbab0..225d0387 100644 --- a/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.yaml +++ b/src/test/resources/checks/v2/apim/wso2/OAR040/invalid.yaml @@ -8,7 +8,7 @@ paths: x-wso2-security: apim: x-wso2-scopes: - - name: app # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} \ No newline at end of file + - name: app # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} \ No newline at end of file diff --git a/src/test/resources/checks/v2/format/OAR037/nested.json b/src/test/resources/checks/v2/format/OAR037/nested.json index 819ad8b7..c53ad332 100644 --- a/src/test/resources/checks/v2/format/OAR037/nested.json +++ b/src/test/resources/checks/v2/format/OAR037/nested.json @@ -17,7 +17,7 @@ "type" : "object", "properties" : { "value" : { - "type" : "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type" : "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format" : "YYYY-MM-DD" }, "code" : { diff --git a/src/test/resources/checks/v2/format/OAR037/nested.yaml b/src/test/resources/checks/v2/format/OAR037/nested.yaml index 6a3c55c2..b187416e 100644 --- a/src/test/resources/checks/v2/format/OAR037/nested.yaml +++ b/src/test/resources/checks/v2/format/OAR037/nested.yaml @@ -15,7 +15,7 @@ paths: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v2/format/OAR037/plain.json b/src/test/resources/checks/v2/format/OAR037/plain.json index 31df3943..d89e6276 100644 --- a/src/test/resources/checks/v2/format/OAR037/plain.json +++ b/src/test/resources/checks/v2/format/OAR037/plain.json @@ -14,14 +14,14 @@ "type" : "object", "properties" : { "without" : { - "type" : "string" # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type" : "string" # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} }, "withPattern" : { "type" : "string", "pattern" : "^[A-Z]{3}-[0-9]+$" }, "withInvalidPattern" : { - "type" : "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type" : "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern" : "[" }, "date" : { @@ -69,7 +69,7 @@ "format" : "ipv6" }, "other" : { - "type" : "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type" : "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format" : "YYYY-MM-DD" } } diff --git a/src/test/resources/checks/v2/format/OAR037/plain.yaml b/src/test/resources/checks/v2/format/OAR037/plain.yaml index a09e36e2..a6dae9de 100644 --- a/src/test/resources/checks/v2/format/OAR037/plain.yaml +++ b/src/test/resources/checks/v2/format/OAR037/plain.yaml @@ -12,12 +12,12 @@ paths: type: object properties: without: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} withPattern: type: string pattern: '^[A-Z]{3}-[0-9]+$' withInvalidPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: '[' date: type: string @@ -59,5 +59,5 @@ paths: type: string format: HEX(16) other: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD diff --git a/src/test/resources/checks/v2/format/OAR037/with-$ref.json b/src/test/resources/checks/v2/format/OAR037/with-$ref.json index e9c50847..bc482563 100644 --- a/src/test/resources/checks/v2/format/OAR037/with-$ref.json +++ b/src/test/resources/checks/v2/format/OAR037/with-$ref.json @@ -32,7 +32,7 @@ "type" : "object", "properties" : { "value" : { - "type" : "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type" : "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format" : "YYYY-MM-DD" }, "code" : { diff --git a/src/test/resources/checks/v2/format/OAR037/with-$ref.yaml b/src/test/resources/checks/v2/format/OAR037/with-$ref.yaml index a589efeb..0000a0d8 100644 --- a/src/test/resources/checks/v2/format/OAR037/with-$ref.yaml +++ b/src/test/resources/checks/v2/format/OAR037/with-$ref.yaml @@ -22,7 +22,7 @@ definitions: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v2/operations/OAR014/plain.json b/src/test/resources/checks/v2/operations/OAR014/plain.json index 1dc0ee29..97d2e1d1 100644 --- a/src/test/resources/checks/v2/operations/OAR014/plain.json +++ b/src/test/resources/checks/v2/operations/OAR014/plain.json @@ -59,7 +59,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -68,7 +68,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -77,7 +77,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -86,7 +86,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v2/operations/OAR014/plain.yaml b/src/test/resources/checks/v2/operations/OAR014/plain.yaml index 5647b610..1b37831c 100644 --- a/src/test/resources/checks/v2/operations/OAR014/plain.yaml +++ b/src/test/resources/checks/v2/operations/OAR014/plain.yaml @@ -33,22 +33,22 @@ paths: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v2/operations/OAR015/plain.json b/src/test/resources/checks/v2/operations/OAR015/plain.json index d8f8fc1d..4d0248dc 100644 --- a/src/test/resources/checks/v2/operations/OAR015/plain.json +++ b/src/test/resources/checks/v2/operations/OAR015/plain.json @@ -95,7 +95,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -104,7 +104,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -113,7 +113,7 @@ } } }, - "/one/two/three/four/five/six/seven" : { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven" : { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get" : { "responses" : { "default" : { diff --git a/src/test/resources/checks/v2/operations/OAR015/plain.yaml b/src/test/resources/checks/v2/operations/OAR015/plain.yaml index 19bce139..8fcff6ba 100644 --- a/src/test/resources/checks/v2/operations/OAR015/plain.yaml +++ b/src/test/resources/checks/v2/operations/OAR015/plain.yaml @@ -53,17 +53,17 @@ paths: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v2/resources/OAR014/plain.json b/src/test/resources/checks/v2/resources/OAR014/plain.json index 1dc0ee29..97d2e1d1 100644 --- a/src/test/resources/checks/v2/resources/OAR014/plain.json +++ b/src/test/resources/checks/v2/resources/OAR014/plain.json @@ -59,7 +59,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -68,7 +68,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -77,7 +77,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -86,7 +86,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v2/resources/OAR014/plain.yaml b/src/test/resources/checks/v2/resources/OAR014/plain.yaml index 385ef638..9af5b6dd 100644 --- a/src/test/resources/checks/v2/resources/OAR014/plain.yaml +++ b/src/test/resources/checks/v2/resources/OAR014/plain.yaml @@ -33,22 +33,22 @@ paths: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v2/resources/OAR015/plain.json b/src/test/resources/checks/v2/resources/OAR015/plain.json index 53082e2b..d5653f56 100644 --- a/src/test/resources/checks/v2/resources/OAR015/plain.json +++ b/src/test/resources/checks/v2/resources/OAR015/plain.json @@ -95,7 +95,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -104,7 +104,7 @@ } } }, - "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -113,7 +113,7 @@ } } }, - "/one/two/three/four/five/six/seven" : { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven" : { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get" : { "responses" : { "default" : { diff --git a/src/test/resources/checks/v2/resources/OAR015/plain.yaml b/src/test/resources/checks/v2/resources/OAR015/plain.yaml index 8e617f60..a6f60283 100644 --- a/src/test/resources/checks/v2/resources/OAR015/plain.yaml +++ b/src/test/resources/checks/v2/resources/OAR015/plain.yaml @@ -53,17 +53,17 @@ paths: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/{one}/two/{two}/three/{three}/four/{four}/five/{five}/six/{six}: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v2/security/OAR082/valid-format.json b/src/test/resources/checks/v2/security/OAR082/valid-format.json index d01e4a29..423340a7 100644 --- a/src/test/resources/checks/v2/security/OAR082/valid-format.json +++ b/src/test/resources/checks/v2/security/OAR082/valid-format.json @@ -14,11 +14,11 @@ "type": "object", "properties": { "product": { - "type": "string", # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string", # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} "format": "int128" }, "line": { - "type": "string" # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string" # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} }, "price": { "type": "string", diff --git a/src/test/resources/checks/v2/security/OAR082/valid-format.yaml b/src/test/resources/checks/v2/security/OAR082/valid-format.yaml index 67972ef5..4f860b86 100644 --- a/src/test/resources/checks/v2/security/OAR082/valid-format.yaml +++ b/src/test/resources/checks/v2/security/OAR082/valid-format.yaml @@ -12,10 +12,10 @@ paths: type: object properties: product: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} format: int128 line: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} lapiz: type: string price: diff --git a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.json b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.json index 48350b93..e410485e 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.json +++ b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.yaml b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.yaml index 2958720b..eef0a8fc 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.yaml +++ b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-array-roles.yaml @@ -12,5 +12,5 @@ x-wso2-security: key: read roles: - ROLE_READ - - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records diff --git a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.json b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.json index f975009e..7a1dc3a3 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.json +++ b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.yaml b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.yaml index 2c9729aa..bb95b57c 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.yaml +++ b/src/test/resources/checks/v3/apim/wso2/OAR004/with-invalid-roles.yaml @@ -10,5 +10,5 @@ x-wso2-security: x-wso2-scopes: - name: read key: read - roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records \ No newline at end of file diff --git a/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.json b/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.json index 0945724a..3b26e700 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.json +++ b/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.json @@ -10,13 +10,13 @@ "x-wso2-security" : { "apim" : { "x-wso2-scopes" : [ { - "name" : "app" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} } ] } } diff --git a/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.yaml b/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.yaml index dbe5b3ba..f46ef47e 100644 --- a/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.yaml +++ b/src/test/resources/checks/v3/apim/wso2/OAR040/invalid.yaml @@ -8,7 +8,7 @@ paths: x-wso2-security: apim: x-wso2-scopes: - - name: app # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} \ No newline at end of file + - name: app # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} \ No newline at end of file diff --git a/src/test/resources/checks/v3/format/OAR037/complete.json b/src/test/resources/checks/v3/format/OAR037/complete.json index 7c6f894f..180881ce 100644 --- a/src/test/resources/checks/v3/format/OAR037/complete.json +++ b/src/test/resources/checks/v3/format/OAR037/complete.json @@ -10,7 +10,7 @@ "in": "header", "name": "paramOne", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } }, @@ -18,7 +18,7 @@ "in": "header", "name": "paramTwo", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -34,7 +34,7 @@ "in": "header", "name": "paramThree", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -54,14 +54,14 @@ "type": "object", "properties": { "without": { - "type": "string" # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string" # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} }, "withPattern": { "type": "string", "pattern": "^[A-Z]{3}-[0-9]+$" }, "withInvalidPattern": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern": "[" }, "date": { @@ -109,7 +109,7 @@ "format": "ipv6" }, "other": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } diff --git a/src/test/resources/checks/v3/format/OAR037/complete.yaml b/src/test/resources/checks/v3/format/OAR037/complete.yaml index 0008a528..fa516500 100644 --- a/src/test/resources/checks/v3/format/OAR037/complete.yaml +++ b/src/test/resources/checks/v3/format/OAR037/complete.yaml @@ -8,13 +8,13 @@ components: in: header name: paramOne schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paramTwo: in: header name: paramTwo schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paths: /invoices: @@ -23,7 +23,7 @@ paths: - in: header name: paramThree schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD get: parameters: @@ -37,12 +37,12 @@ paths: type: object properties: without: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} withPattern: type: string pattern: '^[A-Z]{3}-[0-9]+$' withInvalidPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: '[' date: type: string @@ -78,5 +78,5 @@ paths: type: string format: ipv6 other: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD diff --git a/src/test/resources/checks/v3/format/OAR037/nested.json b/src/test/resources/checks/v3/format/OAR037/nested.json index 5f6a71dc..312df758 100644 --- a/src/test/resources/checks/v3/format/OAR037/nested.json +++ b/src/test/resources/checks/v3/format/OAR037/nested.json @@ -19,7 +19,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v3/format/OAR037/nested.yaml b/src/test/resources/checks/v3/format/OAR037/nested.yaml index 9a0465f1..a693669d 100644 --- a/src/test/resources/checks/v3/format/OAR037/nested.yaml +++ b/src/test/resources/checks/v3/format/OAR037/nested.yaml @@ -17,7 +17,7 @@ paths: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v3/format/OAR037/no-format.json b/src/test/resources/checks/v3/format/OAR037/no-format.json index 57a1dd0f..2b7e0076 100644 --- a/src/test/resources/checks/v3/format/OAR037/no-format.json +++ b/src/test/resources/checks/v3/format/OAR037/no-format.json @@ -20,15 +20,15 @@ "pattern": "^[A-Za-z ]+$" }, "emptyPattern": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern": "" }, "invalidPattern": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern": "[a-z" }, "code": { - "type": "string" # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string" # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} } } } diff --git a/src/test/resources/checks/v3/format/OAR037/no-format.yaml b/src/test/resources/checks/v3/format/OAR037/no-format.yaml index ec4f21f1..7e832e70 100644 --- a/src/test/resources/checks/v3/format/OAR037/no-format.yaml +++ b/src/test/resources/checks/v3/format/OAR037/no-format.yaml @@ -17,10 +17,10 @@ paths: type: string pattern: '^[A-Za-z ]+$' emptyPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: "" invalidPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: "[a-z" code: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} diff --git a/src/test/resources/checks/v3/format/OAR037/with-$ref.json b/src/test/resources/checks/v3/format/OAR037/with-$ref.json index 51e70ff3..db2aac42 100644 --- a/src/test/resources/checks/v3/format/OAR037/with-$ref.json +++ b/src/test/resources/checks/v3/format/OAR037/with-$ref.json @@ -37,7 +37,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v3/format/OAR037/with-$ref.yaml b/src/test/resources/checks/v3/format/OAR037/with-$ref.yaml index fbe316a5..110b40dc 100644 --- a/src/test/resources/checks/v3/format/OAR037/with-$ref.yaml +++ b/src/test/resources/checks/v3/format/OAR037/with-$ref.yaml @@ -25,7 +25,7 @@ components: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v3/operations/OAR014/plain.json b/src/test/resources/checks/v3/operations/OAR014/plain.json index ec717959..69435707 100644 --- a/src/test/resources/checks/v3/operations/OAR014/plain.json +++ b/src/test/resources/checks/v3/operations/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v3/operations/OAR014/plain.yaml b/src/test/resources/checks/v3/operations/OAR014/plain.yaml index 08c7baa0..5c7cb46d 100644 --- a/src/test/resources/checks/v3/operations/OAR014/plain.yaml +++ b/src/test/resources/checks/v3/operations/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v3/operations/OAR015/plain.json b/src/test/resources/checks/v3/operations/OAR015/plain.json index 258325fe..c94c552a 100644 --- a/src/test/resources/checks/v3/operations/OAR015/plain.json +++ b/src/test/resources/checks/v3/operations/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v3/operations/OAR015/plain.yaml b/src/test/resources/checks/v3/operations/OAR015/plain.yaml index 94edfe5d..1f18f36a 100644 --- a/src/test/resources/checks/v3/operations/OAR015/plain.yaml +++ b/src/test/resources/checks/v3/operations/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v3/resources/OAR014/plain.json b/src/test/resources/checks/v3/resources/OAR014/plain.json index ec717959..69435707 100644 --- a/src/test/resources/checks/v3/resources/OAR014/plain.json +++ b/src/test/resources/checks/v3/resources/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v3/resources/OAR014/plain.yaml b/src/test/resources/checks/v3/resources/OAR014/plain.yaml index 08c7baa0..5c7cb46d 100644 --- a/src/test/resources/checks/v3/resources/OAR014/plain.yaml +++ b/src/test/resources/checks/v3/resources/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v3/resources/OAR015/plain.json b/src/test/resources/checks/v3/resources/OAR015/plain.json index 258325fe..c94c552a 100644 --- a/src/test/resources/checks/v3/resources/OAR015/plain.json +++ b/src/test/resources/checks/v3/resources/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v3/resources/OAR015/plain.yaml b/src/test/resources/checks/v3/resources/OAR015/plain.yaml index 94edfe5d..1f18f36a 100644 --- a/src/test/resources/checks/v3/resources/OAR015/plain.yaml +++ b/src/test/resources/checks/v3/resources/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v3/security/OAR082/valid-format.json b/src/test/resources/checks/v3/security/OAR082/valid-format.json index 7423cb98..de5421e5 100644 --- a/src/test/resources/checks/v3/security/OAR082/valid-format.json +++ b/src/test/resources/checks/v3/security/OAR082/valid-format.json @@ -16,11 +16,11 @@ "type": "object", "properties": { "product": { - "type": "string", # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string", # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} "format": "int128" }, "line": { - "type": "string" # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string" # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} }, "price": { "type": "string", diff --git a/src/test/resources/checks/v3/security/OAR082/valid-format.yaml b/src/test/resources/checks/v3/security/OAR082/valid-format.yaml index 626624e9..965696f6 100644 --- a/src/test/resources/checks/v3/security/OAR082/valid-format.yaml +++ b/src/test/resources/checks/v3/security/OAR082/valid-format.yaml @@ -14,10 +14,10 @@ paths: type: object properties: product: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} format: int128 line: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} price: type: string format: byte \ No newline at end of file diff --git a/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.json b/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.json index 8d4da38a..5521fb71 100644 --- a/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.json +++ b/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.yaml b/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.yaml index ba79bbe6..2bdf51c1 100644 --- a/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.yaml +++ b/src/test/resources/checks/v31/apim/OAR004/with-invalid-array-roles.yaml @@ -12,5 +12,5 @@ x-wso2-security: key: read roles: - ROLE_READ - - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records diff --git a/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.json b/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.json index 6d2e1cb8..eb68f917 100644 --- a/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.json +++ b/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.yaml b/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.yaml index 0f470c00..e9b07e7d 100644 --- a/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.yaml +++ b/src/test/resources/checks/v31/apim/OAR004/with-invalid-roles.yaml @@ -10,5 +10,5 @@ x-wso2-security: x-wso2-scopes: - name: read key: read - roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records \ No newline at end of file diff --git a/src/test/resources/checks/v31/apim/OAR040/invalid.json b/src/test/resources/checks/v31/apim/OAR040/invalid.json index 802839a0..ccc66d8b 100644 --- a/src/test/resources/checks/v31/apim/OAR040/invalid.json +++ b/src/test/resources/checks/v31/apim/OAR040/invalid.json @@ -10,13 +10,13 @@ "x-wso2-security" : { "apim" : { "x-wso2-scopes" : [ { - "name" : "app" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} } ] } } diff --git a/src/test/resources/checks/v31/apim/OAR040/invalid.yaml b/src/test/resources/checks/v31/apim/OAR040/invalid.yaml index 0f445609..e97d36d7 100644 --- a/src/test/resources/checks/v31/apim/OAR040/invalid.yaml +++ b/src/test/resources/checks/v31/apim/OAR040/invalid.yaml @@ -8,7 +8,7 @@ paths: x-wso2-security: apim: x-wso2-scopes: - - name: app # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} \ No newline at end of file + - name: app # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} \ No newline at end of file diff --git a/src/test/resources/checks/v31/format/OAR037/complete.json b/src/test/resources/checks/v31/format/OAR037/complete.json index 6584f397..d30d2110 100644 --- a/src/test/resources/checks/v31/format/OAR037/complete.json +++ b/src/test/resources/checks/v31/format/OAR037/complete.json @@ -10,7 +10,7 @@ "in": "header", "name": "paramOne", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } }, @@ -18,7 +18,7 @@ "in": "header", "name": "paramTwo", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -34,7 +34,7 @@ "in": "header", "name": "paramThree", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -54,14 +54,14 @@ "type": "object", "properties": { "without": { - "type": "string" # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string" # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} }, "withPattern": { "type": "string", "pattern": "^[A-Z]{3}-[0-9]+$" }, "withInvalidPattern": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern": "[" }, "date": { @@ -109,7 +109,7 @@ "format": "ipv6" }, "other": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } diff --git a/src/test/resources/checks/v31/format/OAR037/complete.yaml b/src/test/resources/checks/v31/format/OAR037/complete.yaml index e75afc02..bc48872e 100644 --- a/src/test/resources/checks/v31/format/OAR037/complete.yaml +++ b/src/test/resources/checks/v31/format/OAR037/complete.yaml @@ -8,13 +8,13 @@ components: in: header name: paramOne schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paramTwo: in: header name: paramTwo schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paths: /invoices: @@ -23,7 +23,7 @@ paths: - in: header name: paramThree schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD get: parameters: @@ -37,12 +37,12 @@ paths: type: object properties: without: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} withPattern: type: string pattern: '^[A-Z]{3}-[0-9]+$' withInvalidPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: '[' date: type: string @@ -78,5 +78,5 @@ paths: type: string format: ipv6 other: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD diff --git a/src/test/resources/checks/v31/format/OAR037/nested.json b/src/test/resources/checks/v31/format/OAR037/nested.json index 5fc02cb9..b82a4a64 100644 --- a/src/test/resources/checks/v31/format/OAR037/nested.json +++ b/src/test/resources/checks/v31/format/OAR037/nested.json @@ -19,7 +19,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v31/format/OAR037/nested.yaml b/src/test/resources/checks/v31/format/OAR037/nested.yaml index 302751f2..09a6b93e 100644 --- a/src/test/resources/checks/v31/format/OAR037/nested.yaml +++ b/src/test/resources/checks/v31/format/OAR037/nested.yaml @@ -17,7 +17,7 @@ paths: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v31/format/OAR037/with-$ref.json b/src/test/resources/checks/v31/format/OAR037/with-$ref.json index 0e0d12bc..24be9044 100644 --- a/src/test/resources/checks/v31/format/OAR037/with-$ref.json +++ b/src/test/resources/checks/v31/format/OAR037/with-$ref.json @@ -37,7 +37,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v31/format/OAR037/with-$ref.yaml b/src/test/resources/checks/v31/format/OAR037/with-$ref.yaml index 36a92461..960da9ec 100644 --- a/src/test/resources/checks/v31/format/OAR037/with-$ref.yaml +++ b/src/test/resources/checks/v31/format/OAR037/with-$ref.yaml @@ -25,7 +25,7 @@ components: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v31/operations/OAR014/plain.json b/src/test/resources/checks/v31/operations/OAR014/plain.json index ae30763d..94def842 100644 --- a/src/test/resources/checks/v31/operations/OAR014/plain.json +++ b/src/test/resources/checks/v31/operations/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v31/operations/OAR014/plain.yaml b/src/test/resources/checks/v31/operations/OAR014/plain.yaml index 0e563616..f14772af 100644 --- a/src/test/resources/checks/v31/operations/OAR014/plain.yaml +++ b/src/test/resources/checks/v31/operations/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v31/operations/OAR015/plain.json b/src/test/resources/checks/v31/operations/OAR015/plain.json index cbdd1838..d185ad4d 100644 --- a/src/test/resources/checks/v31/operations/OAR015/plain.json +++ b/src/test/resources/checks/v31/operations/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v31/operations/OAR015/plain.yaml b/src/test/resources/checks/v31/operations/OAR015/plain.yaml index e298945b..5e2889c3 100644 --- a/src/test/resources/checks/v31/operations/OAR015/plain.yaml +++ b/src/test/resources/checks/v31/operations/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v31/resources/OAR014/plain.json b/src/test/resources/checks/v31/resources/OAR014/plain.json index 973e4d92..63ada396 100644 --- a/src/test/resources/checks/v31/resources/OAR014/plain.json +++ b/src/test/resources/checks/v31/resources/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v31/resources/OAR014/plain.yaml b/src/test/resources/checks/v31/resources/OAR014/plain.yaml index 0e563616..f14772af 100644 --- a/src/test/resources/checks/v31/resources/OAR014/plain.yaml +++ b/src/test/resources/checks/v31/resources/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v31/resources/OAR015/plain.json b/src/test/resources/checks/v31/resources/OAR015/plain.json index 28fbb79d..f968f5c7 100644 --- a/src/test/resources/checks/v31/resources/OAR015/plain.json +++ b/src/test/resources/checks/v31/resources/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v31/resources/OAR015/plain.yaml b/src/test/resources/checks/v31/resources/OAR015/plain.yaml index e298945b..5e2889c3 100644 --- a/src/test/resources/checks/v31/resources/OAR015/plain.yaml +++ b/src/test/resources/checks/v31/resources/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v31/security/OAR082/valid-format.json b/src/test/resources/checks/v31/security/OAR082/valid-format.json index 23251d95..14f67df5 100644 --- a/src/test/resources/checks/v31/security/OAR082/valid-format.json +++ b/src/test/resources/checks/v31/security/OAR082/valid-format.json @@ -16,11 +16,11 @@ "type": "object", "properties": { "product": { - "type": "string", # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string", # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} "format": "int128" }, "line": { - "type": "string" # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string" # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} }, "price": { "type": "string", diff --git a/src/test/resources/checks/v31/security/OAR082/valid-format.yaml b/src/test/resources/checks/v31/security/OAR082/valid-format.yaml index ec26b569..3eea1a41 100644 --- a/src/test/resources/checks/v31/security/OAR082/valid-format.yaml +++ b/src/test/resources/checks/v31/security/OAR082/valid-format.yaml @@ -14,10 +14,10 @@ paths: type: object properties: product: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} format: int128 line: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} price: type: string format: byte \ No newline at end of file diff --git a/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.json b/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.json index 8174b636..6b6e1192 100644 --- a/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.json +++ b/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : [ "ROLE_READ", "ROL€_V¡€U" ], # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.yaml b/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.yaml index d87427fd..7492553e 100644 --- a/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.yaml +++ b/src/test/resources/checks/v32/apim/OAR004/with-invalid-array-roles.yaml @@ -12,5 +12,5 @@ x-wso2-security: key: read roles: - ROLE_READ - - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + - ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records diff --git a/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.json b/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.json index 629afce2..a57822db 100644 --- a/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.json +++ b/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.json @@ -12,7 +12,7 @@ "x-wso2-scopes" : [ { "name" : "read", "key" : "read", - "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + "roles" : "ROLE_READ, ROL€_V¡€U", # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} "description" : "Allows users to read records" } ] } diff --git a/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.yaml b/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.yaml index e768acea..433013de 100644 --- a/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.yaml +++ b/src/test/resources/checks/v32/apim/OAR004/with-invalid-roles.yaml @@ -10,5 +10,5 @@ x-wso2-security: x-wso2-scopes: - name: read key: read - roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope roles value is not valid}} + roles: ROLE_READ, ROL€_V¡€U # Noncompliant {{OAR004: WSO2 scope role does not match the required pattern: ^[a-zA-Z0-9_\-., ]+$}} description: Allows users to read records \ No newline at end of file diff --git a/src/test/resources/checks/v32/apim/OAR040/invalid.json b/src/test/resources/checks/v32/apim/OAR040/invalid.json index 2f56af18..4863c280 100644 --- a/src/test/resources/checks/v32/apim/OAR040/invalid.json +++ b/src/test/resources/checks/v32/apim/OAR040/invalid.json @@ -10,13 +10,13 @@ "x-wso2-security" : { "apim" : { "x-wso2-scopes" : [ { - "name" : "app" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "app1_sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "GENE_Sc_ran" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} }, { - "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} + "name" : "X_SC_A" # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} } ] } } diff --git a/src/test/resources/checks/v32/apim/OAR040/invalid.yaml b/src/test/resources/checks/v32/apim/OAR040/invalid.yaml index 177ea034..e060ba58 100644 --- a/src/test/resources/checks/v32/apim/OAR040/invalid.yaml +++ b/src/test/resources/checks/v32/apim/OAR040/invalid.yaml @@ -8,7 +8,7 @@ paths: x-wso2-security: apim: x-wso2-scopes: - - name: app # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} - - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name value is non compliant with the standard}} \ No newline at end of file + - name: app # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: app1_sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: GENE_Sc_ran # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} + - name: X_SC_A # Noncompliant {{OAR040: WSO2 scope name does not match the required pattern: ^[a-zA-Z]{4,}_(SC|sc)_[a-zA-Z0-9]{1,}$}} \ No newline at end of file diff --git a/src/test/resources/checks/v32/format/OAR037/complete.json b/src/test/resources/checks/v32/format/OAR037/complete.json index 74f1adcd..acc9ccc2 100644 --- a/src/test/resources/checks/v32/format/OAR037/complete.json +++ b/src/test/resources/checks/v32/format/OAR037/complete.json @@ -10,7 +10,7 @@ "in": "header", "name": "paramOne", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } }, @@ -18,7 +18,7 @@ "in": "header", "name": "paramTwo", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -34,7 +34,7 @@ "in": "header", "name": "paramThree", "schema": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } @@ -54,14 +54,14 @@ "type": "object", "properties": { "without": { - "type": "string" # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string" # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} }, "withPattern": { "type": "string", "pattern": "^[A-Z]{3}-[0-9]+$" }, "withInvalidPattern": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "pattern": "[" }, "date": { @@ -109,7 +109,7 @@ "format": "ipv6" }, "other": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" } } diff --git a/src/test/resources/checks/v32/format/OAR037/complete.yaml b/src/test/resources/checks/v32/format/OAR037/complete.yaml index 0e7f4cc7..ee64eb79 100644 --- a/src/test/resources/checks/v32/format/OAR037/complete.yaml +++ b/src/test/resources/checks/v32/format/OAR037/complete.yaml @@ -8,13 +8,13 @@ components: in: header name: paramOne schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paramTwo: in: header name: paramTwo schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD paths: /invoices: @@ -23,7 +23,7 @@ paths: - in: header name: paramThree schema: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD get: parameters: @@ -37,12 +37,12 @@ paths: type: object properties: without: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} withPattern: type: string pattern: '^[A-Z]{3}-[0-9]+$' withInvalidPattern: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} pattern: '[' date: type: string @@ -78,5 +78,5 @@ paths: type: string format: ipv6 other: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD diff --git a/src/test/resources/checks/v32/format/OAR037/nested.json b/src/test/resources/checks/v32/format/OAR037/nested.json index 74e72c00..77f69c32 100644 --- a/src/test/resources/checks/v32/format/OAR037/nested.json +++ b/src/test/resources/checks/v32/format/OAR037/nested.json @@ -19,7 +19,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v32/format/OAR037/nested.yaml b/src/test/resources/checks/v32/format/OAR037/nested.yaml index a6fd15be..fcfd1a94 100644 --- a/src/test/resources/checks/v32/format/OAR037/nested.yaml +++ b/src/test/resources/checks/v32/format/OAR037/nested.yaml @@ -17,7 +17,7 @@ paths: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v32/format/OAR037/with-$ref.json b/src/test/resources/checks/v32/format/OAR037/with-$ref.json index 0589c17f..baca97c4 100644 --- a/src/test/resources/checks/v32/format/OAR037/with-$ref.json +++ b/src/test/resources/checks/v32/format/OAR037/with-$ref.json @@ -37,7 +37,7 @@ "type": "object", "properties": { "value": { - "type": "string", # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + "type": "string", # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} "format": "YYYY-MM-DD" }, "code": { diff --git a/src/test/resources/checks/v32/format/OAR037/with-$ref.yaml b/src/test/resources/checks/v32/format/OAR037/with-$ref.yaml index b631e251..bda454ab 100644 --- a/src/test/resources/checks/v32/format/OAR037/with-$ref.yaml +++ b/src/test/resources/checks/v32/format/OAR037/with-$ref.yaml @@ -25,7 +25,7 @@ components: type: object properties: value: - type: string # Noncompliant {{OAR037: String types require a valid format, or a valid pattern when no format is defined}} + type: string # Noncompliant {{OAR037: String types require one of the allowed formats (date,date-time,password,byte,binary,email,uuid,uri,hostname,ipv4,ipv6,HEX,HEX(16),json,xml,base64), or a valid pattern when no format is defined}} format: YYYY-MM-DD code: type: string diff --git a/src/test/resources/checks/v32/operations/OAR014/plain.json b/src/test/resources/checks/v32/operations/OAR014/plain.json index e5976e87..00c3d3dd 100644 --- a/src/test/resources/checks/v32/operations/OAR014/plain.json +++ b/src/test/resources/checks/v32/operations/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v32/operations/OAR014/plain.yaml b/src/test/resources/checks/v32/operations/OAR014/plain.yaml index a5037c89..3b82e7f5 100644 --- a/src/test/resources/checks/v32/operations/OAR014/plain.yaml +++ b/src/test/resources/checks/v32/operations/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v32/operations/OAR015/plain.json b/src/test/resources/checks/v32/operations/OAR015/plain.json index 97cb52fe..bb0e67b6 100644 --- a/src/test/resources/checks/v32/operations/OAR015/plain.json +++ b/src/test/resources/checks/v32/operations/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v32/operations/OAR015/plain.yaml b/src/test/resources/checks/v32/operations/OAR015/plain.yaml index f29ada81..a56a7dd6 100644 --- a/src/test/resources/checks/v32/operations/OAR015/plain.yaml +++ b/src/test/resources/checks/v32/operations/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v32/resources/OAR014/plain.json b/src/test/resources/checks/v32/resources/OAR014/plain.json index 2777ce2c..1cda79c9 100644 --- a/src/test/resources/checks/v32/resources/OAR014/plain.json +++ b/src/test/resources/checks/v32/resources/OAR014/plain.json @@ -32,7 +32,7 @@ } } }, - "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { @@ -41,7 +41,7 @@ } } }, - "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level should be smaller}} + "/one/two/three/four/five": { # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v32/resources/OAR014/plain.yaml b/src/test/resources/checks/v32/resources/OAR014/plain.yaml index a5037c89..3b82e7f5 100644 --- a/src/test/resources/checks/v32/resources/OAR014/plain.yaml +++ b/src/test/resources/checks/v32/resources/OAR014/plain.yaml @@ -18,12 +18,12 @@ paths: responses: default: description: Ok - /one/two/three/four: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: description: Ok - /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level should be smaller}} + /one/two/three/four/five: # Noncompliant {{OAR014: Resources depth level must not fall within the non-suggested range 4 to 5}} get: responses: default: diff --git a/src/test/resources/checks/v32/resources/OAR015/plain.json b/src/test/resources/checks/v32/resources/OAR015/plain.json index d2152946..57e193b5 100644 --- a/src/test/resources/checks/v32/resources/OAR015/plain.json +++ b/src/test/resources/checks/v32/resources/OAR015/plain.json @@ -50,7 +50,7 @@ } } }, - "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { @@ -59,7 +59,7 @@ } } }, - "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level should be smaller}} + "/one/two/three/four/five/six/seven": { # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} "get": { "responses": { "default": { diff --git a/src/test/resources/checks/v32/resources/OAR015/plain.yaml b/src/test/resources/checks/v32/resources/OAR015/plain.yaml index f29ada81..a56a7dd6 100644 --- a/src/test/resources/checks/v32/resources/OAR015/plain.yaml +++ b/src/test/resources/checks/v32/resources/OAR015/plain.yaml @@ -28,12 +28,12 @@ paths: responses: default: description: Ok - /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: description: Ok - /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level should be smaller}} + /one/two/three/four/five/six/seven: # Noncompliant {{OAR015: Resources depth level must be smaller than or equal to 5}} get: responses: default: diff --git a/src/test/resources/checks/v32/security/OAR082/valid-format.json b/src/test/resources/checks/v32/security/OAR082/valid-format.json index 9c00671e..39024bba 100644 --- a/src/test/resources/checks/v32/security/OAR082/valid-format.json +++ b/src/test/resources/checks/v32/security/OAR082/valid-format.json @@ -16,11 +16,11 @@ "type": "object", "properties": { "product": { - "type": "string", # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string", # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} "format": "int128" }, "line": { - "type": "string" # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + "type": "string" # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} }, "price": { "type": "string", diff --git a/src/test/resources/checks/v32/security/OAR082/valid-format.yaml b/src/test/resources/checks/v32/security/OAR082/valid-format.yaml index 6af346ba..aff701fa 100644 --- a/src/test/resources/checks/v32/security/OAR082/valid-format.yaml +++ b/src/test/resources/checks/v32/security/OAR082/valid-format.yaml @@ -14,10 +14,10 @@ paths: type: object properties: product: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} format: int128 line: - type: string # Noncompliant {{OAR082: The string properties of the specified parameters must define a byte or binary format.}} + type: string # Noncompliant {{OAR082: The string properties among product,line,price must define a byte or binary format}} price: type: string format: byte \ No newline at end of file