-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into np-licensing-functional-tests
- Loading branch information
Showing
96 changed files
with
4,677 additions
and
461 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| on: | ||
| pull_request: | ||
| types: [labeled, unlabeled] | ||
|
|
||
| jobs: | ||
| assign_to_project: | ||
| runs-on: ubuntu-latest | ||
| name: Assign a PR to project based on label | ||
| steps: | ||
| - name: Assign to project | ||
| uses: elastic/github-actions/project-assigner@v1.0.0 | ||
| id: project_assigner | ||
| with: | ||
| issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]' | ||
| ghToken: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| on: | ||
| issues: | ||
| types: [labeled, unlabeled] | ||
|
|
||
| jobs: | ||
| assign_to_project: | ||
| runs-on: ubuntu-latest | ||
| name: Assign issue or PR to project based on label | ||
| steps: | ||
| - name: Assign to project | ||
| uses: elastic/github-actions/project-assigner@v1.0.0 | ||
| id: project_assigner | ||
| with: | ||
| issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]' | ||
| ghToken: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
packages/kbn-test/src/failed_tests_reporter/report_metadata.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { getReportMessageIter } from './report_metadata'; | ||
| import { parseTestReport } from './test_report'; | ||
| import { FTR_REPORT, JEST_REPORT, KARMA_REPORT, MOCHA_REPORT } from './__fixtures__'; | ||
|
|
||
| it('reads messages and screenshots from metadata-json properties', async () => { | ||
| const ftrReport = await parseTestReport(FTR_REPORT); | ||
| expect(Array.from(getReportMessageIter(ftrReport))).toMatchInlineSnapshot(` | ||
| Array [ | ||
| Object { | ||
| "classname": "Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/maps", | ||
| "message": "foo", | ||
| "name": "maps app \\"after all\\" hook", | ||
| }, | ||
| Object { | ||
| "classname": "Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/maps", | ||
| "message": "Screenshot: failure[dashboard app using current data dashboard snapshots compare TSVB snapshot] https://storage.googleapis.com/kibana-ci-artifacts/jobs/elastic+kibana+7.x/1632/kibana-oss-tests/test/functional/screenshots/failure/dashboard%20app%20using%20current%20data%20dashboard%20snapshots%20compare%20TSVB%20snapshot.png", | ||
| "name": "maps app \\"after all\\" hook", | ||
| }, | ||
| ] | ||
| `); | ||
|
|
||
| const jestReport = await parseTestReport(JEST_REPORT); | ||
| expect(Array.from(getReportMessageIter(jestReport))).toMatchInlineSnapshot(`Array []`); | ||
|
|
||
| const mochaReport = await parseTestReport(MOCHA_REPORT); | ||
| expect(Array.from(getReportMessageIter(mochaReport))).toMatchInlineSnapshot(`Array []`); | ||
|
|
||
| const karmaReport = await parseTestReport(KARMA_REPORT); | ||
| expect(Array.from(getReportMessageIter(karmaReport))).toMatchInlineSnapshot(`Array []`); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
.../np_ready/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import ace from 'brace'; | ||
|
|
||
| const { TextHighlightRules } = ace.acequire('ace/mode/text_highlight_rules'); | ||
| const oop = ace.acequire('ace/lib/oop'); | ||
|
|
||
| export const ElasticsearchSqlHighlightRules = function(this: any) { | ||
| // See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-commands.html | ||
| const keywords = | ||
| 'describe|between|in|like|not|and|or|desc|select|from|where|having|group|by|order' + | ||
| 'asc|desc|pivot|for|in|as|show|columns|include|frozen|tables|escape|limit|rlike|all|distinct|is'; | ||
|
|
||
| const builtinConstants = 'true|false'; | ||
|
|
||
| // See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html | ||
| const builtinFunctions = | ||
| 'avg|count|first|first_value|last|last_value|max|min|sum|kurtosis|mad|percentile|percentile_rank|skewness' + | ||
| '|stddev_pop|sum_of_squares|var_pop|histogram|case|coalesce|greatest|ifnull|iif|isnull|least|nullif|nvl' + | ||
| '|curdate|current_date|current_time|current_timestamp|curtime|dateadd|datediff|datepart|datetrunc|date_add' + | ||
| '|date_diff|date_part|date_trunc|day|dayname|dayofmonth|dayofweek|dayofyear|day_name|day_of_month|day_of_week' + | ||
| '|day_of_year|dom|dow|doy|hour|hour_of_day|idow|isodayofweek|isodow|isoweek|isoweekofyear|iso_day_of_week|iso_week_of_year' + | ||
| '|iw|iwoy|minute|minute_of_day|minute_of_hour|month|monthname|month_name|month_of_year|now|quarter|second|second_of_minute' + | ||
| '|timestampadd|timestampdiff|timestamp_add|timestamp_diff|today|week|week_of_year|year|abs|acos|asin|atan|atan2|cbrt' + | ||
| '|ceil|ceiling|cos|cosh|cot|degrees|e|exp|expm1|floor|log|log10|mod|pi|power|radians|rand|random|round|sign|signum|sin' + | ||
| '|sinh|sqrt|tan|truncate|ascii|bit_length|char|character_length|char_length|concat|insert|lcase|left|length|locate' + | ||
| '|ltrim|octet_length|position|repeat|replace|right|rtrim|space|substring|ucase|cast|convert|database|user|st_astext|st_aswkt' + | ||
| '|st_distance|st_geometrytype|st_geomfromtext|st_wkttosql|st_x|st_y|st_z|score'; | ||
|
|
||
| // See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-data-types.html | ||
| const dataTypes = | ||
| 'null|boolean|byte|short|integer|long|double|float|half_float|scaled_float|keyword|text|binary|date|ip|object|nested|time' + | ||
| '|interval_year|interval_month|interval_day|interval_hour|interval_minute|interval_second|interval_year_to_month' + | ||
| 'inteval_day_to_hour|interval_day_to_minute|interval_day_to_second|interval_hour_to_minute|interval_hour_to_second' + | ||
| 'interval_minute_to_second|geo_point|geo_shape|shape'; | ||
|
|
||
| const keywordMapper = this.createKeywordMapper( | ||
| { | ||
| keyword: [keywords, builtinFunctions, builtinConstants, dataTypes].join('|'), | ||
| }, | ||
| 'identifier', | ||
| true | ||
| ); | ||
|
|
||
| this.$rules = { | ||
| start: [ | ||
| { | ||
| token: 'comment', | ||
| regex: '--.*$', | ||
| }, | ||
| { | ||
| token: 'comment', | ||
| start: '/\\*', | ||
| end: '\\*/', | ||
| }, | ||
| { | ||
| token: 'string', // " string | ||
| regex: '".*?"', | ||
| }, | ||
| { | ||
| token: 'constant', // ' string | ||
| regex: "'.*?'", | ||
| }, | ||
| { | ||
| token: 'string', // ` string (apache drill) | ||
| regex: '`.*?`', | ||
| }, | ||
| { | ||
| token: 'entity.name.function', // float | ||
| regex: '[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b', | ||
| }, | ||
| { | ||
| token: keywordMapper, | ||
| regex: '[a-zA-Z_$][a-zA-Z0-9_$]*\\b', | ||
| }, | ||
| { | ||
| token: 'keyword.operator', | ||
| regex: '⇐|<⇒|\\*|\\.|\\:\\:|\\+|\\-|\\/|\\/\\/|%|&|\\^|~|<|>|<=|=>|==|!=|<>|=', | ||
| }, | ||
| { | ||
| token: 'paren.lparen', | ||
| regex: '[\\(]', | ||
| }, | ||
| { | ||
| token: 'paren.rparen', | ||
| regex: '[\\)]', | ||
| }, | ||
| { | ||
| token: 'text', | ||
| regex: '\\s+', | ||
| }, | ||
| ], | ||
| }; | ||
| this.normalizeRules(); | ||
| }; | ||
|
|
||
| oop.inherits(ElasticsearchSqlHighlightRules, TextHighlightRules); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.