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

Add angularJS dependencies #6145

Merged

Conversation

asteriscos
Copy link
Member

@asteriscos asteriscos commented Nov 23, 2023

Description

This pull request adds the AngularJS dependencies to the plugins because OpenSearch 2.11.0 no longer includes any of them.

Issues Resolved

Closes #6135

Test

[Provide instructions to test this PR]

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@asteriscos asteriscos linked an issue Nov 23, 2023 that may be closed by this pull request
Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

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

LGTM

Details
osd-dev ➤ docker exec -ti a19 yarn start --no-base-path                                                                                                                                                                                                                                                                                   git:compatibility/osd-2.11.0-add-angular-dependencies-6135
yarn run v1.22.19
warning Skipping preferred cache folder "/home/node/.cache/yarn" because it is not writable.
warning Selected the next writable cache folder in the list, will be "/tmp/.yarn-cache-1000".
$ scripts/use_node scripts/opensearch_dashboards --dev --no-base-path
  log   [14:12:14.834] [info][plugins-service] Plugin "dataSourceManagement" has been disabled since the following direct or transitive dependencies are missing or disabled: [dataSource]
  log   [14:12:14.840] [info][plugins-service] Plugin "dataSource" is disabled.
  log   [14:12:14.840] [info][plugins-service] Plugin "visTypeXy" is disabled.
[agentkeepalive:deprecated] options.freeSocketKeepAliveTimeout is deprecated, please use options.freeSocketTimeout instead
  log   [14:12:15.053] [info][plugins-service] Plugin initialization disabled.
  log   [14:12:15.096] [warning][savedobjects-service] Skipping Saved Object migrations on startup. Note: Individual documents will still be migrated when read or written.
np bld    log   [14:12:16.489] [info][@osd/optimizer] initialized, 53 bundles cached
 watching for changes  (2502 files)
np bld    log   [14:12:17.098] [info][@osd/optimizer] starting worker [1 bundle]
server    log   [14:12:21.311] [info][plugins-service] Plugin "dataSourceManagement" has been disabled since the following direct or transitive dependencies are missing or disabled: [dataSource]
server    log   [14:12:21.318] [info][plugins-service] Plugin "dataSource" is disabled.
server    log   [14:12:21.319] [info][plugins-service] Plugin "visTypeXy" is disabled.
[agentkeepalive:deprecated] options.freeSocketKeepAliveTimeout is deprecated, please use options.freeSocketTimeout instead
server    log   [14:12:21.592] [info][plugins-system] Setting up [42] plugins: [usageCollection,opensearchDashboardsUsageCollection,opensearchDashboardsLegacy,mapsLegacy,share,opensearchUiShared,legacyExport,embeddable,expressions,data,home,apmOss,savedObjects,dashboard,visualizations,visBuilder,visTypeVega,visTypeTimeline,visTypeTable,visTypeMarkdown,visAugmenter,tileMap,regionMap,inputControlVis,visualize,management,indexPatternManagement,advancedSettings,console,dataExplorer,charts,visTypeVislib,visTypeTimeseries,visTypeTagcloud,visTypeMetric,discover,savedObjectsManagement,securityDashboards,wazuhCore,wazuhCheckUpdates,wazuh,bfetch]
[agentkeepalive:deprecated] options.freeSocketKeepAliveTimeout is deprecated, please use options.freeSocketTimeout instead
server    log   [14:12:22.006] [info][savedobjects-service] Waiting until all OpenSearch nodes are compatible with OpenSearch Dashboards before starting saved objects migrations...
server    log   [14:12:22.099] [info][savedobjects-service] Starting saved objects migrations
server    log   [14:12:22.248] [info][plugins-system] Starting [42] plugins: [usageCollection,opensearchDashboardsUsageCollection,opensearchDashboardsLegacy,mapsLegacy,share,opensearchUiShared,legacyExport,embeddable,expressions,data,home,apmOss,savedObjects,dashboard,visualizations,visBuilder,visTypeVega,visTypeTimeline,visTypeTable,visTypeMarkdown,visAugmenter,tileMap,regionMap,inputControlVis,visualize,management,indexPatternManagement,advancedSettings,console,dataExplorer,charts,visTypeVislib,visTypeTimeseries,visTypeTagcloud,visTypeMetric,discover,savedObjectsManagement,securityDashboards,wazuhCore,wazuhCheckUpdates,wazuh,bfetch]
server    log   [14:12:22.596] [info][listening] Server running at https://0.0.0.0:5601
server    log   [14:12:22.737] [info][server][OpenSearchDashboards][http] http server running at https://0.0.0.0:5601
np bld    log   [14:14:24.154] [success][@osd/optimizer] 1 bundles compiled successfully after 128.2 sec, watching for changes

image
image
image
image

@asteriscos asteriscos marked this pull request as ready for review November 24, 2023 12:56
@asteriscos asteriscos requested a review from a team as a code owner November 24, 2023 12:56
@asteriscos asteriscos self-assigned this Nov 27, 2023
@Desvelao
Copy link
Member

Desvelao commented Nov 30, 2023

A pull request check failed: https://github.com/wazuh/wazuh-dashboard-plugins/actions/runs/7019219256/job/19096188632?pr=6145

To merge the pull request, should we ignore this due to the addition of dependencies that are vulnerable?

Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

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

LGTM!

Test evidence:
image

Copy link
Contributor

Wazuh Core plugin code coverage (Jest) test % values
Statements 21.38% ( 185 / 865 )
Branches 18.07% ( 79 / 437 )
Functions 14.22% ( 36 / 253 )
Lines 21.61% ( 182 / 842 )

Copy link
Contributor

Wazuh Check Updates plugin code coverage (Jest) test % values
Statements 76.95% ( 167 / 217 )
Branches 54.63% ( 53 / 97 )
Functions 60.86% ( 28 / 46 )
Lines 76.95% ( 167 / 217 )

Copy link
Contributor

Main plugin code coverage (Jest) test % values
Statements 11.87% ( 4184 / 35245 )
Branches 8.14% ( 1927 / 23658 )
Functions 11.24% ( 948 / 8427 )
Lines 12.04% ( 4067 / 33752 )

@asteriscos asteriscos merged commit f5dbad2 into master Nov 30, 2023
3 of 4 checks passed
@asteriscos asteriscos deleted the compatibility/osd-2.11.0-add-angular-dependencies-6135 branch November 30, 2023 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compatibility with opensearch 2.11.0
3 participants