jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376575 )
Change subject: Set a different pattern for the request_id of the job event ...................................................................... Set a different pattern for the request_id of the job event Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5 --- M jsonschema/mediawiki/job/1.yaml M test/jsonschema/meta_common_schema.yaml 2 files changed, 2 insertions(+), 6 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml index 237e42c..1325223 100644 --- a/jsonschema/mediawiki/job/1.yaml +++ b/jsonschema/mediawiki/job/1.yaml @@ -25,9 +25,7 @@ request_id: description: The unique UUID v1 ID of the event derived from the X-Request-Id header. type: string - # TODO: Temporary disable this validation requirement while working on a proper fix - # because it's causing an alert. - #pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' + pattern: '^[a-zA-Z0-9\-]+$' id: description: The unique ID of this event; should match the dt field. type: string diff --git a/test/jsonschema/meta_common_schema.yaml b/test/jsonschema/meta_common_schema.yaml index 40fcdac..6651b0e 100644 --- a/test/jsonschema/meta_common_schema.yaml +++ b/test/jsonschema/meta_common_schema.yaml @@ -22,9 +22,7 @@ description: the unique URI identifying the event / resource request_id: type: string - # TODO: Temporary disable this validation requirement while working on a proper fix - # because it's causing an alert. - #pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' + # We don't test for the pattern, because the job events have different request-id pattern description: the unique UUID v1 ID of the event derived from the X-Request-Id header id: type: string -- To view, visit https://gerrit.wikimedia.org/r/376575 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/event-schemas Gerrit-Branch: master Gerrit-Owner: Ppchelko <ppche...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits