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

Fix a bad import path #1498

Merged
merged 3 commits into from
Jun 30, 2023

Conversation

peternied
Copy link
Member

Description

Found a case where the import was done using a relative reference, instead of using a package reference causing a build break in some circumstances.

Issues Resolved

Testing

Using relative path import is fundamentally wrong, as long as CI works this fix works. Verified that there are no other references to ../packages/ in the codebase as well.

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

- Resolves opensearch-project#1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
@cwperks
Copy link
Member

cwperks commented Jun 30, 2023

@peternied Please fix the eslint issue. I'm looking into how this got past CI on the offending PR.

Signed-off-by: Peter Nied <[email protected]>
@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Merging #1498 (a7e609d) into main (41a253f) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1498   +/-   ##
=======================================
  Coverage   65.61%   65.61%           
=======================================
  Files          93       93           
  Lines        2309     2309           
  Branches      315      315           
=======================================
  Hits         1515     1515           
  Misses        726      726           
  Partials       68       68           

@cwperks cwperks added the backport 2.x backport to 2.x branch label Jun 30, 2023
@RyanL1997
Copy link
Collaborator

Approved. Updating the branch.

@peternied peternied merged commit 32c02c8 into opensearch-project:main Jun 30, 2023
@peternied peternied deleted the fix-bad-osd-import-1 branch June 30, 2023 17:52
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 30, 2023
* Fix a bad import path

- Resolves #1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
(cherry picked from commit 32c02c8)
peternied added a commit that referenced this pull request Jun 30, 2023
* Fix a bad import path

- Resolves #1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
(cherry picked from commit 32c02c8)

Co-authored-by: Peter Nied <[email protected]>
@RyanL1997 RyanL1997 added backport 1.3 backport 1.x backport to 1.x branch labels Aug 7, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1498-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32c02c8c18a509884613517fac38b684338d5273
# Push it to GitHub
git push --set-upstream origin backport/backport-1498-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-1498-to-1.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 7, 2023
* Fix a bad import path

- Resolves #1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
(cherry picked from commit 32c02c8)
peternied added a commit that referenced this pull request Aug 7, 2023
* Fix a bad import path

- Resolves #1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
(cherry picked from commit 32c02c8)

Co-authored-by: Peter Nied <[email protected]>
samuelcostae pushed a commit to samuelcostae/security-dashboards-plugin that referenced this pull request Aug 10, 2023
* Fix a bad import path

- Resolves opensearch-project#1487

Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
Signed-off-by: Sam <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport to 1.x branch backport 1.3 backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] FATAL Error: Cannot find module '../../../../packages/osd-std'
3 participants