chore: refactor error handling

aws · May 6, 2024 · f027aeb · f027aeb
1 parent 30f05bd
commit f027aeb
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts
@@ -1166,17 +1166,6 @@ export class Function extends FunctionBase {
    * function and undefined if not.
    */
   private getLoggingConfig(props: FunctionProps): CfnFunction.LoggingConfigProperty | undefined {
-    if ((props.applicationLogLevel || props.applicationLogLevelV2 || props.systemLogLevel || props.systemLogLevelV2)
-      && props.logFormat !== LogFormat.JSON
-      && props.loggingFormat === undefined) {
-      throw new Error(`To use ApplicationLogLevel and/or SystemLogLevel you must set LogFormat to '${LogFormat.JSON}', got '${props.logFormat}'.`);
-    }
-
-    if ((props.applicationLogLevel || props.applicationLogLevelV2 || props.systemLogLevel || props.systemLogLevelV2)
-      && props.loggingFormat !== LoggingFormat.JSON && props.logFormat === undefined) {
-      throw new Error(`To use ApplicationLogLevel and/or SystemLogLevel you must set LoggingFormat to '${LoggingFormat.JSON}', got '${props.loggingFormat}'.`);
-    }
-
     if (props.logFormat && props.loggingFormat) {
       throw new Error('Only define LogFormat or LoggingFormat, not both.');
     }
@@ -1189,6 +1178,16 @@ export class Function extends FunctionBase {
       throw new Error('Only define systemLogLevel or systemLogLevelV2, not both.');
     }
 
+    if (props.applicationLogLevel || props.applicationLogLevelV2 || props.systemLogLevel || props.systemLogLevelV2) {
+      if (props.logFormat !== LoggingFormat.JSON && !props.loggingFormat) {
+        throw new Error(`To use ApplicationLogLevel and/or SystemLogLevel you must set LogFormat to '${LogFormat.JSON}', got '${props.logFormat}'.`);
+      }
+
+      if (props.loggingFormat !== LoggingFormat.JSON && !props.logFormat) {
+        throw new Error(`To use ApplicationLogLevel and/or SystemLogLevel you must set LoggingFormat to '${LoggingFormat.JSON}', got '${props.loggingFormat}'.`);
+      }
+    }
+
     let loggingConfig: CfnFunction.LoggingConfigProperty;
     if (props.logFormat || props.logGroup || props.loggingFormat) {
       loggingConfig = {