Mobrovac has submitted this change and it was merged.

Change subject: Use new topics and schemas for event consumption
......................................................................


Use new topics and schemas for event consumption

Change-Id: Ideaab257e8bf9f6fd9345ee855d53f23aac0edb0
---
M scap/templates/config.yaml.j2
1 file changed, 55 insertions(+), 36 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved
  Ppchelko: Looks good to me, but someone else must approve



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 5cd561f..53c6236 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -199,7 +199,7 @@
                           redirect: false
 
                     page_edit:
-                      topic: mediawiki.revision_create
+                      topic: mediawiki.revision-create
                       retry_on:
                         status:
                           - '5xx'
@@ -215,64 +215,64 @@
                           redirect: false
 
                     revision_visibility_change:
-                      topic: mediawiki.revision_visibility_set
+                      topic: mediawiki.revision-visibility-set
                       ignore:
                         status:
                           - 403 # When the revision is hidden 403 will be 
returned by RESTBase, it's a valid situation
                           - 412
                       exec:
                         method: get
-                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/revision/{{message.revision_id}}'
+                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/revision/{{message.rev_id}}'
                         headers:
                           cache-control: no-cache
                         query:
                           redirect: false
 
                     page_delete:
-                      topic: mediawiki.page_delete
+                      topic: mediawiki.page-delete
                       ignore:
                         status:
                           - 404 # 404 is a normal response for page deletion
                           - 412
                       exec:
                         method: get
-                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.title}'
+                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.page_title}'
                         headers:
                           cache-control: no-cache
                         query:
                           redirect: false
 
                     page_restore:
-                      topic: mediawiki.page_restore
+                      topic: mediawiki.page-undelete
                       exec:
                         method: get
-                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{message.title}'
+                        uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{message.page_title}'
                         headers:
                           cache-control: no-cache
                         query:
                           redirect: false
 
                     page_move:
-                      topic: mediawiki.page_move
+                      topic: mediawiki.page-move
                       exec:
                         - method: get
-                          uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{message.new_title}/{{message.new_revision_id}}'
+                          uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{message.page_title}/{{message.rev_id}}'
                           headers:
                             cache-control: no-cache
                             if-unmodified-since: '{{date(message.meta.dt)}}'
                           query:
                             redirect: false
                         - method: get
-                          uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.old_title}'
+                          uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.prior_state.page_title}'
                           headers:
                             cache-control: no-cache
                           query:
                             redirect: false
 
                     transclusion_update:
-                      topic: mediawiki.revision_create
+                      topic: mediawiki.revision-create
                       exec:
-                        method: 'post'
+                        method: post
                         uri: '/sys/links/transcludes/{message.page_title}'
                         body: '{{globals.message}}'
 
@@ -294,7 +294,7 @@
 
                     # ORES caching updates
                     ores_cache:
-                      topic: mediawiki.revision_create
+                      topic: mediawiki.revision-create
                       concurrency: 15
                       ignore:
                         status:
@@ -303,7 +303,8 @@
                         - match:
                             meta:
                               domain: ar.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/arwiki/'
                             query:
@@ -313,7 +314,8 @@
                         - match:
                             meta:
                               domain: cs.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/cswiki/'
                             query:
@@ -323,7 +325,8 @@
                         - match:
                             meta:
                               domain: en.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/enwiki/'
                             query:
@@ -333,7 +336,8 @@
                         - match:
                             meta:
                               domain: en.wiktionary.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/enwiktionary/'
                             query:
@@ -343,7 +347,8 @@
                         - match:
                             meta:
                               domain: es.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/eswiki/'
                             query:
@@ -353,7 +358,8 @@
                         - match:
                             meta:
                               domain: et.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/etwiki/'
                             query:
@@ -363,7 +369,8 @@
                         - match:
                             meta:
                               domain: fa.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/fawiki/'
                             query:
@@ -373,7 +380,8 @@
                         - match:
                             meta:
                               domain: fr.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/frwiki/'
                             query:
@@ -383,7 +391,8 @@
                         - match:
                             meta:
                               domain: he.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/hewiki/'
                             query:
@@ -393,7 +402,8 @@
                         - match:
                             meta:
                               domain: hu.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/huwiki/'
                             query:
@@ -403,7 +413,8 @@
                         - match:
                             meta:
                               domain: id.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/idwiki/'
                             query:
@@ -413,7 +424,8 @@
                         - match:
                             meta:
                               domain: it.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/itwiki/'
                             query:
@@ -423,7 +435,8 @@
                         - match:
                             meta:
                               domain: nl.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/nlwiki/'
                             query:
@@ -433,7 +446,8 @@
                         - match:
                             meta:
                               domain: pl.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/plwiki/'
                             query:
@@ -443,7 +457,8 @@
                         - match:
                             meta:
                               domain: pt.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/ptwiki/'
                             query:
@@ -453,7 +468,8 @@
                         - match:
                             meta:
                               domain: ru.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/ruwiki/'
                             query:
@@ -463,7 +479,8 @@
                         - match:
                             meta:
                               domain: tr.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/trwiki/'
                             query:
@@ -473,7 +490,8 @@
                         - match:
                             meta:
                               domain: uk.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/ukwiki/'
                             query:
@@ -483,7 +501,8 @@
                         - match:
                             meta:
                               domain: vi.wikipedia.org
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/viwiki/'
                             query:
@@ -494,7 +513,8 @@
                             meta:
                               domain: wikidata.org
                             page_namespace: 0
-                            rev_by_bot: false
+                            performer:
+                              user_is_bot: false
                           exec:
                             uri: '<%= ores_uri %>/v2/scores/wikidatawiki/'
                             query:
@@ -504,12 +524,11 @@
 
                     # Re-renders summary on WikiData item update
                     wikidata_description:
-                      topic: mediawiki.revision_create
+                      topic: mediawiki.revision-create
                       match:
                         meta:
                           domain: www.wikidata.org
-                      match_not:
-                        page_title: /:/
+                        page_namespace: 0
                       exec:
                         method: post
                         uri: '/sys/links/wikidata_descriptions'

-- 
To view, visit https://gerrit.wikimedia.org/r/310061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ideaab257e8bf9f6fd9345ee855d53f23aac0edb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to