Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
5df8e24
Update pipeline-config.yaml (#440)
bkaiserinfosec Dec 30, 2023
c3fb035
Update tox.ini (#441)
bkaiserinfosec Dec 30, 2023
57a681a
Feature/fix toxi (#443)
bkaiserinfosec Dec 30, 2023
b3d741c
Feature/fix toxi (#445)
bkaiserinfosec Dec 30, 2023
f62e0d1
Feature/fix toxi (#447)
bkaiserinfosec Dec 31, 2023
5c40b88
Feature/fix toxi (#449)
bkaiserinfosec Jan 1, 2024
b8d2775
Update Jenkinsfile (#452)
bkaiserinfosec Jan 4, 2024
9e4030d
Feature/jenkinsfile updates (#453)
bkaiserinfosec Jan 8, 2024
fb5d50f
Feature/jenkinsfile updates (#455)
bkaiserinfosec Jan 8, 2024
deaed40
Merge branch 'main' into release/0.2.0-beta/Test-1
bkaiserinfosec Jan 8, 2024
22fc757
Feature/jenkinsfile updates (#457)
bkaiserinfosec Jan 8, 2024
48869b8
Feature/jenkinsfile updates (#459)
bkaiserinfosec Jan 8, 2024
b88f33e
Feature/jenkinsfile updates (#461)
bkaiserinfosec Jan 8, 2024
3058cc8
Feature/jenkinsfile updates (#463)
bkaiserinfosec Jan 8, 2024
eae9cfd
Feature/jenkinsfile updates (#465)
bkaiserinfosec Jan 8, 2024
b1d3586
Feature/jenkinsfile updates (#467)
bkaiserinfosec Jan 10, 2024
a688f72
Feature/jenkinsfile updates (#469)
bkaiserinfosec Jan 10, 2024
d0edd8f
Update Jenkinsfile
bkaiserinfosec Jan 13, 2024
6bc2607
Update pipeline-config.yaml
bkaiserinfosec Jan 13, 2024
4e2bc4a
Update values.yaml
bkaiserinfosec Jan 13, 2024
fba2f2b
Update values.yaml
bkaiserinfosec Jan 13, 2024
1a298c0
Update Jenkinsfile
bkaiserinfosec Jan 15, 2024
ef00ba5
Update values.yaml
bkaiserinfosec Jan 15, 2024
f497be3
Update pipeline-config.yaml
bkaiserinfosec Jan 17, 2024
ee6d9dd
Feature/jenkinsfile updates (#473)
bkaiserinfosec Jan 17, 2024
22a872b
Feature/jenkinsfile updates (#474)
bkaiserinfosec Feb 27, 2024
64ed436
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Feb 27, 2024
1169457
Feature/jenkinsfile updates (#476)
bkaiserinfosec Feb 27, 2024
4b6af0b
Feature/jenkinsfile updates (#478)
bkaiserinfosec Feb 28, 2024
cebffc6
Update pipeline-config.yaml
bkaiserinfosec Feb 28, 2024
38282ba
Feature/jenkinsfile updates (#481)
bkaiserinfosec Feb 28, 2024
86da6a0
Feature/jenkinsfile updates (#483)
bkaiserinfosec Feb 28, 2024
e019ade
Feature/jenkinsfile updates (#485)
bkaiserinfosec Mar 9, 2024
33e0b20
Feature/jenkinsfile updates (#487)
bkaiserinfosec Mar 9, 2024
509a6f1
Update pipeline-config.yaml
bkaiserinfosec Mar 9, 2024
a52196c
Feature/jenkinsfile updates (#490)
bkaiserinfosec Mar 9, 2024
716c878
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 9, 2024
0f39204
Update pipeline-config.yaml
bkaiserinfosec Mar 9, 2024
ce79251
Update Jenkinsfile (#493)
bkaiserinfosec Mar 10, 2024
686ae51
Update security_quality_gate.py (#495)
bkaiserinfosec Mar 13, 2024
b4c8b1d
Feature/update jenkins config (#497)
bkaiserinfosec Mar 13, 2024
0cc02a4
Feature/update security gate config (#499)
bkaiserinfosec Mar 13, 2024
1b2577e
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 13, 2024
0cab74c
Feature/update settings function (#501)
bkaiserinfosec Mar 18, 2024
a598136
Feature/update release based db settings (#503)
bkaiserinfosec Mar 18, 2024
bc17dcc
Feature/update release based db settings (#505)
bkaiserinfosec Mar 18, 2024
14e819d
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 18, 2024
334bc68
Feature/fix db syntax (#507)
bkaiserinfosec Mar 18, 2024
24a95b3
Feature/fix db syntax (#509)
bkaiserinfosec Mar 18, 2024
74b26f7
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 18, 2024
0b07ab0
Feature/fix syntax error (#511)
bkaiserinfosec Mar 18, 2024
e246ba0
Feature/fix syntax error (#513)
bkaiserinfosec Mar 18, 2024
4cf2ebf
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 18, 2024
f98f329
Feature/fix syntax error (#515)
bkaiserinfosec Mar 20, 2024
e50317f
Feature/fix syntax error (#517)
bkaiserinfosec Mar 22, 2024
6eb3118
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
9edb485
Feature/jenkins updates (#519)
bkaiserinfosec Mar 22, 2024
76926b3
Feature/jenkins updates (#521)
bkaiserinfosec Mar 22, 2024
5399fad
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
7dd90fa
Feature/jenkins updates (#523)
bkaiserinfosec Mar 22, 2024
8428000
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
3422a4f
Feature/jenkins updates (#525)
bkaiserinfosec Mar 22, 2024
07cb6a7
Feature/jenkins updates (#527)
bkaiserinfosec Mar 22, 2024
4a11094
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
7319eb2
Feature/jenkins updates (#529)
bkaiserinfosec Mar 22, 2024
2319495
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
e5e42ed
Feature/jenkins updates (#531)
bkaiserinfosec Mar 22, 2024
6f14d86
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
feebb21
Feature/jenkins updates (#533)
bkaiserinfosec Mar 22, 2024
137ec5a
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 22, 2024
3a610b5
Feature/add app profile update function (#535)
bkaiserinfosec Mar 23, 2024
204fd90
Feature/add app profile update function (#537)
bkaiserinfosec Mar 24, 2024
dbd1830
Feature/add app profile update function (#539)
bkaiserinfosec Mar 25, 2024
7b10a4e
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 25, 2024
93ca8b0
Feature/add app profile update function (#541)
bkaiserinfosec Mar 26, 2024
97b706c
Feature/add app profile update function (#543)
bkaiserinfosec Mar 27, 2024
8ef7434
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 27, 2024
287d6fc
Feature/add app profile update function (#545)
bkaiserinfosec Mar 30, 2024
cddb6d7
Feature/add app profile update function (#547)
bkaiserinfosec Mar 30, 2024
38bb2ec
Feature/add app profile update function (#549)
bkaiserinfosec Mar 30, 2024
1fab02e
Feature/add app profile update function (#551)
bkaiserinfosec Mar 30, 2024
8f3f2bb
Merge branch 'main' into release/0.1.0-beta/Prod-azure
bkaiserinfosec Mar 30, 2024
8b1bb1c
Feature/add app profile update function (#553)
bkaiserinfosec Mar 30, 2024
14f7d82
Feature/add app profile update function (#555)
bkaiserinfosec Mar 31, 2024
f8a4bee
Feature/add app profile update function (#557)
bkaiserinfosec Mar 31, 2024
001e68b
Feature/add app profile update function (#559)
bkaiserinfosec Mar 31, 2024
552fabf
Feature/add app profile update function (#561)
bkaiserinfosec Mar 31, 2024
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
26 changes: 13 additions & 13 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ pipeline {

agent none

environment {
SNYK_API_KEY = credentials('snyk-api-key')
}

stages {
stage('Initialize Config') {
agent {
Expand Down Expand Up @@ -133,7 +137,7 @@ pipeline {
script {
def stageConfig = jslReadYamlConfig('sca')
def codeLanguages = stageConfig?.codeLanguages.join(',')
jslSecuritySCA(codeLanguages)
jslSoftwareCompositionAnalysis(codeLanguages, env.appName)
}
}
}
Expand Down Expand Up @@ -226,10 +230,7 @@ pipeline {

stage('Docker Container Scanning') {
agent {
kubernetes {
cloud 'kubernetes-cloud'
label 'jenkins-dockersec-agent'
}
label 'DockerVM'
}
when {
expression {
Expand All @@ -243,16 +244,15 @@ pipeline {
}
}
steps {
container('jenkins-dockersec-agent') {
jslStageWrapper('Docker Container Scanning') {
script {
def stageConfig = jslReadYamlConfig('containerScan')
def containerName = stageConfig?.containerName
def containerTag = stageConfig?.containerTag
jslContainerSecurityScanning(containerName, containerTag)
}
jslStageWrapper('Docker Container Scanning') {
script {
def stageConfig = jslReadYamlConfig('containerScan')
def containerName = stageConfig?.containerName
def containerTag = stageConfig?.containerTag
jslContainerSecurityScanning(containerName, containerTag)
}
}

}
}

Expand Down
8 changes: 4 additions & 4 deletions pipeline-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ stages:
branches:
- release
unitTesting:
enabled: true
enabled: false
branches: []
secretScanning:
enabled: true
enabled: false
branches:
- release
sca:
enabled: true
enabled: false
branches:
- release
codeLanguages:
- Python
- Javascript
sast:
enabled: true
enabled: false
branches:
- release
codeLanguages:
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# must be unique in a given SonarQube instance
sonar.projectKey=SECUSPHERE
sonar.projectKey=SECUSPHERE--SecuSphere

# --- optional properties ---

Expand Down