Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[eslint] enable object-curly-spacing and no-global-assign #9486

Merged
merged 3 commits into from
Dec 14, 2016
Merged

[eslint] enable object-curly-spacing and no-global-assign #9486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
247bc8e
[eslint] update eslint config to 0.3.0
spalger Dec 14, 2016
6ed0986
[eslint] autofix
spalger Dec 14, 2016
edf7f2c
[fixtures/hits] reformat to comply with max-len lint rule
spalger Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"wreck": "6.2.0"
},
"devDependencies": {
"@elastic/eslint-config-kibana": "0.2.2",
"@elastic/eslint-config-kibana": "0.3.0",
"angular-mocks": "1.4.7",
"auto-release-sinon": "1.0.3",
"babel-eslint": "6.1.2",
Expand All @@ -181,6 +181,7 @@
"del": "1.2.1",
"elasticdump": "2.1.1",
"eslint": "3.11.1",
"eslint-plugin-babel": "4.0.0",
"eslint-plugin-mocha": "4.7.0",
"event-stream": "3.3.2",
"expect.js": "0.3.1",
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cluster/base_path_proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default class BasePathProxy {
method: '*',
path: `/{oldBasePath}/{kbnPath*}`,
handler(req, reply) {
const {oldBasePath, kbnPath = ''} = req.params;
const { oldBasePath, kbnPath = '' } = req.params;

const isGet = req.method === 'get';
const isBasePath = oldBasePath.length === 3;
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/console/api_server/es_5_0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function ES_5_0() {
}, this);
}

ES_5_0.prototype = _.create(Api.prototype, {'constructor': ES_5_0});
ES_5_0.prototype = _.create(Api.prototype, { 'constructor': ES_5_0 });

(function (cls) {
cls.addEndpointDescription = function (endpoint, description) {
Expand Down
102 changes: 51 additions & 51 deletions src/core_plugins/console/api_server/es_5_0/aggregations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
var simple_metric = {
__template: {field: ""},
__template: { field: "" },
field: "{field}",
missing: 0,
script: {
// populated by a global rule
}
}, field_metric = {
__template: {field: ""},
__template: { field: "" },
field: "{field}"
}, gap_policy = {
__one_of: ["skip", "insert_zeros"]
Expand Down Expand Up @@ -51,9 +51,9 @@ var rules = {
}
},
"filters": {
"*": {__scope_link: "GLOBAL.filter"}
"*": { __scope_link: "GLOBAL.filter" }
},
"other_bucket": {__one_of: [true, false]},
"other_bucket": { __one_of: [true, false] },
"other_bucket_key": ""
},
"missing": field_metric,
Expand Down Expand Up @@ -81,19 +81,19 @@ var rules = {
__template: {
"_term": "asc"
},
"_term": {__one_of: ["asc", "desc"]},
"_count": {__one_of: ["asc", "desc"]},
"*": {__one_of: ["asc", "desc"]}
"_term": { __one_of: ["asc", "desc"] },
"_count": { __one_of: ["asc", "desc"] },
"*": { __one_of: ["asc", "desc"] }
},
"min_doc_count": 10,
"script": {
// populated by a global rule
},
"include": ".*",
"exclude": ".*",
"execution_hint": {__one_of: ["map", "global_ordinals", "global_ordinals_hash", "global_ordinals_low_cardinality"]},
"show_term_doc_count_error": {__one_of: [true, false]},
"collect_mode": {__one_of: ["depth_first", "breadth_first"]},
"execution_hint": { __one_of: ["map", "global_ordinals", "global_ordinals_hash", "global_ordinals_low_cardinality"] },
"show_term_doc_count_error": { __one_of: [true, false] },
"collect_mode": { __one_of: ["depth_first", "breadth_first"] },
"missing": ""
},
"significant_terms": {
Expand All @@ -105,22 +105,22 @@ var rules = {
"shard_size": 10,
"shard_min_doc_count": 10,
"min_doc_count": 10,
"include": {__one_of: ["*", {pattern: "", flags: ""}]},
"exclude": {__one_of: ["*", {pattern: "", flags: ""}]},
"execution_hint": {__one_of: ["map", "global_ordinals", "global_ordinals_hash"]},
"include": { __one_of: ["*", { pattern: "", flags: "" }] },
"exclude": { __one_of: ["*", { pattern: "", flags: "" }] },
"execution_hint": { __one_of: ["map", "global_ordinals", "global_ordinals_hash"] },
"background_filter": {
__scope_link: "GLOBAL.filter"
},
"mutual_information": {
"include_negatives": {__one_of: [true, false]}
"include_negatives": { __one_of: [true, false] }
},
"chi_square": {
"include_negatives": {__one_of: [true, false]},
"background_is_superset": {__one_of: [true, false]}
"include_negatives": { __one_of: [true, false] },
"background_is_superset": { __one_of: [true, false] }
},
"percentage": {},
"gnd": {
"background_is_superset": {__one_of: [true, false]}
"background_is_superset": { __one_of: [true, false] }
},
"script_heuristic": {
__template: {
Expand All @@ -135,14 +135,14 @@ var rules = {
__template: {
"field": "",
"ranges": [
{"from": 50, "to": 100},
{ "from": 50, "to": 100 },
]
},
"field": "{field}",
"ranges": [
{"to": 50, "from": 100, "key": ""}
{ "to": 50, "from": 100, "key": "" }
],
"keyed": {__one_of: [true, false]},
"keyed": { __one_of: [true, false] },
"script": {
// populated by a global rule
}
Expand All @@ -151,15 +151,15 @@ var rules = {
__template: {
"field": "",
"ranges": [
{"from": "now-10d/d", "to": "now"},
{ "from": "now-10d/d", "to": "now" },
]
},
"field": "{field}",
"format": "MM-yyy",
"ranges": [
{"to": "", "from": "", "key": ""}
{ "to": "", "from": "", "key": "" }
],
"keyed": {__one_of: [true, false]},
"keyed": { __one_of: [true, false] },
"script": {
// populated by a global rule
}
Expand All @@ -168,15 +168,15 @@ var rules = {
__template: {
"field": "",
"ranges": [
{"from": "10.0.0.5", "to": "10.0.0.10"},
{ "from": "10.0.0.5", "to": "10.0.0.10" },
]
},
"field": "{field}",
"format": "MM-yyy",
"ranges": [
{"to": "", "from": "", "key": "", "mask": "10.0.0.127/25"}
{ "to": "", "from": "", "key": "", "mask": "10.0.0.127/25" }
],
"keyed": {__one_of: [true, false]},
"keyed": { __one_of: [true, false] },
"script": {
// populated by a global rule
}
Expand All @@ -193,11 +193,11 @@ var rules = {
__template: {
"_key": "asc"
},
"_key": {__one_of: ["asc", "desc"]},
"_count": {__one_of: ["asc", "desc"]},
"*": {__one_of: ["asc", "desc"]}
"_key": { __one_of: ["asc", "desc"] },
"_count": { __one_of: ["asc", "desc"] },
"*": { __one_of: ["asc", "desc"] }
},
"keyed": {__one_of: [true, false]},
"keyed": { __one_of: [true, false] },
"missing": 0
},
"date_histogram": {
Expand All @@ -206,20 +206,20 @@ var rules = {
"interval": "month"
},
"field": "{field}",
"interval": {__one_of: ["year", "quarter", "week", "day", "hour", "minute", "second"]},
"interval": { __one_of: ["year", "quarter", "week", "day", "hour", "minute", "second"] },
"min_doc_count": 0,
"order": {
__template: {
"_key": "asc"
},
"_key": {__one_of: ["asc", "desc"]},
"_count": {__one_of: ["asc", "desc"]},
"*": {__one_of: ["asc", "desc"]}
"_key": { __one_of: ["asc", "desc"] },
"_count": { __one_of: ["asc", "desc"] },
"*": { __one_of: ["asc", "desc"] }
},
"keyed": {__one_of: [true, false]},
"keyed": { __one_of: [true, false] },
"pre_zone": "-01:00",
"post_zone": "-01:00",
"pre_zone_adjust_large_interval": {__one_of: [true, false]},
"pre_zone_adjust_large_interval": { __one_of: [true, false] },
"factor": 1000,
"pre_offset": "1d",
"post_offset": "1d",
Expand All @@ -230,18 +230,18 @@ var rules = {
"geo_distance": {
__template: {
"field": "location",
"origin": {"lat": 52.3760, "lon": 4.894},
"origin": { "lat": 52.3760, "lon": 4.894 },
"ranges": [
{"from": 100, "to": 300},
{ "from": 100, "to": 300 },
]
},
"field": "{field}",
"origin": {"lat": 0.0, "lon": 0.0},
"unit": {__one_of: ["mi", "km", "in", "yd", "m", "cm", "mm"]},
"origin": { "lat": 0.0, "lon": 0.0 },
"unit": { __one_of: ["mi", "km", "in", "yd", "m", "cm", "mm"] },
"ranges": [
{"from": 50, "to": 100}
{ "from": 50, "to": 100 }
],
"distance_type": {__one_of: ["arc", "sloppy_arc", "plane"]}
"distance_type": { __one_of: ["arc", "sloppy_arc", "plane"] }

},
"geohash_grid": {
Expand All @@ -250,7 +250,7 @@ var rules = {
"precision": 3
},
"field": "{field}",
"precision": {__one_of: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]},
"precision": { __one_of: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] },
"size": 10,
"shard_size": 10
},
Expand All @@ -269,7 +269,7 @@ var rules = {
// populated by a global rule
},
"compression": 100,
"method": {__one_of: ["hdr", "tdigest"]},
"method": { __one_of: ["hdr", "tdigest"] },
missing: 0
},
"cardinality": {
Expand Down Expand Up @@ -311,7 +311,7 @@ var rules = {
field: ""
},
field: "{field}",
wrap_longitude: {__one_of: [true, false]}
wrap_longitude: { __one_of: [true, false] }
},
"top_hits": {
__template: {
Expand All @@ -324,7 +324,7 @@ var rules = {
__scope_link: "_search.sort"
},
highlight: {},
explain: {__one_of: [true, false]},
explain: { __one_of: [true, false] },
_source: {
__template: "",
__scope_link: "_search._source"
Expand All @@ -333,7 +333,7 @@ var rules = {
__scope_link: "_search.script_fields"
},
docvalue_fields: ["{field}"],
version: {__one_of: [true, false]}
version: { __one_of: [true, false] }
},
"percentile_ranks": {
__template: {
Expand All @@ -346,7 +346,7 @@ var rules = {
// populated by a global rule
},
"compression": 100,
"method": {__one_of: ["hdr", "tdigest"]},
"method": { __one_of: ["hdr", "tdigest"] },
missing: 0
},
"sampler": {
Expand All @@ -357,7 +357,7 @@ var rules = {
},
"shard_size": 100,
"max_docs_per_value": 3,
"execution_hint": {__one_of: ["map", "global_ordinals", "bytes_hash"]}
"execution_hint": { __one_of: ["map", "global_ordinals", "bytes_hash"] }
},
"children": {
__template: {
Expand All @@ -378,9 +378,9 @@ var rules = {
format: "",
gap_policy: gap_policy,
"window": 5,
model: {__one_of: ["simple", "linear", "ewma", "holt", "holt_winters"]},
model: { __one_of: ["simple", "linear", "ewma", "holt", "holt_winters"] },
settings: {
type: {__one_of: ["add", "mult"]},
type: { __one_of: ["add", "mult"] },
alpha: 0.5,
beta: 0.5,
gamma: 0.5,
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/console/api_server/es_5_0/aliases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = function (api) {
data_autocomplete_rules: {
'actions': {
__template: [
{'add': {'index': 'test1', 'alias': 'alias1'}}
{ 'add': { 'index': 'test1', 'alias': 'alias1' } }
],
__any_of: [
{
Expand Down
6 changes: 3 additions & 3 deletions src/core_plugins/console/api_server/es_5_0/cat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let _ = require("lodash");

function addSimpleCat(endpoint, api, params, patterns) {
var url_params = {"help": "__flag__", "v": "__flag__", "bytes": ["b"]};
var url_params = { "help": "__flag__", "v": "__flag__", "bytes": ["b"] };
_.each(params || [], function (p) {
if (_.isString(p)) {
url_params[p] = "__flag__";
Expand Down Expand Up @@ -37,10 +37,10 @@ module.exports = function (api) {
addSimpleCat('_cat/allocation', api, null, ['_cat/allocation', '_cat/allocation/{nodes}']);
addSimpleCat('_cat/count', api);
addSimpleCat('_cat/health', api, [
{"ts": ["false", "true"]}
{ "ts": ["false", "true"] }
]);
addSimpleCat('_cat/indices', api, [
{h: []},
{ h: [] },
"pri",
],
['_cat/indices', '_cat/indices/{indices}']);
Expand Down
16 changes: 8 additions & 8 deletions src/core_plugins/console/api_server/es_5_0/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ module.exports = function (api) {
persistent: {
cluster: {
routing: {
'allocation.enable': {__one_of: ["all", "primaries", "new_primaries", "none"]},
'allocation.disk.threshold_enabled': {__one_of: [false, true]},
'allocation.enable': { __one_of: ["all", "primaries", "new_primaries", "none"] },
'allocation.disk.threshold_enabled': { __one_of: [false, true] },
'allocation.disk.watermark.low': '85%',
'allocation.disk.watermark.high': '90%',
'allocation.disk.include_relocations': {__one_of: [true, false]},
'allocation.disk.include_relocations': { __one_of: [true, false] },
'allocation.disk.reroute_interval': '60s',
'allocation.exclude': {
'_ip': "",
Expand All @@ -68,11 +68,11 @@ module.exports = function (api) {
'values': []
}
},
'allocation.allow_rebalance': {__one_of: ['always', 'indices_primaries_active', 'indices_all_active']},
'allocation.allow_rebalance': { __one_of: ['always', 'indices_primaries_active', 'indices_all_active'] },
'allocation.cluster_concurrent_rebalance': 2,
'allocation.node_initial_primaries_recoveries': 4,
'allocation.node_concurrent_recoveries': 2,
'allocation.same_shard.host': {__one_of: [false, true]}
'allocation.same_shard.host': { __one_of: [false, true] }
}
},
indices: {
Expand Down Expand Up @@ -121,7 +121,7 @@ module.exports = function (api) {
index: "{index}",
shard: 0,
node: "{node}",
allow_primary: {__one_of: [true, false]}
allow_primary: { __one_of: [true, false] }
},
allocate: {
__template: {
Expand All @@ -132,11 +132,11 @@ module.exports = function (api) {
index: "{index}",
shard: 0,
node: "{node}",
allow_primary: {__one_of: [true, false]}
allow_primary: { __one_of: [true, false] }
}
}
],
dry_run: {__one_of: [true, false]}
dry_run: { __one_of: [true, false] }
}
});
};
Loading