updated buildkite detectors #3611
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rgmz
reviewed
Nov 15, 2024
| } | ||
| isVerified, verificationErr := VerifyBuildKite(ctx, client, resMatch) | ||
| s1.Verified = isVerified | ||
| if verificationErr != nil { |
There was a problem hiding this comment.
This check already happens in SetVerificationError.
Comment on lines
86
to
96
| res, err := client.Do(req) | ||
| if err == nil { | ||
| defer res.Body.Close() | ||
| if res.StatusCode >= 200 && res.StatusCode < 300 { | ||
| return true, nil | ||
| } | ||
| } |
There was a problem hiding this comment.
This old pattern is pretty lax. A better implementation is to (i) check the error, (ii) defer the drain + close of the body, (iii) check for a specific status code.
trufflehog/pkg/detectors/alchemy/alchemy.go
Lines 78 to 81 in a6e2b99
kashifkhan0771
force-pushed
the
update/buildkite-detectors
branch
from
6a9bd56 to
3f3113b
Compare
rgmz
reviewed
Nov 18, 2024
| }() | ||
|
|
||
| if res.StatusCode == http.StatusOK { | ||
| return true, nil |
There was a problem hiding this comment.
I think it's worth including the scopes in extraData. https://buildkite.com/docs/apis/rest-api/access-token#get-the-current-token
Also, I would explicitly highlight which status code means "bad" and return an error if an unusual one is encountered.
kashifkhan0771
requested review from
abmussani,
zricethezav,
nabeelalam and
rgmz
and removed request for
rgmz
zricethezav
approved these changes
Nov 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Merged BuiltKite detector in one package with
v1andv2versionCreated one verification func to be used in both as both are calling same API
Tested locally with secrets and both are working fine.
JIRA Ticket:
OSS-55
Checklist:
make test-community)?make lintthis requires golangci-lint)?