forward waf logs to csoc

Author: anthony-nhs

.github/scripts/fix_cdk_json.sh

@@ -183,7 +183,6 @@ fix_string_key cfnDriftDetectionGroup "${CFN_DRIFT_DETECTION_GROUP}"
 fix_boolean_number_key isPullRequest "${IS_PULL_REQUEST}"
 fix_string_key csocUKWafDestination "arn:aws:logs:eu-west-2:693466633220:destination:waf_log_destination" # CSOC WAF log destination - do not change
 fix_string_key csocUSWafDestination "arn:aws:logs:us-east-1:693466633220:destination:waf_log_destination_virginia" # CSOC WAF log destination - do not change
-fix_string_key csocApiGatewayDestination "arn:aws:logs:eu-west-2:693466633220:destination:api_gateway_log_destination" # CSOC API Gateway log destination - do not change
 fix_boolean_number_key forwardCsocLogs "${FORWARD_CSOC_LOGS}"
 
 if [ "$CDK_APP_NAME" == "StatefulResourcesApp" ]; then

.github/workflows/pull_request.yml

@@ -183,7 +183,7 @@ jobs:
       REACT_LOG_LEVEL: "debug"
       LOG_RETENTION_IN_DAYS: 30
       IS_PULL_REQUEST: true
-      FORWARD_CSOC_LOGS: true
+      FORWARD_CSOC_LOGS: false
     secrets: inherit
   report_deployed_url:
     needs: [release_code, get_issue_number]

Makefile

@@ -218,6 +218,7 @@ cdk-synth-stateful-resources-no-mock:
 	DO_NOT_GET_AWS_EXPORT=true \
 	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
+	FORWARD_CSOC_LOGS=true \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateful_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateful_app.config.json npx cdk synth \
 		--quiet \
@@ -267,6 +268,7 @@ cdk-synth-stateless-resources-no-mock:
 	CLOUDFRONT_ORIGIN_CUSTOM_HEADER=foo \
 	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
+	FORWARD_CSOC_LOGS=true \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateless_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateless_app.config.json npx cdk synth \
 		--quiet \
@@ -313,6 +315,7 @@ cdk-synth-stateful-resources-mock:
 	DO_NOT_GET_AWS_EXPORT=true \
 	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
+	FORWARD_CSOC_LOGS=true \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateful_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateful_app.config.json npx cdk synth \
 		--quiet \
@@ -368,6 +371,7 @@ cdk-synth-stateless-resources-mock:
 	CLOUDFRONT_ORIGIN_CUSTOM_HEADER=foo \
 	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
+	FORWARD_CSOC_LOGS=true \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateless_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateless_app.config.json npx cdk synth \
 		--quiet \

packages/cdk/stacks/StatelessResourcesStack.ts

@@ -98,7 +98,6 @@ export class StatelessResourcesStack extends Stack {
     const githubAllowListIpv6 = this.node.tryGetContext("githubAllowListIpv6")
     const cloudfrontOriginCustomHeader = this.node.tryGetContext("cloudfrontOriginCustomHeader")
     const csocUKWafDestination: string = this.node.tryGetContext("csocUKWafDestination")
-    // const csocApiGatewayDestination: string = this.node.tryGetContext("csocApiGatewayDestination")
     const forwardCsocLogs: boolean = this.node.tryGetContext("forwardCsocLogs")
 
     // Imports

scripts/run_sync.sh

@@ -244,6 +244,7 @@ ROLE_ID=$(echo "$CF_LONDON_EXPORTS" | \
     --arg EXPORT_NAME "${SERVICE_NAME}-stateless-resources:local:roleId" \
     -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value')
 USE_ZONE_APEX=false
+FORWARD_CSOC_LOGS=false
 
 # export all the vars so they can be picked up by external programs
 export SERVICE_NAME
@@ -326,6 +327,7 @@ export JWT_KID
 export ROLE_ID
 export USE_ZONE_APEX
 export IS_PULL_REQUEST
+export FORWARD_CSOC_LOGS
 
 # variables needed for StatefulResourcesApp
 CDK_APP_NAME=StatefulResourcesApp