Disable injection when custom extensions are detected #398
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
alextu
changed the title
welandaz
approved these changes
Feb 26, 2024
| public FormValidation doCheckCcudExtensionCustomCoordinates(@QueryParameter String value) { | ||
| String coord = Util.fixEmptyAndTrim(value); | ||
| return coord == null || MavenCoordinates.isValid(coord) ? FormValidation.ok() : FormValidation.error(Messages.InjectionConfig_InvalidMavenExtensionCustomCoordinates()); | ||
| } |
There was a problem hiding this comment.
I believe we can extract the logic of both of these methods into a private method and reuse it
|
|
||
| static boolean isUnix(Computer computer) { | ||
| return computer == null || Boolean.TRUE.equals(computer.isUnix()); | ||
| } |
There was a problem hiding this comment.
I'd also make this class final and add private constructor
| public final class SystemProperty { | ||
|
|
||
| private final Key key; | ||
| private final String value; | ||
| private static final Pattern SysPropPattern = Pattern.compile("-D(.*)=(.*)"); |
There was a problem hiding this comment.
I'd pull it to the top of the class and adjsut the name to SYS_PROP_PATTERN to stick to the convention
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.
Follow up of #393
This PR adds 2 new fields to the Develocity Maven injection:
Those are used in case built projects have defined custom Develocity derived extensions:
.mvn/extensionsof the currently built project..mvn/extensionsof the currently built project.It's a bit complex in terms of implementation since we need to parse the existing
MAVEN_OPTSlooking for the maven ext classpath system property, and filter it accordingly.We might want to revisit this since it looks like the
ScmListenerwe use is called in many cases, even when no Scm is configured...Testing done
Unit tests and a few integration tests. Some cases cannot easily be setup as integration tests since they would require "real" custom Develocity extensions.
I also tested manually the 2 cases:
Submitter checklist