[JENKINS-35227] added support for AdditionalCredentials to SubversionSCMSource #189
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
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 |
|---|---|---|
|
|
@@ -45,6 +45,7 @@ | |
| import hudson.scm.FilterSVNAuthenticationManager; | ||
| import hudson.scm.SubversionRepositoryStatus; | ||
| import hudson.scm.SubversionSCM; | ||
| import hudson.scm.SubversionSCM.AdditionalCredentials; | ||
| import hudson.scm.subversion.SvnHelper; | ||
| import hudson.security.ACL; | ||
| import hudson.util.EditDistance; | ||
|
|
@@ -121,6 +122,8 @@ public class SubversionSCMSource extends SCMSource { | |
| private final String remoteBase; | ||
|
|
||
| private String credentialsId = ""; // TODO null would be a better default, but need to check null safety on usages | ||
|
|
||
| private List<AdditionalCredentials> additionalCredentials; | ||
|
Member
There was a problem hiding this comment. from what I see it still may be null when you read data from the disk |
||
|
|
||
| private String includes = DescriptorImpl.DEFAULT_INCLUDES; | ||
|
|
||
|
|
@@ -136,15 +139,18 @@ public SubversionSCMSource(String id, String remoteBase, String credentialsId, S | |
| setCredentialsId(credentialsId); | ||
| setIncludes(StringUtils.defaultIfEmpty(includes, DescriptorImpl.DEFAULT_INCLUDES)); | ||
| setExcludes(StringUtils.defaultIfEmpty(excludes, DescriptorImpl.DEFAULT_EXCLUDES)); | ||
| this.additionalCredentials = new ArrayList<AdditionalCredentials>(); | ||
|
Member
There was a problem hiding this comment. Usage of this collection is ineffective if you do not plan to modify it on the flight. Use |
||
| } | ||
| @DataBoundConstructor | ||
| @SuppressWarnings("unused") // by stapler | ||
| public SubversionSCMSource(String id, String remoteBase) { | ||
| super(id); | ||
| this.remoteBase = StringUtils.removeEnd(remoteBase, "/") + "/"; | ||
| this.additionalCredentials = new ArrayList<AdditionalCredentials>(); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Gets the credentials id. | ||
| * | ||
|
|
@@ -159,6 +165,14 @@ public String getCredentialsId() { | |
| public void setCredentialsId(String credentialsId) { | ||
| this.credentialsId = credentialsId; | ||
| } | ||
| @DataBoundSetter | ||
| public void setAdditionalCredentials(List<AdditionalCredentials> additionalCredentials) { | ||
| this.additionalCredentials = additionalCredentials; | ||
| } | ||
| //without getter jelly will crash | ||
| public List<AdditionalCredentials> getAdditionalCredentials() { | ||
| return(additionalCredentials); | ||
|
Member
There was a problem hiding this comment. FindBugs will grumble about exposing external implementation. Either make it
Author
There was a problem hiding this comment. Thank you for your comments. How do I make it restricted? Does adding "@restricted(NoExternalUse.class)" work?
Member
There was a problem hiding this comment. would be better to just |
||
| } | ||
|
|
||
| /** | ||
| * Gets the comma separated list of exclusions. | ||
|
|
@@ -273,7 +287,7 @@ protected SCMRevision retrieve(@NonNull SCMHead head, @NonNull TaskListener list | |
| String repoPath = SubversionSCM.DescriptorImpl.getRelativePath(repoURL, repository.getRepository()); | ||
| String path = SVNPathUtil.append(repoPath, head.getName()); | ||
| SVNRepositoryView.NodeEntry svnEntry = repository.getNode(path, -1); | ||
| return new SCMRevisionImpl(head, svnEntry.getRevision(), (additionalCredentials.size()>0)); | ||
|
Member
There was a problem hiding this comment. This is not precise. Additional credentials might have been specified but not actually used. More plausibly, the server may use externals which simply do not need any distinct credentials. |
||
| } catch (SVNException e) { | ||
| throw new IOException(e); | ||
| } finally { | ||
|
|
@@ -308,7 +322,7 @@ protected SCMRevision retrieve(String unparsedRevision, TaskListener listener) t | |
| listener.getLogger().println("Could not find " + path); | ||
| return null; | ||
| } | ||
| return new SCMRevisionImpl(new SCMHead(base), revision == -1 ? resolvedRevision : revision, (additionalCredentials.size()>0)); | ||
| } catch (SVNException e) { | ||
| throw new IOException(e); | ||
| } finally { | ||
|
|
@@ -409,7 +423,7 @@ public boolean exists(@NonNull String path) throws IOException { | |
| }, listener)) { | ||
| listener.getLogger().println("Met criteria"); | ||
| SCMHead head = new SCMHead(childPath); | ||
| observer.observe(head, new SCMRevisionImpl(head, svnEntry.getRevision(), (additionalCredentials.size()>0))); | ||
| if (!observer.isObserving()) { | ||
| return; | ||
| } | ||
|
|
@@ -689,9 +703,10 @@ public SubversionSCM build(@NonNull SCMHead head, | |
| // name contains an @ so need to ensure there is an @ at the end of the name | ||
| remote.append('@'); | ||
| } | ||
| return new SubversionSCM(remote.toString(), credentialsId, ".", additionalCredentials); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Our implementation. | ||
| */ | ||
|
|
@@ -701,16 +716,29 @@ public static class SCMRevisionImpl extends SCMRevision { | |
| * The subversion revision. | ||
| */ | ||
| private long revision; | ||
| /** | ||
| * Indicates whether externals are used. If so, revision is considered non-deterministic. | ||
| */ | ||
| private boolean usesExternals; | ||
|
|
||
| public SCMRevisionImpl(SCMHead head, long revision, boolean usesExternals) { | ||
|
Member
There was a problem hiding this comment. Breaking change, the class was public |
||
| super(head); | ||
| this.revision = revision; | ||
| this.usesExternals = usesExternals; | ||
| } | ||
|
|
||
| public long getRevision() { | ||
| return revision; | ||
| } | ||
|
|
||
| public boolean isDeterministic() { | ||
| //non-deterministic when using externals, to force Jenkins to recurse into subdirectories | ||
| if(usesExternals) { | ||
| return false; | ||
|
Member
There was a problem hiding this comment. Nondeterministic revisions are acceptable only for SCMs which inherently cannot support determinism, like CVS I suppose (though even there |
||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
|
|
||
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
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.
May cause merge conflicts without a reason