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 missing license header #3467

Merged

Conversation

willyborankin
Copy link
Collaborator

Description

Added missing license header for some files.

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.

@willyborankin
Copy link
Collaborator Author

willyborankin commented Oct 5, 2023

PR depends on #3463 will re-base it asap after it has been merged
rebased

@willyborankin willyborankin force-pushed the missing-license-headers branch from 9f33f37 to 83fdca2 Compare October 5, 2023 13:32
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

Merging #3467 (3d30564) into main (f435c05) will increase coverage by 0.03%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #3467      +/-   ##
============================================
+ Coverage     64.58%   64.62%   +0.03%     
- Complexity     3575     3576       +1     
============================================
  Files           275      275              
  Lines         20451    20451              
  Branches       3382     3382              
============================================
+ Hits          13208    13216       +8     
+ Misses         5546     5538       -8     
  Partials       1697     1697              
Files Coverage Δ
...curity/dlic/rest/validation/EndpointValidator.java 94.20% <ø> (ø)

... and 6 files with indirect coverage changes

@reta
Copy link
Collaborator

reta commented Oct 5, 2023

@willyborankin needs rebase?

Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

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

@willyborankin Can you file an issue to run a license checker as part of the CI?

If I remember correctly, core does this in the precommit.

@willyborankin
Copy link
Collaborator Author

willyborankin commented Oct 5, 2023

@willyborankin Can you file an issue to run a license checker as part of the CI?

If I remember correctly, core does this in the precommit.

Yes that's why I found the problem precommit verifies license.

@willyborankin
Copy link
Collaborator Author

Created an issue #3471

@willyborankin
Copy link
Collaborator Author

@reta Hmmm I rebased it still fails.

@reta
Copy link
Collaborator

reta commented Oct 5, 2023

@reta Hmmm I rebased it still fails.

Ah ... it is for 2.x

> Task :compileJava
/home/runner/work/security/security/2.x/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java:311: error: method does not override or implement a method from a supertype
    @Override
    ^
/home/runner/work/security/security/2.x/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java:87: error: constructor Netty4Transport in class Netty4Transport cannot be applied to given types;
        super(
        ^
  required: Settings,Version,ThreadPool,NetworkService,PageCacheRecycler,NamedWriteableRegistry,CircuitBreakerService,SharedGroupFactory,Tracer
  found: Settings,Version,ThreadPool,NetworkService,PageCacheRecycler,NamedWriteableRegistry,CircuitBreakerService,SharedGroupFactory
  reason: actual and formal argument lists differ in length
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors

#3468
#3469

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label Oct 5, 2023
Signed-off-by: Andrey Pleskach <[email protected]>
@willyborankin willyborankin force-pushed the missing-license-headers branch from 83fdca2 to 3d30564 Compare October 6, 2023 07:14
@willyborankin
Copy link
Collaborator Author

Finally the pipeline works just fine.

@reta reta merged commit fb82bbb into opensearch-project:main Oct 6, 2023
57 of 58 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3467-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fb82bbbfcc133fa4ae0bba227c881f7a6ebbe7bd
# Push it to GitHub
git push --set-upstream origin backport/backport-3467-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

willyborankin added a commit to willyborankin/security that referenced this pull request Oct 6, 2023
Added missing license header for some files.

- [ ] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit fb82bbb)
DarshitChanpura pushed a commit that referenced this pull request Oct 6, 2023
@DarshitChanpura DarshitChanpura added the backport 2.11 Backport to 2.11 branch label Oct 6, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.11
# Create a new branch
git switch --create backport/backport-3467-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fb82bbbfcc133fa4ae0bba227c881f7a6ebbe7bd
# Push it to GitHub
git push --set-upstream origin backport/backport-3467-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-3467-to-2.11.

DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Oct 6, 2023
Added missing license header for some files.

- [ ] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit fb82bbb)
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Oct 6, 2023
Added missing license header for some files.

- [ ] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit fb82bbb)
DarshitChanpura added a commit that referenced this pull request Oct 13, 2023
Backports #3467 via
fb82bbb

Manual backport is required to address white space conflicts in relevant
files

Co-authored-by: Andrey Pleskach <[email protected]>
cwperks added a commit to cwperks/security that referenced this pull request Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch backport 2.11 Backport to 2.11 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants