-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into command-palette
- Loading branch information
Showing
51 changed files
with
747 additions
and
477 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,16 @@ | ||
| package jenkins; | ||
|
|
||
| import hudson.FilePath.FileCallable; | ||
| import hudson.remoting.VirtualChannel; | ||
| import java.io.File; | ||
| import jenkins.security.Roles; | ||
| import jenkins.slaves.RemotingVersionInfo; | ||
| import org.jenkinsci.remoting.RoleChecker; | ||
| import jenkins.agents.ControllerToAgentFileCallable; | ||
|
|
||
| /** | ||
| * {@link FileCallable}s that are meant to be only used on the master. | ||
| * | ||
| * Note that the logic within {@link #invoke(File, VirtualChannel)} should use API of a minimum supported Remoting version. | ||
| * See {@link RemotingVersionInfo#getMinimumSupportedVersion()}. | ||
| * | ||
| * {@link FileCallable}s that could run on an agent. | ||
| * For new code, implement {@link ControllerToAgentFileCallable} | ||
| * which has the advantage that it can be used on {@code record}s. | ||
| * @since 1.587 / 1.580.1 | ||
| * @param <T> the return type; note that this must either be defined in your plugin or included in the stock JEP-200 whitelist | ||
| * @param <T> the return type | ||
| */ | ||
| public abstract class MasterToSlaveFileCallable<T> implements FileCallable<T> { | ||
| @Override | ||
| public void checkRoles(RoleChecker checker) throws SecurityException { | ||
| checker.check(this, Roles.SLAVE); | ||
| } | ||
| public abstract class MasterToSlaveFileCallable<T> implements ControllerToAgentFileCallable<T> { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
| } |
48 changes: 48 additions & 0 deletions
48
core/src/main/java/jenkins/agents/ControllerToAgentCallable.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2024 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.agents; | ||
|
|
||
| import hudson.remoting.Callable; | ||
| import jenkins.security.Roles; | ||
| import jenkins.slaves.RemotingVersionInfo; | ||
| import org.jenkinsci.remoting.RoleChecker; | ||
|
|
||
| /** | ||
| * {@link Callable} meant to be serialized then run on an agent. | ||
| * A typical implementation will be a {@link Record} | ||
| * since instance state merely transfers a set of parameters to an agent JVM. | ||
| * <p>Note that the logic within {@link #call} may not use Remoting APIs | ||
| * newer than {@link RemotingVersionInfo#getMinimumSupportedVersion}. | ||
| * (Core and plugin APIs will be identical to those run inside the controller.) | ||
| * @param <V> the return type; note that this must either be defined in your plugin or included in the stock JEP-200 whitelist | ||
| * @since 2.485 | ||
| */ | ||
| public interface ControllerToAgentCallable<V, T extends Throwable> extends Callable<V, T> { | ||
|
|
||
| @Override | ||
| default void checkRoles(RoleChecker checker) throws SecurityException { | ||
| checker.check(this, Roles.SLAVE); | ||
| } | ||
| } |
Oops, something went wrong.