Skip to content

Commit 1cc84f0

Browse files
authored
Merge pull request #1367 from credebl/develop
Merge latest develop branch into QA
2 parents 52143b0 + 2e4e6fd commit 1cc84f0

File tree

30 files changed

+5651
-4312
lines changed

30 files changed

+5651
-4312
lines changed

.env.demo

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,36 @@ APP=api
145145
#Schema-file-server
146146
APP_PORT=4000
147147
JWT_TOKEN_SECRET=
148-
ISSUER=Credebl
148+
ISSUER=Credebl
149+
150+
#Signoz and OTel
151+
IS_ENABLE_OTEL=false
152+
OTEL_SERVICE_NAME='CREDEBL-PLATFORM-SERVICE'
153+
OTEL_SERVICE_VERSION='1.0.0'
154+
OTEL_TRACES_OTLP_ENDPOINT='http://localhost:4318/v1/traces'
155+
OTEL_LOGS_OTLP_ENDPOINT='http://localhost:4318/v1/logs'
156+
OTEL_HEADERS_KEY=88ca6b1XXXXXXXXXXXXXXXXXXXXXXXXXXX
157+
OTEL_LOGGER_NAME='credebl-platform-logger'
158+
HOSTNAME='localhost'
159+
160+
# SSO
161+
# To add more clients, simply add comma separated values of client names
162+
SUPPORTED_SSO_CLIENTS=CREDEBL
163+
164+
# To add more client add the following variables for each additional client.
165+
# Replace the `CLIENT-NAME` with the appropriate client name as added in `SUPPORTED_SSO_CLIENTS`
166+
# Default client will not need the following details
167+
168+
# CLIENT-NAME_CLIENT_ALIAS=VERIFIER
169+
# # Domain represents the redirection url once the client logs-in
170+
# # TODO: Can be taken from keycloak instead
171+
# CLIENT-NAME_DOMAIN=https://VERIFIER-domain.com
172+
# # Encrypted client credentials using the `CRYPTO_PRIVATE_KEY`
173+
# CLIENT-NAME_KEYCLOAK_MANAGEMENT_CLIENT_ID=
174+
# CLIENT-NAME_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=
175+
176+
# Sample values:
177+
# VERIFIER_CLIENT_ALIAS=VERIFIER
178+
# VERIFIER_DOMAIN=https://VERIFIER-domain.com
179+
# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_ID=encryptedKeyCloakClientId
180+
# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=encryptedKeyCloakClientSecret

.env.sample

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,35 @@ ELK_PASSWORD=xxxxxx // ELK user password
166166

167167
ORGANIZATION=credebl
168168
CONTEXT=platform
169-
APP=api
169+
APP=api
170+
171+
IS_ENABLE_OTEL=false # Flag to enable/disable OpenTelemetry (true = enabled, false = disabled)
172+
OTEL_SERVICE_NAME='CREDEBL-PLATFORM-SERVICE' # Logical name of the service shown in observability tools (e.g., SigNoz)
173+
OTEL_SERVICE_VERSION='1.0.0' # Version of the service; helps in tracking changes over time
174+
OTEL_TRACES_OTLP_ENDPOINT='http://localhost:4318/v1/traces' # Endpoint where traces are exported (OTLP over HTTP)
175+
OTEL_LOGS_OTLP_ENDPOINT='http://localhost:4318/v1/logs' # Endpoint where logs are exported (OTLP over HTTP)
176+
OTEL_HEADERS_KEY=88ca6b1XXXXXXXXXXXXXXXXXXXXXXXXXXX # API key or token used for authenticating with the OTel collector (e.g., SigNoz)
177+
OTEL_LOGGER_NAME='credebl-platform-logger' # Name of the logger used for OpenTelemetry log records
178+
HOSTNAME='localhost' # Hostname or unique identifier for the service instance
179+
180+
# SSO
181+
# To add more clients, simply add comma separated values of client names
182+
SUPPORTED_SSO_CLIENTS=CREDEBL
183+
184+
# To add more client add the following variables for each additional client.
185+
# Replace the `CLIENT-NAME` with the appropriate client name as added in `SUPPORTED_SSO_CLIENTS`
186+
# Default client will not need the following details
187+
188+
# CLIENT-NAME_CLIENT_ALIAS=MYAPP
189+
# # Domain represents the redirection url once the client logs-in
190+
# # TODO: Can be taken from keycloak instead
191+
# CLIENT-NAME_DOMAIN=https://myapp.com
192+
# # Encrypted client credentials using the `CRYPTO_PRIVATE_KEY`
193+
# CLIENT-NAME_KEYCLOAK_MANAGEMENT_CLIENT_ID=
194+
# CLIENT-NAME_KEYCLOAK_MANAGEMENT_CLIENT_SECRET
195+
196+
# Sample values:
197+
# VERIFIER_CLIENT_ALIAS=VERIFIER
198+
# VERIFIER_DOMAIN=https://VERIFIER-domain.com
199+
# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_ID=encryptedKeyCloakClientId
200+
# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=encryptedKeyCloakClientSecret

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
62+
uses: actions/upload-artifact@v4
6363
with:
64-
name: SARIF file
64+
name: sarif-file
6565
path: results.sarif
6666
retention-days: 5
6767

0 commit comments

Comments
 (0)