Skip to content

Commit 7c9dc23

Browse files
authored
Address 1ES CodeQL issues (#10198)
* Address 1ES CodeQL issues * Switch to nightly build * Remove unnecessary template
1 parent c0219e6 commit 7c9dc23

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

eng/ci/official-build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ trigger:
77
- release/4.*
88
- release/in-proc
99

10+
schedules:
11+
# Ensure we build nightly to catch any new CVEs and report SDL often.
12+
- cron: "0 0 * * *"
13+
displayName: Nightly Build
14+
branches:
15+
include:
16+
- dev
17+
- in-proc
18+
always: true
19+
1020
# CI only, does not trigger on PRs.
1121
pr: none
1222

@@ -34,6 +44,10 @@ extends:
3444
name: 1es-pool-azfunc
3545
image: 1es-windows-2022
3646
os: windows
47+
sdl:
48+
codeql:
49+
# Move codeql for source languages to source analysis stage
50+
runSourceLanguagesInSourceAnalysis: true
3751

3852
stages:
3953
- stage: Initialize

eng/ci/public-build.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ trigger:
99
- release/4.*
1010
- release/in-proc
1111

12+
schedules:
13+
# Ensure we build nightly to catch any new CVEs and report SDL often.
14+
- cron: "0 0 * * *"
15+
displayName: Nightly Build
16+
branches:
17+
include:
18+
- dev
19+
- in-proc
20+
always: true
1221
pr:
1322
branches:
1423
include:
@@ -35,6 +44,12 @@ extends:
3544
image: 1es-windows-2022
3645
os: windows
3746

47+
sdl:
48+
codeql:
49+
compiled:
50+
enabled: true
51+
runSourceLanguagesInSourceAnalysis: true
52+
3853
stages:
3954
- stage: Test
4055
jobs:

eng/ci/templates/jobs/initialize-pipeline.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ jobs:
22
- job: InitializePipeline
33
displayName: Initialize Pipeline
44

5+
templateContext:
6+
sdl:
7+
codeql:
8+
compiled:
9+
enabled: false
10+
511
steps:
612
- task: UseDotNet@2 # The pinned SDK we use to build
713
displayName: 'Install .NET SDK from global.json'

sample/Java/HttpTrigger/Function.java renamed to sample/Java/HttpTrigger/Function.java.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// This is a .txt extension intentionally so CodeQL does not expect and wait for a java compilation step.
2+
// Real java function apps would have this as .java extension.
3+
14
package Microsoft.Azure.WebJobs.Script.Tests.EndToEnd;
25

36
import java.util.*;
@@ -13,7 +16,7 @@
1316
* Accept defaults for rest of the identifiers
1417
* Run mvn clean package
1518
*/
16-
public class Function {
19+
public class Function {
1720
@FunctionName("HttpTrigger")
1821
public HttpResponseMessage run(
1922
@HttpTrigger(name = "req", methods = {HttpMethod.GET, HttpMethod.POST}, authLevel = AuthorizationLevel.FUNCTION) HttpRequestMessage<Optional<String>> request,
@@ -23,12 +26,12 @@ public HttpResponseMessage run(
2326
// Parse query parameter
2427
String query = request.getQueryParameters().get("name");
2528
String name = request.getBody().orElse(query);
26-
String readEnv = System.getenv("AzureWebJobsStorage");
29+
String readEnv = System.getenv("AzureWebJobsStorage");
2730

2831
if (name == null) {
2932
return request.createResponseBuilder(HttpStatus.BAD_REQUEST).body("Please pass a name on the query string or in the request body").build();
3033
}
31-
if (readEnv == null ) {
34+
if (readEnv == null ) {
3235
return request.createResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR).body("AzureWebJobsStorage is empty").build();
3336
}
3437
return request.createResponseBuilder(HttpStatus.OK).body("Hello, " + name).build();

0 commit comments

Comments
 (0)