Skip to content

Fix: [AEA-5158] - set state machine log level per environment #1462

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
anthony-nhs merged 8 commits into from
Mar 26, 2025
Merged

Fix: [AEA-5158] - set state machine log level per environment #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fba61c1
set state machine log level to lower in prod
anthony-nhs Mar 24, 2025
a79e062
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 24, 2025
a5c07f0
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 24, 2025
ca79965
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 24, 2025
5956f16
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 24, 2025
a71d934
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 24, 2025
7fea9a9
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 25, 2025
eaad2f6
Merge branch 'main' into lower_step_function_log_level
anthony-nhs Mar 26, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
Expand Down Expand Up @@ -142,6 +143,7 @@ jobs:
DEPLOY_APIGEE_CPSU: true
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand All @@ -167,6 +169,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: false
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
Expand All @@ -101,6 +102,7 @@ jobs:
DEPLOY_APIGEE_CPSU: true
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
Expand Down Expand Up @@ -161,6 +162,7 @@ jobs:
DEPLOY_APIGEE_CPSU: true
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
Expand Down Expand Up @@ -194,6 +196,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ERROR
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.REF_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
Expand Down Expand Up @@ -227,6 +230,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
Expand Down Expand Up @@ -255,6 +259,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: true
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }}
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
Expand Down Expand Up @@ -283,6 +288,7 @@ jobs:
DEPLOY_APIGEE_CPSU: true
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ALL
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }}
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PROD_ROLE }}
Expand Down Expand Up @@ -318,6 +324,7 @@ jobs:
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: false
ENABLE_ALERTS: true
RUN_REGRESSION_TEST: false
STATE_MACHINE_LOG_LEVEL: ERROR
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }}
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/run_release_code_and_api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ on:
default: true
RUN_REGRESSION_TEST:
required: true
type: boolean
type: boolean
STATE_MACHINE_LOG_LEVEL:
required: true
type: string
secrets:
CLOUD_FORMATION_DEPLOY_ROLE:
required: true
Expand Down Expand Up @@ -150,6 +153,7 @@ jobs:
DYNAMODB_AUTOSCALE: ${{ inputs.DYNAMODB_AUTOSCALE }}
DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: ${{ inputs.DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE }}
ENABLE_ALERTS: ${{ inputs.ENABLE_ALERTS }}
STATE_MACHINE_LOG_LEVEL: ${{ inputs.STATE_MACHINE_LOG_LEVEL }}
run: ./release_code.sh

- name: get mtls secrets
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-sta
LogRetentionInDays=$$LOG_RETENTION_DAYS \
Environment=$$TARGET_ENVIRONMENT \
DeployCheckPrescriptionStatusUpdate=$$DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE \
EnableAlerts=$$ENABLE_ALERTS
EnableAlerts=$$ENABLE_ALERTS \
StateMachineLogLevel=$$STATE_MACHINE_LOG_LEVEL

compile-node:
npx tsc --build tsconfig.build.json
Expand Down
3 changes: 3 additions & 0 deletions SAMtemplates/main_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ Parameters:
Description: When the database usage crosses this percentage of provisioned capacity, trigger an alarm
Default: 90

StateMachineLogLevel:
Type: String

Resources:
Tables:
Expand Down Expand Up @@ -145,6 +147,7 @@ Resources:
ConvertRequestToFhirFormatFunctionArn: !GetAtt Functions.Outputs.ConvertRequestToFhirFormatFunctionArn
LogRetentionInDays: !Ref LogRetentionInDays
EnableSplunk: !Ref EnableSplunk
StateMachineLogLevel: !Ref StateMachineLogLevel

Alarms:
Type: AWS::Serverless::Application
Expand Down
7 changes: 5 additions & 2 deletions SAMtemplates/state_machines/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Parameters:
Type: String
Default: fhir-validator

StateMachineLogLevel:
Type: String

Resources:
UpdatePrescriptionStatusStateMachine:
Type: AWS::Serverless::StateMachine
Expand All @@ -53,7 +56,7 @@ Resources:
- CloudWatchLogsLogGroup:
LogGroupArn: !GetAtt UpdatePrescriptionStatusStateMachineResources.Outputs.StateMachineLogGroupArn
IncludeExecutionData: true
Level: ALL
Level: !Ref StateMachineLogLevel
Tracing:
Enabled: true

Expand Down Expand Up @@ -90,7 +93,7 @@ Resources:
- CloudWatchLogsLogGroup:
LogGroupArn: !GetAtt Format1UpdatePrescriptionsStatusStateMachineResources.Outputs.StateMachineLogGroupArn
IncludeExecutionData: true
Level: ALL
Level: !Ref StateMachineLogLevel
Tracing:
Enabled: true

Expand Down
Loading