Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.
/ community-functions Public archive

Some more fixes #12

Merged
rtyler merged 3 commits into from
May 3, 2018
Merged

Some more fixes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f57294f
Tightening up build_url match.
jglick May 3, 2018
5eb0001
More graceful handling of incomplete metadata.
jglick May 3, 2018
f63295c
Comment.
jglick May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion incrementals-publisher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = async (context, data) => {
context.log.error('Misplaced build_url', buildUrl, JENKINS_HOST);
return failRequest(context, 'This build_url is not supported');
}
if (!buildUrl.substring(JENKINS_HOST.length).match('(job/[a-zA-Z0-9._-]+/)+[0-9]+/') || buildUrl.includes('/../') || buildUrl.includes('/./')) {
if (!buildUrl.substring(JENKINS_HOST.length).match('^(job/[a-zA-Z0-9._-]+/)+[0-9]+/$') || buildUrl.includes('/../') || buildUrl.includes('/./')) {
context.log.error('Malformed build_url', buildUrl);
return failRequest(context, 'This build_url is malformed');
}
Expand Down
1 change: 1 addition & 0 deletions incrementals-publisher/lib/github.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
commitExists: async (owner, repo, sha) => {
let github = new GitHubApi();
/* The function must have this Application Setting already created */
// TODO a failure here results in UnhandledPromiseRejectionWarning but the function continues
github.authenticate({
type: 'oauth',
token: GITHUB_TOKEN
Expand Down
14 changes: 7 additions & 7 deletions incrementals-publisher/lib/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ module.exports = {
*/
processBuildMetadata: (metadata) => {
let response = {};

metadata.actions.forEach((action) => {
if (action._class === 'jenkins.scm.api.SCMRevisionAction') {
response.hash = action.revision.hash || action.revision.pullHash;
}
});

if (metadata.actions) {
metadata.actions.forEach((action) => {
if (action._class === 'jenkins.scm.api.SCMRevisionAction') {
response.hash = action.revision.hash || action.revision.pullHash;
}
});
}
return response;
},

Expand Down
1 change: 1 addition & 0 deletions incrementals-publisher/test/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe('Handling incremental publisher webhook events', () => {
'https://ci.jenkins.io/job/hack%79/123/',
'https://ci.jenkins.io/job/../123/',
'https://ci.jenkins.io/job/./123/',
'https://ci.jenkins.io/job/ok/123//',
]) {
it(u + ' should return a 400', () => {
data.body.build_url = u;
Expand Down
88 changes: 88 additions & 0 deletions incrementals-publisher/test/pipeline-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,94 @@ describe('The Pipeline helpers', () => {
const value = pipeline.processBuildMetadata(metadata);
assert.equal(value.hash, "abc131cc3bf56309a05b3fe8b086b265d14f2a61");
});

let metadata2 = { // https://ci.jenkins.io/job/Core/job/jenkins/job/master/888/api/json?tree=actions[revision[hash,pullHash]]&pretty
"_class" : "org.jenkinsci.plugins.workflow.job.WorkflowRun",
"actions" : [
{
"_class" : "hudson.model.CauseAction"
},
{
"_class" : "jenkins.metrics.impl.TimeInQueueAction"
},
{

},
{
"_class" : "jenkins.scm.api.SCMRevisionAction",
"revision" : {
"_class" : "jenkins.plugins.git.AbstractGitSCMSource$SCMRevisionImpl"
}
},
{

},
{
"_class" : "hudson.plugins.git.util.BuildData"
},
{
"_class" : "hudson.plugins.git.GitTagAction"
},
{

},
{
"_class" : "hudson.plugins.git.util.BuildData"
},
{
"_class" : "org.jenkinsci.plugins.workflow.cps.EnvActionImpl"
},
{
"_class" : "hudson.plugins.git.util.BuildData"
},
{

},
{

},
{
"_class" : "hudson.tasks.junit.TestResultAction"
},
{

},
{

},
{

},
{

},
{

},
{

},
{
"_class" : "org.jenkinsci.plugins.workflow.job.views.FlowGraphAction"
},
{

},
{

}
]
};

it('should return no hash', () => {
const value = pipeline.processBuildMetadata(metadata2);
assert.equal(value.hash, null);
});

it('gracefully tolerates lack of any authentication', () => {
const value = pipeline.processBuildMetadata({});
assert.equal(value.hash, null);
});
});

describe('getBuildApiUrl', () => {
Expand Down