Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-49101] Whitelist Gherkin model classes used during Remoting #12

Merged
merged 1 commit into from
Jan 23, 2018

Conversation

jglick
Copy link
Member

@jglick jglick commented Jan 23, 2018

JENKINS-49101

@reviewbybees

@@ -0,0 +1 @@
buildPlugin(jenkinsVersions: [null, '2.103'])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CucumberJSONSupportPluginIT.testSerializationOnSlave did its job; keep on running it!

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>1.2</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requireUpperBoundsDep

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1.18</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar, though from InjectedTestoptional deps do not currently get processed. (Cf. jenkinsci/maven-plugin#105 (comment).)

@@ -135,7 +134,7 @@ public void perform(Run<?, ?> run, FilePath filePath, Launcher launcher, TaskLis
CucumberTestResult result = parser.parseResult(_testResults, build, workspace, launcher, listener);

// TODO - look at all of the Scenarios and see if there are any embedded items contained with in them
String remoteTempDir = launcher.getChannel().call(new TmpDirCallable());
String remoteTempDir = workspace.act(new TmpDirCallable());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FindBugs: getChannel could be null. Anyway FilePath.act is simpler.

@@ -144,7 +143,7 @@ public void perform(Run<?, ?> run, FilePath filePath, Launcher launcher, TaskLis
// this is the wrong place to do the copying...
// XXX Need to do something with MasterToSlaveCallable to makesure we are safe from evil
// injection
FilePath srcFilePath = new FilePath(launcher.getChannel(), remoteTempDir + '/' + item.getFilename());
FilePath srcFilePath = new FilePath(workspace, remoteTempDir + '/' + item.getFilename());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary, but simplifying while we are here.

@@ -0,0 +1,19 @@
gherkin.formatter.Mappable
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

About half of these are reproducible from the functional test. The rest were added by code inspection of the Gherkin library; presumably a more complete passWithEmbeddedItem.json would be able to reproduce the full spectrum.

@jtnord jtnord merged commit d48c37e into jenkinsci:master Jan 23, 2018
@jtnord
Copy link
Member

jtnord commented Jan 23, 2018

Thanks @jglick

@jglick jglick deleted the JENKINS-49101 branch January 25, 2018 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants