[FIXED JENKINS-36315] Make it easier to infer the context in form binding #62
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package com.cloudbees.plugins.credentials; | ||
|
|
||
| import hudson.model.ModelObject; | ||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.Target; | ||
| import javax.servlet.ServletException; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.kohsuke.stapler.AnnotationHandler; | ||
| import org.kohsuke.stapler.InjectedParameter; | ||
| import org.kohsuke.stapler.StaplerRequest; | ||
|
|
||
| import static java.lang.annotation.ElementType.PARAMETER; | ||
| import static java.lang.annotation.RetentionPolicy.RUNTIME; | ||
|
|
||
| /** | ||
| * Indicates that this parameter is injected by evaluating | ||
| * {@link StaplerRequest#getAncestors()} and searching for a credentials context with the parameter type. | ||
| * You can enhance the lookup by ensuring that there are query parameters of {@code $provider} and {@code $token} | ||
| * that correspond to the context's {@link CredentialsSelectHelper.ContextResolver} FQCN and | ||
| * {@link CredentialsSelectHelper.ContextResolver#getToken(ModelObject)} respectively. | ||
| * | ||
| * @see CredentialsDescriptor#getCheckMethod(String) | ||
| * @since 2.1.5 | ||
| */ | ||
| @Retention(RUNTIME) | ||
| @Target(PARAMETER) | ||
| @Documented | ||
| @InjectedParameter(ContextInPath.HandlerImpl.class) | ||
| public @interface ContextInPath { | ||
| class HandlerImpl extends AnnotationHandler<ContextInPath> { | ||
| public Object parse(StaplerRequest request, ContextInPath contextInPath, Class type, String parameterName) | ||
| throws | ||
| ServletException { | ||
| String $provider = request.getParameter("$provider"); | ||
| String $token = request.getParameter("$token"); | ||
| if (StringUtils.isNotBlank($provider) && StringUtils.isNotBlank($token)) { | ||
| ModelObject context = CredentialsDescriptor.lookupContext($provider, $token); | ||
| if (type.isInstance(context)) { | ||
| return type.cast(context); | ||
| } | ||
| } | ||
| return CredentialsDescriptor.findContextInPath(request, type); | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,21 +24,24 @@ | |
| --> | ||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:l="/lib/layout"> | ||
| <j:local> | ||
| <j:set var="it" value="${it.store}"/> | ||
|
Member
There was a problem hiding this comment. Do you really need
Contributor
There was a problem hiding this comment. I'm curious about this
Member
Author
There was a problem hiding this comment. It shouldn’t, assuming the xml namespace is correctly defined
Member
There was a problem hiding this comment. I don't see a <local> tag in the Jelly documentation
Member
Author
There was a problem hiding this comment. Ahh should be |
||
| <!-- TODO revert to dropdownDescriptorSelector when baseline is 1.645+ which supports `capture` attribute --> | ||
| <j:set var="descriptor" value="${it.credentialDescriptor}"/> | ||
| <j:set var="instance" value="${null}"/> | ||
| <f:dropdownList name="credentials" title="${%Kind}" help="${descriptor.getHelpFile('credentials')}"> | ||
| <j:set var="current" value="${instance[credentials]}"/> | ||
| <j:set var="current" value="${current!=null ? current : null}"/> | ||
| <j:forEach var="descriptor" items="${descriptors}" varStatus="loop"> | ||
| <f:dropdownListBlock value="${loop.index}" title="${descriptor.displayName}" | ||
| selected="${current.descriptor==descriptor || (current==null and descriptor==attrs.default)}" staplerClass="${descriptor.clazz.name}" | ||
| lazy="descriptor,it"> | ||
| <l:ajax> | ||
| <j:set var="instance" value="${current.descriptor==descriptor ? current : null}" /> | ||
| <st:include from="${descriptor}" page="${descriptor.configPage}" /> | ||
| </l:ajax> | ||
| </f:dropdownListBlock> | ||
| </j:forEach> | ||
| </f:dropdownList> | ||
| </j:local> | ||
| </j:jelly> | ||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jglick you may be interested in this as a less hacky approach to https://github.com/jenkinsci/workflow-step-api-plugin/blob/aabbdca1c3c1f1aacf346b01d95d3be467547195/src/main/java/org/jenkinsci/plugins/workflow/util/StaplerReferer.java#L43
I wonder could we introduce some extension points and make a more generic solution in core?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Linked from JENKINS-19413.