Skip to content

Commit

Permalink
Merge pull request #4 from MetLife/develop
Browse files Browse the repository at this point in the history
Update azure-pipelines-task-lib and extension info
  • Loading branch information
gattjoe authored Dec 9, 2020
2 parents 7ad3103 + 8087479 commit a2abc28
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 69 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ The location of the latest self-hosted agents is [here](https://github.com/micro

## Feedback

Send me mail at joe@metlife.com
Send me mail at gattjoseph@hotmail.com
116 changes: 59 additions & 57 deletions buildAndReleaseTask/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions buildAndReleaseTask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"author": "Joe Gatt",
"license": "Apache-2.0",
"dependencies": {
"azure-pipelines-task-lib": "^2.11.1",
"azure-pipelines-task-lib": "^2.11.4",
"azure-pipelines-tool-lib": "^0.13.2"
},
"devDependencies": {
"@types/node": "^14.11.2",
"@types/node": "^14.14.11",
"@types/q": "^1.5.4"
}
}
7 changes: 4 additions & 3 deletions buildAndReleaseTask/scascan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async function run(): Promise<void> {

// Get SRCCLR_API_TOKEN environmental variable
const SRCCLR_API_TOKEN: string = <string>tl.getVariable('SRCCLR_API_TOKEN');
if (SRCCLR_API_TOKEN === undefined) {
if (SRCCLR_API_TOKEN === '' || SRCCLR_API_TOKEN === undefined) {
throw new Error('You must define the SRCCLR_API_TOKEN environmental variable.');
}

Expand Down Expand Up @@ -112,7 +112,8 @@ async function run(): Promise<void> {

// Need error handling when selecting python for non Microsoft hosted agents
// Install junitparser
const python3: trm.ToolRunner = tl.tool('python3');
const pythonPath: string = tl.which('python3');
const python3: trm.ToolRunner = tl.tool(pythonPath);
python3.arg('-m');
python3.arg('pip');
python3.arg('install');
Expand All @@ -122,7 +123,7 @@ async function run(): Promise<void> {
tl.setResult(tl.TaskResult.Succeeded, tl.loc('pipReturnCode', pipinstall));

// Generate the results
const genResults: trm.ToolRunner = tl.tool('python3');
const genResults: trm.ToolRunner = tl.tool(pythonPath);
genResults.arg(path.join(__dirname, 'parsescaresults.py'));
genResults.arg('--target');
genResults.arg(`${appName}`);
Expand Down
2 changes: 1 addition & 1 deletion buildAndReleaseTask/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "VeracodeCommunityScaAdoExtension",
"friendlyName": "Veracode Community SCA Azure DevOps Extension",
"description": "Veracode Community SCA Azure DevOps Extension",
"helpMarkDown": "Email joe@metlife.com for support.",
"helpMarkDown": "Email gattjoseph@hotmail.com for support.",
"category": "Azure Pipelines",
"author": "Joe Gatt",
"version": {
Expand Down
4 changes: 0 additions & 4 deletions overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,3 @@ The location of the latest self-hosted agents is [here](https://github.com/micro
## References

[Here](https://www.paraesthesia.com/archive/2020/02/25/tips-for-custom-azure-devops-build-tasks/) are some useful tips for developing tasks for Azure DevOps.

## Feedback

Send me mail at joe@metlife.com
8 changes: 7 additions & 1 deletion vss-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
],
"links": {
"support": {
"uri": "mailto:joe@metlife.com"
"uri": "mailto:gattjoseph@hotmail.com"
},
"issues": {
"uri": "https://github.com/MetLife/VeracodeCommunitySCA/issues"
}
},
"repository": {
Expand All @@ -44,6 +47,9 @@
"content": {
"details": {
"path": "overview.md"
},
"license": {
"path": "LICENSE.txt"
}
},
"contributions": [
Expand Down

0 comments on commit a2abc28

Please sign in to comment.