Skip to content

Remove invalid config file settings #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anuruddhal merged 2 commits into from
Mar 24, 2026
Merged

Remove invalid config file settings #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c647fe
Remove invalid config file settings
anuruddhal Mar 18, 2026
61958d4
Fix trivy scan
anuruddhal Mar 24, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
sudo apt-get install -y trivy

- name: Run Trivy security scan
uses: aquasecurity/trivy-action@0.30.0
uses: aquasecurity/trivy-action@0.35.0
with:
scan-type: "fs"
scan-ref: "build/distribution/extracted"
Expand All @@ -184,7 +184,7 @@ jobs:
sarif_file: "trivy-results.sarif"

- name: Trivy security gate (block on HIGH/CRITICAL)
uses: aquasecurity/trivy-action@0.30.0
uses: aquasecurity/trivy-action@0.35.0
with:
scan-type: "fs"
scan-ref: "build/distribution/extracted"
Expand All @@ -194,7 +194,7 @@ jobs:
skip-setup-trivy: true

- name: Generate Trivy report (table format)
uses: aquasecurity/trivy-action@0.30.0
uses: aquasecurity/trivy-action@0.35.0
if: always()
with:
scan-type: "fs"
Expand Down
8 changes: 0 additions & 8 deletions distribution/scripts/icp.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ if exist "!CONFIG_FILE!" (
)
)

set WWW_CONFIG_FILE=!PARENT_DIR!\www\public\choreo.env.config.js
if exist "!WWW_CONFIG_FILE!" (
powershell -Command "(Get-Content '!WWW_CONFIG_FILE!') -replace '\"SSO_ENABLED\": ''(true|false)''', '\"SSO_ENABLED\": ''!SSO_ENABLED!''' | Set-Content '!WWW_CONFIG_FILE!'"
echo SSO Configuration: Updated frontend config with SSO_ENABLED=!SSO_ENABLED!
) else (
echo Warning: Frontend config file not found at !WWW_CONFIG_FILE!
)

if not exist "!CONFIG_FILE!" (
echo Warning: Configuration file not found at !CONFIG_FILE!
echo Starting ICP Server without custom configuration...
Expand Down
8 changes: 0 additions & 8 deletions distribution/scripts/icp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ if [ -f "$CONFIG_FILE" ]; then
fi
fi

WWW_CONFIG_FILE="$PARENT_DIR/www/public/choreo.env.config.js"
if [ -f "$WWW_CONFIG_FILE" ]; then
sed -i.bak -E "s/\"SSO_ENABLED\": '(true|false)'/\"SSO_ENABLED\": '$SSO_ENABLED'/" "$WWW_CONFIG_FILE"
rm -f "$WWW_CONFIG_FILE.bak" # Remove backup file
echo "SSO Configuration: Updated frontend config with SSO_ENABLED=$SSO_ENABLED"
else
echo "Warning: Frontend config file not found at $WWW_CONFIG_FILE"
fi

if [ ! -f "$CONFIG_FILE" ]; then
echo "Warning: Configuration file not found at $CONFIG_FILE"
Expand Down
Loading