jenkins-bot has submitted this change and it was merged. Change subject: Remove deprecated schemas ......................................................................
Remove deprecated schemas After introducinng new schemas we can delete deprecated ones. Change-Id: Idbddbd599cbdbe954d5f3b1502a52cb96b290dd8 Depends-On: I88fbb4d036d6670d055c23e9c0fae2b32313c1af --- M config/eventbus-topics.yaml D jsonschema/mediawiki/page_delete/1.yaml D jsonschema/mediawiki/page_move/1.yaml D jsonschema/mediawiki/page_restore/1.yaml D jsonschema/mediawiki/revision_create/1.yaml D jsonschema/mediawiki/revision_visibility_set/1.yaml D jsonschema/mediawiki/user_block/1.yaml R test/jsonschema/mediawiki/mediawiki_common_schema.yaml D test/jsonschema/mediawiki/revision/mediawiki_common_schema.yaml D test/jsonschema/mediawiki/user/mediawiki_common_schema.yaml 10 files changed, 0 insertions(+), 558 deletions(-) Approvals: Mobrovac: Looks good to me, approved jenkins-bot: Verified diff --git a/config/eventbus-topics.yaml b/config/eventbus-topics.yaml index 139d7a8..4e5509d 100644 --- a/config/eventbus-topics.yaml +++ b/config/eventbus-topics.yaml @@ -9,25 +9,6 @@ # allows it to be used by services outside of WMF production. # -mediawiki.page_delete: - schema_name: mediawiki/page_delete - -mediawiki.page_move: - schema_name: mediawiki/page_move - -mediawiki.page_restore: - schema_name: mediawiki/page_restore - -mediawiki.revision_visibility_set: - schema_name: mediawiki/revision_visibility_set - -mediawiki.revision_create: - schema_name: mediawiki/revision_create - -mediawiki.user_block: - schema_name: mediawiki/user_block - -# These mediawiki topics and schemas deprecate the ones above. mediawiki.page-delete: schema_name: mediawiki/page/delete @@ -46,30 +27,10 @@ mediawiki.user-blocks-change: schema_name: mediawiki/user/blocks-change - resource_change: schema_name: resource_change # Change propagation retry queues -change-prop.retry.mediawiki.page_delete: - schema_name: change-prop/retry - -change-prop.retry.mediawiki.page_move: - schema_name: change-prop/retry - -change-prop.retry.mediawiki.page_restore: - schema_name: change-prop/retry - -change-prop.retry.mediawiki.revision_visibility_set: - schema_name: change-prop/retry - -change-prop.retry.mediawiki.revision_create: - schema_name: change-prop/retry - -change-prop.retry.mediawiki.user_block: - schema_name: change-prop/retry - -# These topics deprecate the ones above change-prop.retry.mediawiki.page-delete: schema_name: change-prop/retry diff --git a/jsonschema/mediawiki/page_delete/1.yaml b/jsonschema/mediawiki/page_delete/1.yaml deleted file mode 100644 index e675c2f..0000000 --- a/jsonschema/mediawiki/page_delete/1.yaml +++ /dev/null @@ -1,64 +0,0 @@ -title: mediawiki/page_delete -description: Represents a MW Page Delete event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event-specific fields - title: - type: string - description: the title of the page - page_id: - type: integer - minimum: 1 - description: the page ID of the deleted page - user_id: - type: integer - description: the user that performed the delete - user_text: - type: string - description: the text representation of the user - summary: - type: string - description: the summary comment left by the user -required: - - meta - - title diff --git a/jsonschema/mediawiki/page_move/1.yaml b/jsonschema/mediawiki/page_move/1.yaml deleted file mode 100644 index 1fcf4bf..0000000 --- a/jsonschema/mediawiki/page_move/1.yaml +++ /dev/null @@ -1,77 +0,0 @@ -title: mediawiki/page_move -description: Represents a MW Page Move event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event-specific fields - new_title: - type: string - description: the new title of the page - old_title: - type: string - description: the old title of the page - page_id: - type: integer - minimum: 1 - description: the page ID of the moved page - old_revision_id: - type: integer - minimum: 0 - description: the last revision ID before the move - new_revision_id: - type: integer - minimum: 0 - description: the first revision ID after the move - user_id: - type: integer - description: the user that performed the move - user_text: - type: string - description: the text representation of the user - summary: - type: string - description: the summary comment left by the user -required: - - meta - - new_title - - old_title - - page_id diff --git a/jsonschema/mediawiki/page_restore/1.yaml b/jsonschema/mediawiki/page_restore/1.yaml deleted file mode 100644 index 91166c2..0000000 --- a/jsonschema/mediawiki/page_restore/1.yaml +++ /dev/null @@ -1,71 +0,0 @@ -title: mediawiki/page_restore -description: Represents a MW Page Restore Edit event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event-specific fields - title: - type: string - description: the title of the page - new_page_id: - type: integer - minimum: 1 - description: the new page ID of the restored page - old_page_id: - type: integer - minimum: 1 - description: the old page ID of the restored page - namespace: - type: integer - description: the namespace ID the page belongs to - user_id: - type: integer - description: the user that performed the restoration - user_text: - type: string - description: the text representation of the user - summary: - type: string - description: the summary comment left by the user -required: - - meta - - title diff --git a/jsonschema/mediawiki/revision_create/1.yaml b/jsonschema/mediawiki/revision_create/1.yaml deleted file mode 100644 index 0fc51b0..0000000 --- a/jsonschema/mediawiki/revision_create/1.yaml +++ /dev/null @@ -1,88 +0,0 @@ -title: mediawiki/revision_create -description: Represents a MW Revision Creation event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event-specific fields - page_title: - type: string - description: the title of the affected page - page_id: - type: integer - minimum: 1 - description: the page ID of the affected page - page_namespace: - type: integer - description: the namespace ID the page belongs to - rev_id: - type: integer - minimum: 0 - description: the revision ID created by this event - rev_parent_id: - type: integer - minimum: 0 - description: the revision ID that this newly-created revision is based on - rev_timestamp: - type: string - format: date-time - description: the time stamp of the revision in ISO8601 format - user_id: - type: integer - description: the user that performed the edit - user_text: - type: string - description: the text representation of the user - comment: - type: string - description: the summary comment left by the user - rev_by_bot: - type: boolean - description: flag identifying if the revision is made by a bot -required: - - meta - - page_title - - rev_id - - rev_timestamp -# After deploying https://gerrit.wikimedia.org/r/#/c/288210/9 we would need to do a non-backwards-compatible -# change of the schema anyway, so make the rev_is_bot flag optional for now and uncomment together with other -# backwards incompatible changes. -# - rev_is_bot \ No newline at end of file diff --git a/jsonschema/mediawiki/revision_visibility_set/1.yaml b/jsonschema/mediawiki/revision_visibility_set/1.yaml deleted file mode 100644 index 96ade59..0000000 --- a/jsonschema/mediawiki/revision_visibility_set/1.yaml +++ /dev/null @@ -1,73 +0,0 @@ -title: mediawiki/revision_visibiilty_set -description: Represents a MW Revision Visibility Set event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event-specific fields - revision_id: - type: integer - minimum: 0 - description: the revision ID the visibility of which is being changed - hidden: - type: object - properties: - sha1: - type: boolean - description: "whether the SHA1 of the revision's text is available" - text: - type: boolean - description: "whether the revision's text is available" - user: - type: boolean - description: "whether the author of the revision's text is available" - comment: - type: boolean - description: whether the comment of the revision is available - user_id: - type: integer - description: the user that performed the visibility change - user_text: - type: string - description: the text representation of the user -required: - - meta - - revision_id diff --git a/jsonschema/mediawiki/user_block/1.yaml b/jsonschema/mediawiki/user_block/1.yaml deleted file mode 100644 index 6187e43..0000000 --- a/jsonschema/mediawiki/user_block/1.yaml +++ /dev/null @@ -1,80 +0,0 @@ -title: mediawiki/user_block -description: Represents a MW User Block event -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - # global event fields - meta: - type: object - properties: - topic: - type: string - description: the queue topic name this message belongs to - schema_uri: - type: string - description: > - The URI identifying the jsonschema for this event. This may be just - a short uri containing only the name and revision at the end of the - URI path. e.g. schema_name/12345 is acceptable. This field - is not required. - uri: - type: string - format: uri - description: the unique URI identifying the event - request_id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique UUID v1 ID of the event derived from the X-Request-Id header - id: - type: string - pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$' - description: the unique ID of this event; should match the dt field - dt: - type: string - format: date-time - description: the time stamp of the event, in ISO8601 format - domain: - type: string - description: the domain the event pertains to - required: - - topic - - uri - - id - - dt - - domain - # event specific fields - user_blocked: - type: string - description: the user name or IP address being blocked - # not required; results in an indefinite block if omitted - expiry: - type: string - description: the timestamp the block expires - blocks: - type: object - properties: - name: - type: boolean - description: whether the name or IP should be suppressed (hidden) - email: - type: boolean - description: whether email sending should be blocked - user_talk: - type: boolean - description: whether the user should be prevented from editing their own talk page - account_create: - type: boolean - description: whether to block account creation from the user or IP - reason: - type: string - description: the reason for creating the block - user_id: - type: integer - description: the user that performed the block - user_text: - type: string - description: the text representation of the user performing the block -required: - - meta - - user_blocked - - blocks \ No newline at end of file diff --git a/test/jsonschema/mediawiki/page/mediawiki_common_schema.yaml b/test/jsonschema/mediawiki/mediawiki_common_schema.yaml similarity index 100% rename from test/jsonschema/mediawiki/page/mediawiki_common_schema.yaml rename to test/jsonschema/mediawiki/mediawiki_common_schema.yaml diff --git a/test/jsonschema/mediawiki/revision/mediawiki_common_schema.yaml b/test/jsonschema/mediawiki/revision/mediawiki_common_schema.yaml deleted file mode 100644 index 86ac6da..0000000 --- a/test/jsonschema/mediawiki/revision/mediawiki_common_schema.yaml +++ /dev/null @@ -1,33 +0,0 @@ -title: Mediawiki Common Schema -description: Used to validate that all mediawiki events have common properties -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - ### Mediawiki entity fields. All Mediawiki entity events should have these. - database: - type: string - - performer: - type: object - properties: - user_id: - type: integer - user_text: - type: string - user_groups: - type: array - items: - type: string - user_is_bot: - type: boolean - required: - - user_text - - user_groups - - user_is_bot - - comment: - type: string - -required: - - database - - performer diff --git a/test/jsonschema/mediawiki/user/mediawiki_common_schema.yaml b/test/jsonschema/mediawiki/user/mediawiki_common_schema.yaml deleted file mode 100644 index 86ac6da..0000000 --- a/test/jsonschema/mediawiki/user/mediawiki_common_schema.yaml +++ /dev/null @@ -1,33 +0,0 @@ -title: Mediawiki Common Schema -description: Used to validate that all mediawiki events have common properties -$schema: http://json-schema.org/draft-04/schema# -type: object -properties: - ### Mediawiki entity fields. All Mediawiki entity events should have these. - database: - type: string - - performer: - type: object - properties: - user_id: - type: integer - user_text: - type: string - user_groups: - type: array - items: - type: string - user_is_bot: - type: boolean - required: - - user_text - - user_groups - - user_is_bot - - comment: - type: string - -required: - - database - - performer -- To view, visit https://gerrit.wikimedia.org/r/308196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbddbd599cbdbe954d5f3b1502a52cb96b290dd8 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/event-schemas Gerrit-Branch: master Gerrit-Owner: Ppchelko <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: Ppchelko <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
