Skip to content

Commit

Permalink
Remove fallback for stashed parsoid.
Browse files Browse the repository at this point in the history
Bug: https://phabricator.wikimedia.org/T215956
Change-Id: I92aff8085ea55482df4de78aebeb02fa53eed301
  • Loading branch information
Petr Pchelko authored and d00rman committed May 23, 2019
1 parent ece0a15 commit de620a7
Show file tree
Hide file tree
Showing 17 changed files with 12 additions and 1,161 deletions.
3 changes: 1 addition & 2 deletions doc/Implementation.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ lib/
config.yaml
specs/
restbase/
sys/
key_rev_value.yaml
sys/
key_rev_service.yaml
table.yaml # defining operationIds, which map to module exports
mediawiki/
Expand Down
17 changes: 0 additions & 17 deletions projects/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ paths:
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand All @@ -99,20 +96,6 @@ paths:
parsoidHost: '{{options.parsoid.host}}'
response_cache_control: '{{options.purged_cache_control}}'
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/mobileapps:
x-modules:
- path: sys/mobileapps.js
Expand Down
17 changes: 0 additions & 17 deletions projects/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ paths:
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand All @@ -58,19 +55,5 @@ paths:
parsoidHost: '{{options.parsoid.host}}'
response_cache_control: '{{options.purged_cache_control}}'
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
options: '{{options}}'

11 changes: 4 additions & 7 deletions projects/wikimedia.org.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ paths:
allows us to contact you quickly. Email addresses or URLs
of contact pages work well.
By using this API, you agree to Wikimedia's
By using this API, you agree to Wikimedia's
[Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
[Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
Unless otherwise specified in the endpoint documentation
below, content accessed via this API is licensed under the
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
and you irrevocably agree to release modifications or
additions made through this API under these licenses.
additions made through this API under these licenses.
See https://www.mediawiki.org/wiki/REST_API for background and details.
### Endpoint documentation
Please consult each endpoint's documentation for details on:
- Licensing information for the specific type of content
Expand Down Expand Up @@ -95,9 +95,6 @@ paths:
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/post_data: &sys_post_data
x-modules:
- path: sys/post_data.js
Expand Down
22 changes: 2 additions & 20 deletions projects/wmf_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ paths:
allows us to contact you quickly. Email addresses or URLs
of contact pages work well.
By using this API, you agree to Wikimedia's
By using this API, you agree to Wikimedia's
[Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
[Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
Unless otherwise specified in the endpoint documentation
below, content accessed via this API is licensed under the
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
and you irrevocably agree to release modifications or
additions made through this API under these licenses.
Expand Down Expand Up @@ -112,27 +112,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
18 changes: 0 additions & 18 deletions projects/wmf_enwiki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
table_name_prefix: parsoid_ng
renew_expiring: true
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
22 changes: 2 additions & 20 deletions projects/wmf_wikidata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ paths:
allows us to contact you quickly. Email addresses or URLs
of contact pages work well.
By using this API, you agree to Wikimedia's
By using this API, you agree to Wikimedia's
[Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
[Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
Unless otherwise specified in the endpoint documentation
below, content accessed via this API is licensed under the
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
[CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
and you irrevocably agree to release modifications or
additions made through this API under these licenses.
Expand Down Expand Up @@ -94,27 +94,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
table_name_prefix: parsoid_ng
renew_expiring: true
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
18 changes: 0 additions & 18 deletions projects/wmf_wikipedia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
18 changes: 0 additions & 18 deletions projects/wmf_wikivoyage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,27 +134,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
18 changes: 0 additions & 18 deletions projects/wmf_wiktionary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,27 +128,9 @@ paths:
- path: sys/table.js
options:
conf: '{{options.table}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
table_name_prefix: parsoid_ng
renew_expiring: true
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
index_ttl: '{{default(options.parsoid.index_ttl, 864000)}}'
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand Down
Loading

0 comments on commit de620a7

Please sign in to comment.