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.

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

TS config cleanup #90492

Merged
merged 17 commits into from
Feb 11, 2021
Merged

TS config cleanup #90492

merged 17 commits into from
Feb 11, 2021

Conversation

mshustov
Copy link
Contributor

@mshustov mshustov commented Feb 5, 2021

Summary

  • excludes the whole src/plugins/** folder in tsconfig.json
  • excludes all but not-yet-migraged plugins in x-pack/plugins/** folder in x-pack/tsconfig.json
  • removes fixtures alias
    • most of the fixtures are unused
    • used fixtures were copied to plugin folders. It's done because fixtures have no owners. Plugins might consider moving them to a single-plugin owner later.

@mshustov mshustov added chore v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.12.0 labels Feb 5, 2021
@mshustov mshustov marked this pull request as ready for review February 8, 2021 15:20
@mshustov mshustov requested a review from a team February 8, 2021 15:20
@mshustov mshustov requested a review from a team as a code owner February 8, 2021 15:20
Copy link
Member

@mistic mistic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes under operations team code owners LGTM

@mshustov mshustov changed the title Tsconfig cleanup TS config cleanup Feb 8, 2021
Copy link
Contributor

@flash1293 flash1293 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

KibanaApp changes LGTM, code review only. Thanks for taking care of this!

@mshustov mshustov enabled auto-merge (squash) February 11, 2021 09:38
@mshustov mshustov requested review from a team as code owners February 11, 2021 11:11
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Feb 11, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

export {
migratePackagePolicyToV7110,
migratePackagePolicyToV7120,
} from '../../../security_solution/common';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

created #91111

@mshustov mshustov added the auto-backport Deprecated - use backport:version if exact versions are needed label Feb 11, 2021
Copy link
Contributor

@patrykkopycinski patrykkopycinski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

osquery LGTM

Copy link
Contributor

@jfsiii jfsiii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fleet-related code changes lgtm. Checked out locally and it fixed some issues in VS code for src/core folders.

current

Screen Shot 2021-02-10 at 11 10 35 AM

PR

Screen Shot 2021-02-10 at 6 21 34 PM

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@mshustov mshustov merged commit a1490d4 into elastic:master Feb 11, 2021
@kibanamachine
Copy link
Contributor

Backport result

{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"meta":{"labels":["Team:Fleet","auto-backport","chore","release_note:skip","v7.12.0","v8.0.0"],"branchLabelMapping":{"^v8.0.0$":"master","^v7.12.0$":"7.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"},"existingTargetPullRequests":[]},"level":"info","message":"Inputs when calculating target branches:"}
{"meta":["7.x"],"level":"info","message":"Target branches inferred from labels:"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm kibanamachine","stdout":"","stderr":"error: No such remote: 'kibanamachine'\n"},"level":"info","message":"exec error 'git remote rm kibanamachine':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm elastic","stdout":"","stderr":"error: No such remote: 'elastic'\n"},"level":"info","message":"exec error 'git remote rm elastic':"}
{"level":"info","message":"Backporting [{\"sourceBranch\":\"master\",\"targetBranchesFromLabels\":[\"7.x\"],\"sha\":\"a1490d46f419002f28492d2bcdb26fe5c4a5880c\",\"formattedMessage\":\"TS config cleanup (#90492)\",\"originalMessage\":\"TS config cleanup (#90492)\\n\\n* exclude all the plugins from src/plugins\\r\\n\\r\\n* move all the used fixtures to discover\\r\\n\\r\\n* remove src/fixtures alias\\r\\n\\r\\n* remove unused fixtures\\r\\n\\r\\n* cleanup x-pack/tsconfig.json\\r\\n\\r\\n* dont compile apm/scripts\\r\\n\\r\\n* fix tests\\r\\n\\r\\n* dont include infra in xpack/tsconfig.json\\r\\n\\r\\n* update list of includes\",\"pullNumber\":90492,\"existingTargetPullRequests\":[]}] to 7.x"}

Backporting to 7.x:
{"level":"info","message":"Backporting via filesystem"}
{"meta":{"killed":false,"code":1,"signal":null,"cmd":"git cherry-pick a1490d46f419002f28492d2bcdb26fe5c4a5880c","stdout":"Auto-merging x-pack/plugins/fleet/server/services/package_policy.ts\nRemoving src/type_definitions/react_virtualized.d.ts\nRemoving src/fixtures/stubbed_search_source.js\nRemoving src/fixtures/search_response.js\nRemoving src/fixtures/mock_ui_state.js\nRemoving src/fixtures/mock_state.js\nRemoving src/fixtures/mock_index_patterns.js\nRemoving src/fixtures/mapping_with_dupes.js\nCONFLICT (modify/delete): src/fixtures/hits.js deleted in a1490d46f41 (TS config cleanup (#90492)) and modified in HEAD. Version HEAD of src/fixtures/hits.js left in tree.\nRemoving src/fixtures/field_mapping.js\nRemoving src/fixtures/fake_hierarchical_data.ts\nRemoving src/fixtures/fake_chart_events.js\nRemoving src/fixtures/config_upgrade_from_4.0.0_to_4.0.1.json\nRemoving src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json\nRemoving src/fixtures/config_upgrade_from_4.0.0.json\nRemoving src/fixtures/agg_resp/range.js\nRemoving src/fixtures/agg_resp/geohash_grid.js\nRemoving src/fixtures/agg_resp/date_histogram.js\nAuto-merging src/dev/precommit_hook/casing_check_config.js\nAuto-merging packages/kbn-test/jest-preset.js\n","stderr":"Performing inexact rename detection:  63% (69750/109647)\rPerforming inexact rename detection:  65% (71424/109647)\rPerforming inexact rename detection:  66% (72540/109647)\rPerforming inexact rename detection:  67% (73656/109647)\rPerforming inexact rename detection:  68% (74772/109647)\rPerforming inexact rename detection:  69% (75888/109647)\rPerforming inexact rename detection:  70% (77004/109647)\rPerforming inexact rename detection:  71% (78120/109647)\rPerforming inexact rename detection:  72% (78957/109647)\rPerforming inexact rename detection:  73% (80073/109647)\rPerforming inexact rename detection:  74% (81189/109647)\rPerforming inexact rename detection:  75% (82305/109647)\rPerforming inexact rename detection:  76% (83421/109647)\rPerforming inexact rename detection:  77% (84537/109647)\rPerforming inexact rename detection:  78% (85653/109647)\rPerforming inexact rename detection:  79% (86769/109647)\rPerforming inexact rename detection:  80% (87885/109647)\rPerforming inexact rename detection:  81% (89001/109647)\rPerforming inexact rename detection:  82% (90117/109647)\rPerforming inexact rename detection:  83% (91233/109647)\rPerforming inexact rename detection:  84% (92349/109647)\rPerforming inexact rename detection:  85% (93465/109647)\rPerforming inexact rename detection:  86% (94302/109647)\rPerforming inexact rename detection:  87% (95418/109647)\rPerforming inexact rename detection:  88% (96534/109647)\rPerforming inexact rename detection:  89% (97650/109647)\rPerforming inexact rename detection:  90% (98766/109647)\rPerforming inexact rename detection:  91% (99882/109647)\rPerforming inexact rename detection:  92% (100998/109647)\rPerforming inexact rename detection:  93% (102114/109647)\rPerforming inexact rename detection:  94% (103230/109647)\rPerforming inexact rename detection:  95% (104346/109647)\rPerforming inexact rename detection:  96% (105462/109647)\rPerforming inexact rename detection:  97% (106578/109647)\rPerforming inexact rename detection:  98% (107694/109647)\rPerforming inexact rename detection:  99% (108810/109647)\rPerforming inexact rename detection: 100% (109647/109647)\rPerforming inexact rename detection: 100% (109647/109647), done.\nerror: could not apply a1490d46f41... TS config cleanup (#90492)\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n"},"level":"info","message":"exec error 'git cherry-pick a1490d46f419002f28492d2bcdb26fe5c4a5880c':"}
Commit could not be cherrypicked due to conflicts

@mshustov mshustov deleted the tsconfig-cleanup branch February 11, 2021 17:49
mshustov added a commit that referenced this pull request Feb 11, 2021
* exclude all the plugins from src/plugins

* move all the used fixtures to discover

* remove src/fixtures alias

* remove unused fixtures

* cleanup x-pack/tsconfig.json

* dont compile apm/scripts

* fix tests

* dont include infra in xpack/tsconfig.json

* update list of includes
# Conflicts:
#	src/fixtures/hits.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed backported chore release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.12.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants