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(collector): auth validator is nil #6442

Merged
merged 4 commits into from
Sep 23, 2024

Conversation

iutx
Copy link
Member

@iutx iutx commented Sep 23, 2024

What this PR does / why we need it:

fix auth validator is nil
image

Which issue(s) this PR fixes:

Specified Reviewers:

/assign @chengjoey @sfwn

ChangeLog

Language Changelog
🇺🇸 English fix auth validator is nil
🇨🇳 中文 修复 collector validator 空指针

Need cherry-pick to release versions?

Add comment like /cherry-pick release/1.0 when this PR is merged.

For details on the cherry pick process, see the cherry pick requests section under CONTRIBUTING.md.

Signed-off-by: Ash <root@viper.run>
@iutx
Copy link
Member Author

iutx commented Sep 23, 2024

Validator authentication.Validator `autowired:"erda.oap.collector.authentication.Validator"`
if p.Cfg.Auth.Skip {
    p.Validator = skipValidator{}
} 

Signed-off-by: Ash <root@viper.run>
@chengjoey
Copy link
Contributor

/hold
erda.oap.collector.authentication.Validator will depend on erda-server(core), but collector-agent in edge cluster without erda-server, so i make it Manually

Copy link

codecov bot commented Sep 23, 2024

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.

Project coverage is 15.61%. Comparing base (0b70683) to head (d97d9b3).
Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
.../collector/plugins/receivers/collector/provider.go 0.00% 5 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6442      +/-   ##
==========================================
- Coverage   15.62%   15.61%   -0.01%     
==========================================
  Files        3674     3674              
  Lines      311576   311582       +6     
==========================================
- Hits        48675    48668       -7     
- Misses     257450   257460      +10     
- Partials     5451     5454       +3     
Flag Coverage Δ
by-github-actions 15.61% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../collector/plugins/receivers/collector/provider.go 46.34% <0.00%> (-7.95%) ⬇️

... and 4 files with indirect coverage changes

….Validator

Signed-off-by: Ash <root@viper.run>
Signed-off-by: Ash <root@viper.run>
@iutx
Copy link
Member Author

iutx commented Sep 23, 2024

related pr: 6420

@sfwn
Copy link
Member

sfwn commented Sep 23, 2024

/approve

@sfwn sfwn merged commit cb68cd8 into erda-project:master Sep 23, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants