Use Connector.lookupScanCredentials to contextualize GitHubAppCredentials#398
Merged
Merged
Conversation
…lize GitHubAppCredentials
…dentials contextualization
jeromepochat
commented
Sep 16, 2024
| new PluginLogger(j.createTaskListener().getLogger(), "GitHub Checks"), | ||
| wireMockRule.baseUrl()) | ||
| .publish(details); | ||
| try (var credentialsMatchers = mockCredentialsMatchers()) { |
Contributor
Author
There was a problem hiding this comment.
Introduced try-with-resource for static mock auto-close. The body is indented without any change.
jeromepochat
commented
Sep 16, 2024
| .contains("endColumn=20") | ||
| .contains("annotationLevel=WARNING") | ||
| .contains("message='say hello to Jenkins'"); | ||
| try (var credentialsMatchers = mockCredentialsMatchers()) { |
Contributor
Author
There was a problem hiding this comment.
Introduced try-with-resource for static mock auto-close. The body is indented without any change.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #398 +/- ##
============================================
- Coverage 71.80% 71.58% -0.22%
- Complexity 162 163 +1
============================================
Files 16 16
Lines 532 535 +3
Branches 51 51
============================================
+ Hits 382 383 +1
- Misses 124 126 +2
Partials 26 26 ☔ View full report in Codecov by Sentry. |
jeromepochat
commented
Sep 16, 2024
| try (MockedStatic<Connector> connector = mockStatic(Connector.class)) { | ||
| connector.when(() -> Connector.connect(anyString(), any(GitHubAppCredentials.class))).thenReturn(gitHub); | ||
| try (var credentialsMatchers = mockCredentialsMatchers(); var connector = mockStatic(Connector.class)) { | ||
| connector.when(() -> Connector.lookupScanCredentials(any(), any(), any(), any())).thenCallRealMethod(); |
Contributor
Author
There was a problem hiding this comment.
Call real method to involve GitHubAppCredentials contextualization
jeromepochat
commented
Sep 16, 2024
|
|
||
| when(scmFacade.findGitHubSCMSource(job)).thenReturn(Optional.of(source)); | ||
| when(scmFacade.findGitHubAppCredentials(job, "1")).thenReturn(Optional.of(gitHubAppCredentials)); | ||
| when(scmFacade.findGitHubAppCredentials(job, "1")).thenCallRealMethod(); |
Contributor
Author
There was a problem hiding this comment.
Call real method to involve GitHubAppCredentials contextualization
timja
approved these changes
Sep 17, 2024
6 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
#396 fixed
GitHubAppCredentialsowner inference usingwithOwnermethod which not considered as a public API.This uses
Connector.lookupScanCredentialsfrom GitHub Branch Source plugin to contextualize the credentials automatically. It removes the direct usage ofGitHubAppCredentials.withOwnerfromgithub-checks-plugin.This includes some mocking adjustments to involve the credentials contextualization provided by
github-branch-plugin.Testing done
Submitter checklist