Skip to content

Commit d4a7a37

Browse files
authored
v1.3.4
Fix multi categories and languages
2 parents 7fe678b + 27ce798 commit d4a7a37

File tree

5 files changed

+39
-15
lines changed

5 files changed

+39
-15
lines changed

lib/action.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,27 @@ function run() {
4545
}
4646
args.push('-p');
4747
args.push(policy);
48-
let categories = core.getInput('categories');
49-
if (!client.isNullOrWhiteSpace(categories)) {
48+
let categoriesString = core.getInput('categories');
49+
if (!client.isNullOrWhiteSpace(categoriesString)) {
5050
args.push('--categories');
51-
args.push(categories);
51+
let categories = categoriesString.split(',');
52+
for (let i = 0; i < categories.length; i++) {
53+
let category = categories[i];
54+
if (!client.isNullOrWhiteSpace(category)) {
55+
args.push(category.trim());
56+
}
57+
}
5258
}
53-
let languages = core.getInput('languages');
54-
if (!client.isNullOrWhiteSpace(languages)) {
59+
let languagesString = core.getInput('languages');
60+
if (!client.isNullOrWhiteSpace(languagesString)) {
61+
let languages = languagesString.split(',');
5562
args.push('--languages');
56-
args.push(languages);
63+
for (let i = 0; i < languages.length; i++) {
64+
let language = languages[i];
65+
if (!client.isNullOrWhiteSpace(language)) {
66+
args.push(language.trim());
67+
}
68+
}
5769
}
5870
args.push('--github');
5971
yield client.run(args, 'microsoft/security-devops-action');

node_modules/.package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "microsoft-security-devops-action",
3-
"version": "1.3.3",
3+
"version": "1.3.4",
44
"description": "Node dependencies for the microsoft/security-devops-action.",
55
"scripts": {
66
"test": "mocha"

src/action.ts

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,28 @@ async function run() {
2121
args.push('-p');
2222
args.push(policy);
2323

24-
let categories: string = core.getInput('categories');
25-
if (!client.isNullOrWhiteSpace(categories)) {
24+
let categoriesString: string = core.getInput('categories');
25+
if (!client.isNullOrWhiteSpace(categoriesString)) {
2626
args.push('--categories');
27-
args.push(categories)
27+
let categories = categoriesString.split(',');
28+
for (let i = 0; i < categories.length; i++) {
29+
let category = categories[i];
30+
if (!client.isNullOrWhiteSpace(category)) {
31+
args.push(category.trim());
32+
}
33+
}
2834
}
2935

30-
let languages: string = core.getInput('languages');
31-
if (!client.isNullOrWhiteSpace(languages)) {
36+
let languagesString: string = core.getInput('languages');
37+
if (!client.isNullOrWhiteSpace(languagesString)) {
38+
let languages = languagesString.split(',');
3239
args.push('--languages');
33-
args.push(languages)
40+
for (let i = 0; i < languages.length; i++) {
41+
let language = languages[i];
42+
if (!client.isNullOrWhiteSpace(language)) {
43+
args.push(language.trim());
44+
}
45+
}
3446
}
3547

3648
args.push('--github');

0 commit comments

Comments
 (0)