Skip to content

Commit 7f513c6

Browse files
author
kadraman
committed
Reverting to single application structure
1 parent 89aa5fa commit 7f513c6

149 files changed

Lines changed: 13 additions & 33192 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# It is recommended to create credentials with 'Security Lead' Role selected.
1313
# "Automated Audit preference" should be configured for the release's Static Scan Settings.
1414

15-
name: DevSecOps - Angular Frontend
15+
name: DevSecOps with Fortify on Demand
1616

1717
on:
1818
# Triggers the workflow on push or pull request events but only for the main or develop branches
1919
push:
2020
paths:
21-
- 'src/frontend/**'
21+
- 'src/**'
2222
#branches-ignore:
2323
# - main
2424
# - develop
@@ -49,9 +49,8 @@ on:
4949

5050
# Global environment variables
5151
env:
52-
DEFAULT_APP_NAME: "Insecure-Microservices"
53-
DEFAULT_MICROSERVICE_NAME: "frontend"
54-
DEFAULT_SOURCE_DIR: "src/frontend"
52+
DEFAULT_APP_NAME: "IWA-API-Node"
53+
DEFAULT_SOURCE_DIR: "."
5554
NODE_VERSION: 18
5655

5756
jobs:
@@ -103,7 +102,7 @@ jobs:
103102
#FOD_PASSWORD: ${{secrets.FOD_PAT}}
104103
FOD_CLIENT_ID: ${{secrets.FOD_CLIENT_ID}}
105104
FOD_CLIENT_SECRET: ${{secrets.FOD_CLIENT_SECRET}}
106-
FOD_RELEASE: ${{ format('{0}{1}:{2}:{3}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, env.DEFAULT_MICROSERVICE_NAME, github.ref_name) }}
105+
FOD_RELEASE: ${{ format('{0}{1}:{2}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, github.ref_name) }}
107106
SETUP_EXTRA_OPTS: "--use-aviator"
108107
PACKAGE_EXTRA_OPTS: "-bt none"
109108
SOURCE_DIR: ${{env.DEFAULT_SOURCE_DIR}}
@@ -140,7 +139,7 @@ jobs:
140139
FOD_CLIENT_ID: ${{ secrets.FOD_CLIENT_ID }}
141140
FOD_CLIENT_SECRET: ${{ secrets.FOD_CLIENT_SECRET }}
142141
PACKAGE_FILE: "osspackage.zip"
143-
FOD_RELEASE: ${{ format('{0}{1}:{2}:{3}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, env.DEFAULT_MICROSERVICE_NAME, github.ref_name) }}
142+
FOD_RELEASE: ${{ format('{0}{1}:{2}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, github.ref_name) }}
144143

145144
Deploy-App:
146145
runs-on: ubuntu-latest
@@ -175,7 +174,7 @@ jobs:
175174
fod_api_url: ${{ vars.FOD_API_URL }}
176175
fod_client_id: ${{ secrets.FOD_CLIENT_ID }}
177176
fod_client_secret: ${{ secrets.FOD_CLIENT_SECRET }}
178-
fod_app_name: ${{ format('{0}{1}:{2}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, env.DEFAULT_MICROSERVICE_NAME) }}
177+
fod_app_name: ${{ format('{0}{1}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX) }}
179178
fod_release_name: ${{ github.ref_name }}
180179
# fod_release_name: ${{ format('{0}#{1}', steps.fortify-app-and-rel-name.outputs.release_name, github.run_number) }}
181180
# fod_parent_release_name: ${{ steps.fortify-app-and-rel-name.outputs.parent_release_name }}
@@ -194,7 +193,7 @@ jobs:
194193
fod_api_url: ${{ vars.FOD_API_URL }}
195194
fod_client_id: ${{ secrets.FOD_CLIENT_ID }}
196195
fod_client_secret: ${{ secrets.FOD_CLIENT_SECRET }}
197-
fod_app_name: ${{ format('{0}{1}:{2}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX, env.DEFAULT_MICROSERVICE_NAME) }}
196+
fod_app_name: ${{ format('{0}{1}', env.DEFAULT_APP_NAME, vars.FORTIFY_APP_NAME_POSTFIX) }}
198197
fod_release_name: ${{ github.ref_name }}
199198

200199
Release-To-Prod:

.github/workflows/product-service.yml

Lines changed: 0 additions & 206 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 2 deletions

bin/sast-scan.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ fi
5050
# Run the translation and scan
5151
#
5252
echo Running translation...
53-
sourceanalyzer $ScanSwitches $JVMArgs -b "$AppName" "iwa"
53+
sourceanalyzer $ScanSwitches $JVMArgs -b "$AppName" -python-path ".venv/lib/python3.12/site-packages/" \
54+
-exclude ".venv" -exclude "**/requirements.txt" "iwa"
5455

5556
echo Running scan...
5657
sourceanalyzer $ScanSwitches $JVMArgs -b "$AppName" -debug -verbose \
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)