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

[LIC] Allows the simplified header for new files #936

Merged
merged 2 commits into from
Nov 17, 2021

Conversation

ashwin-pc
Copy link
Member

Signed-off-by: Ashwin Pc ashwinpc@amazon.com

Description

Allows for the simplified license header to exist alongside the modified license header. (Issue: opensearch-project/.github#21). If neither license header is present, the simplified license is used.

Issues Resolved

opensearch-project/.github#21

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>
@ashwin-pc ashwin-pc requested a review from mihirsoni November 13, 2021 00:30
.eslintrc.js Outdated
@@ -30,6 +30,13 @@
* GitHub history for details.
*/

const SIMPLIFIED_OOS_HEADER = `
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to call it SIMPLIFIED, how about if we just say OSS_HEADER, OSD_HEADER and remove SIMPLIFIED

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed, we should make sure it's clear what the headers are for new files that OpenSearch Contributors have created versus the files that were brought over in the fork.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fair point. Ive updated the names to OSD_HEADER for this license string and changed the one below to be just OSS_HEADER, since thats used for files with an existing OSS header. Ive also added comments to make it easer to distinguish between the two in future.

Copy link
Contributor

@mihirsoni mihirsoni left a comment

Choose a reason for hiding this comment

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

One small comment rest looks good.

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>
@ashwin-pc ashwin-pc requested a review from a team as a code owner November 16, 2021 20:03
Copy link
Contributor

@mihirsoni mihirsoni left a comment

Choose a reason for hiding this comment

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

LGTM !!! Thanks for the changes.

@ashwin-pc ashwin-pc merged commit 8740e2a into opensearch-project:main Nov 17, 2021
@tmarkley
Copy link
Contributor

I believe we'll want to backport this to 1.x as well, right?

@ashwin-pc ashwin-pc deleted the fix/update-header-lint branch November 17, 2021 00:27
@tmarkley tmarkley mentioned this pull request Dec 13, 2021
7 tasks
boktorbb pushed a commit to boktorbb/OpenSearch-Dashboards that referenced this pull request Dec 17, 2021
)

* [LIC] Allows the simplified header for new files

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

* Updates licence variable names

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

Co-authored-by: Ashwin Pc <ashwinpc@amazon.com>
boktorbb added a commit that referenced this pull request Dec 17, 2021
* Fix Node selection when using built in node (#912)

Fixed node selection to use the node executable instead of the user local node.  

Issue resolved:
#908

Signed-off-by: Sven R <admin@hackacad.net>

* [Release] add axios dependency to UI package

This package was missing from release build so have to add it to this
package.

Brought in by custom branding.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Add support for codeowners to repo (#935)

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* [LIC] Allows the simplified header for new files (#936)

* [LIC] Allows the simplified header for new files

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

* Updates licence variable names

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

Co-authored-by: Ashwin Pc <ashwinpc@amazon.com>

* [Git] update PR template (#937)

Update template to remove javadoc check box since we do not have any
javadocs and include how to run the tests we use to verify the build.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Add release notes for Dashboards 1.2.0 (#944)

This is the backport PR for #944

Signed-off-by: Neumann <neumanns@amazon.com>

* Add versioned document support in OSD

This is PR is to add versioned document support in OSD.
1. Add logic to pick up doc version from package.json and convert it to `latest` if we are on default `main` branch.
2. Refactor doc_link_service to have 3 urls groups: opensearch, opensearchDashboards, and noDocumentation.
3. Update dynamic versioned doc links and clean up unused urls
4. Fix known url bug  #769
5. Add unit tests for doclinks branch name conversion

Signed-off-by: Zuocheng Ding <zding817@gmail.com>

* [Branding] prevent logging when config not set (#941)

Out of the box, the rendering service will check the config
and see the default value and log an info message saying that
the branding config is invalid or not set. Everytime
you refresh the browser you will get those log messages.

This sets it to only log error messages if the user sets
the branding config and it is invalid.

Include using default messages.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* [Version] Increment to 2.0 (#973)

Version bump from 1.2 to 2.0

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Add Lychee Link Checker into OSD (#938)

1. Fix broken links in OSD
2. Generate lycheeexcude list to filter out false negative warnings from test files or external links
3. Add TODO items for internal unavaiable links
4. Integrate with doc link service change.
5. Standardize all opensearch url with `https://opensearch.org/` and add unavilable urls into noDocument list

Signed-off-by: Zuocheng Ding <zding817@gmail.com>

* Fix Lychee Link Checker Error (#1011)

Signed-off-by: Zuocheng Ding <zding817@gmail.com>

* [CI] Add tests to github workflow

Add unit tests to github workflow and also creating a "bad apples"
environment variable. Some unit tests just fail on the CI for
hardware issues. They should be improved but step one will be
calling out the bad apples.

Also due to the flakiness we can cache the previous run results
and only run the tests that failed. It's too random to catch
with the bad apples mechanism. But still added the continue on
error for unit tests because it takes so long to re-run on the
CI. So instead if it does fail we automatically echo there
was a failure and ask them to re-run. However, if we can get
permission for a github action that can add a comment to the PR
then we could automatically add to PR.

Next step will be improving.

Also needed to limit the amount of workers because otherwise the
hardware can't handle well so then it will accidentally create conflicts.
This means we get an accurate test run but it is slower on the CI.

Included integration tests which worked out of the box.

Included e2e tests as well but it the chrome driver for the application
was different from github's chrome so to run it I just upgraded it for
the test run. Not ideal, ideally we should probably set up a
docker env and install the specific versions since we are now
depending on github's virtual env and the dependencies they installed
there. But at least this is a first pace.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Add bwc tests for osd with bundle (#871)

tests include the following cases:
verify default page work
verify advanced savings work
verify filter and query work

Disable eslint check
Add eslint-disable comment
Revise license content in plugins and support
Simplify filter and query test
modify test name and fix PR comment
update license header and remove env files
fix timestamp issue
update eslint and license

Particailly Resolved:
opensearch-project/opensearch-build#705

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

* Add more bwc tests for osd without bundles (#900)

This PR adds the following bwc tests:
1) verify sample data work properly for bwc
2) verify timeline visualization work properly for bwc
This PR also simplifies check_filter_and_query bwc test.
It first removes Unique Visitors check because even fix
the time interval, the number of unique visitors number
is random. Then it simplifies this bwc test.

add more tests in check_timeline and modify test names
change one query content to make bwc tests more robust
update license header
add missing test and solve timestamp issue
fix eslint and comments

Partially Resolved:
opensearch-project/opensearch-build#705

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

* Add bwc test data for osd without bundle (#927)

This PR contains 13 zipped bwc test data for osd without bundle.
The data has been tested by osd-1.1 and osd-1.2. To use, here are
the steps:
1)unzip the data to opensearch, for example:
tar -xvf odfe-1.13.2.tar.gz
You need to remove data folder first if there is one in opensearch
2)run opensearch: ./bin/opensearch
3)run dashboards: ./bin/opensearch-dashboards
4)run any cypress test

Partically Resolved:
opensearch-project/opensearch-build#705

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

* Add bwc test data for osd with bundle (#940)

This PR contains 13 zipped bwc test data for osd with bundle.
The data has been tested by osd-1.1 and osd-1.2. To use, here are
the steps:
1)unzip the data to opensearch, for example:
tar -xvf odfe-1.13.2.tar.gz
You need to remove data folder first if there is one in opensearch
2)run opensearch: ./bin/opensearch
3)run dashboards: ./bin/opensearch-dashboards
4)run any cypress test

Besides the above manual process, we now offer a script in this PR:
#931

To run bwc test using osd bundle data, use this command:
./cypress/bwctest-osd.sh
-o /path/to/opensearch.tar.gz
-d /path/to/opensearch-dashboards.tar.gz
-b true

Pls see more details in the above PR.

fix data issue for eCommerse data
resubmit data to fix timestamp issue

Partically Resolved:
opensearch-project/opensearch-build#705

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

* Add more bwc tests for osd with bundles (#901)

This PR adds the following bwc tests:
1)verify sample data work properly for bwc
2)verify timeline visualization work properly for bwc

add more commands check in check_timeline and rename sample data check
minimize the login time and make the tests more robust
change query content to make bwc test more robust
update license header
solve timestamp issue
fix comments and eslint

Partically Resolved:

opensearch-project/opensearch-build#705

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

* [Backwards Compatibility] restore URL forwarding from legacy app

Forwarding legacy app to the current format of the application.
This enables the usage of stored URLs and other links that referenced
the format of the application URL that mentioned the application name.

Since we changed the URL forwarding we changed this value and released.
So incase forks were made and depended on this legacy formatted reference
of the application. It will still work. There are also references of the
application.

Issue resolved:
#1013

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* [draft] Node.js upgrade from 10 to 14
* precommit checks are failing with an error related to an lmdb-store dependency
* unit tests are failing with an error related to lmdb-store
* bumped react from 16.12 to 16.14 to resolve unmet peer dependencies, but we still need a resolution to remove the old version
* need a replacement for @elastic/good

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* Adds transformIgnorePattern for lmdb-store and dependencies

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* Removes lmdb-store from transformIgnorePatterns and fixes unit test jest issues (#1012)

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* [CI] Add tests to github workflow

Add unit tests to github workflow and also creating a "bad apples"
environment variable. Some unit tests just fail on the CI for
hardware issues. They should be improved but step one will be
calling out the bad apples.

Also due to the flakiness we can cache the previous run results
and only run the tests that failed. It's too random to catch
with the bad apples mechanism. But still added the continue on
error for unit tests because it takes so long to re-run on the
CI. So instead if it does fail we automatically echo there
was a failure and ask them to re-run. However, if we can get
permission for a github action that can add a comment to the PR
then we could automatically add to PR.

Next step will be improving.

Also needed to limit the amount of workers because otherwise the
hardware can't handle well so then it will accidentally create conflicts.
This means we get an accurate test run but it is slower on the CI.

Included integration tests which worked out of the box.

Included e2e tests as well but it the chrome driver for the application
was different from github's chrome so to run it I just upgraded it for
the test run. Not ideal, ideally we should probably set up a
docker env and install the specific versions since we are now
depending on github's virtual env and the dependencies they installed
there. But at least this is a first pace.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Skips flaky server metrics collector tests

* Adds `--no-deprecation` flag for integration tests caused by `shot`
which is a downstream dependency of `hapi`.
* The ServerMetricsCollector tests are flaky and rely on the existing
v17 hapi library that Dashboards depends on. This will be upgraded
for the 2.0 release along with the Node.js upgrade.

Signed-off-by: Tommy Markley <markleyt@amazon.com>

* Update node version in github workflow to 14

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* Bumps node to 14.18.2 and uses caret range for @types/node

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* Fix local merge issues

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

Co-authored-by: Sven R <admin@hackacad.net>
Co-authored-by: Kawika Avilla <kavilla414@gmail.com>
Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com>
Co-authored-by: Ashwin P Chandran <ashwinpc1993@gmail.com>
Co-authored-by: Ashwin Pc <ashwinpc@amazon.com>
Co-authored-by: Sean Neumann <1413295+seanneumann@users.noreply.github.com>
Co-authored-by: Zuocheng Ding <zding817@gmail.com>
Co-authored-by: Anan <79961084+ananzh@users.noreply.github.com>
Co-authored-by: Tommy Markley <markleyt@amazon.com>
tmarkley pushed a commit to tmarkley/OpenSearch-Dashboards that referenced this pull request Feb 4, 2022
)

* [LIC] Allows the simplified header for new files

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

* Updates licence variable names

Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>

Co-authored-by: Ashwin Pc <ashwinpc@amazon.com>
tmarkley pushed a commit to tmarkley/OpenSearch-Dashboards that referenced this pull request Feb 4, 2022
)

Signed-off-by: Ashwin P Chandran <ashwinpc1993@gmail.com>
tmarkley pushed a commit that referenced this pull request Feb 7, 2022
Signed-off-by: Ashwin P Chandran <ashwinpc1993@gmail.com>
AMoo-Miki pushed a commit to AMoo-Miki/OpenSearch-Dashboards that referenced this pull request Feb 10, 2022
AMoo-Miki pushed a commit to AMoo-Miki/OpenSearch-Dashboards that referenced this pull request Feb 10, 2022
# [24.3.0](elastic/elastic-charts@v24.2.0...v24.3.0) (2020-12-04)

### Bug Fixes

* **highlighter:** show default highlighted radius with hidden dots ([opensearch-project#926](elastic/elastic-charts#926)) ([351c20c](elastic/elastic-charts@351c20c)), closes [opensearch-project#679](elastic/elastic-charts#679)
* **xy_chart:** improve line joins rendering ([opensearch-project#920](elastic/elastic-charts#920)) ([9a6771c](elastic/elastic-charts@9a6771c))
* point highlight based on geom position and transform ([opensearch-project#934](elastic/elastic-charts#934)) ([196ee8d](elastic/elastic-charts@196ee8d))

### Features

* allow no results component, don't require series ([opensearch-project#936](elastic/elastic-charts#936)) ([6be5c8b](elastic/elastic-charts@6be5c8b))
* improved domain error handling ([opensearch-project#933](elastic/elastic-charts#933)) ([f480054](elastic/elastic-charts@f480054))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants