Make the path that jenkins is accessible on configureable #539
Conversation
via --httpPath Defaults to /
...p/src/main/java/io/jenkins/jenkinsfile/runner/bootstrap/commands/JenkinsLauncherOptions.java
Outdated
Show resolved
Hide resolved
| @@ -77,7 +77,8 @@ protected ServletContext createWebServer() throws Exception { | |||
| ? new Server(launcherOptions.httpPort) | |||
| : new Server(queuedThreadPool); | |||
|
|
|||
| WebAppContext context = new WebAppContext(launcherOptions.warDir.getPath(), null); | |||
| contextPath = launcherOptions.httpPath; | |||
There was a problem hiding this comment.
You may need to handle mistakes here:
- trailing
/ - empty string
- just
/, whichWebAppContextwill like butgetURLwill not
There was a problem hiding this comment.
what do you want me to do with all of those. Just throw an Illegal Argument Exception? I agree that probably YAGNI so I don't want to waste too much time with error cases for something that'll probably not get used
There was a problem hiding this comment.
Just throw an Illegal Argument Exception?
Sure, just to make things more transparent.
I don't want to waste too much time with error cases for something that'll probably not get used
Agreed.
There was a problem hiding this comment.
done. Case 1 and 3 are covered by the same "ends with /" statement
…p/commands/JenkinsLauncherOptions.java Co-authored-by: Jesse Glick <jglick@cloudbees.com>
...p/src/main/java/io/jenkins/jenkinsfile/runner/bootstrap/commands/JenkinsLauncherOptions.java
Show resolved
Hide resolved
oleg-nenashev
changed the title
...p/src/main/java/io/jenkins/jenkinsfile/runner/bootstrap/commands/JenkinsLauncherOptions.java
Show resolved
Hide resolved
| private String validateHttpPath(String httpPath) throws IllegalArgumentException { | ||
| if (StringUtils.endsWith(httpPath, "/")) { | ||
| throw new IllegalArgumentException("httpPath must not end with a trailing /"); | ||
| } else if ("".equals(httpPath)) { |
There was a problem hiding this comment.
| } else if ("".equals(httpPath)) { | |
| } else if (StringUtils.isBlank(httpPath)) { |
There was a problem hiding this comment.
Not in this case. null is a valid input (what you get when the user does not set --httpPath) (and StringUtils.isBlank(null) returns true)
|
@oleg-nenashev - documentation present now. The build failure seems to be infra-related so can you retrigger a build (or just merge if you are happy as the last commit was only to the readme) |
|
@oleg-nenashev reminder 1.0-beta-29...master |
via
--httpPathDefaults to
/Follow on from #537 allowing for configuration