fix: update onlyOn handling (it didn't exist before)

Author: sorccu

packages/cli/src/constructs/check.ts

@@ -14,6 +14,7 @@ import {
   FixedRetryStrategy,
   LinearRetryStrategy,
   NoRetriesRetryStrategy,
+  RetryStrategy,
   SingleRetryRetryStrategy,
 } from './retry-strategy'
 import { AlertEscalation } from './alert-escalation-policy'
@@ -293,8 +294,9 @@ export abstract class Check extends Construct {
 
   // eslint-disable-next-line require-await
   protected async validateRetryStrategyOnlyOn (diagnostics: Diagnostics): Promise<void> {
-    if (this.retryStrategy?.onlyOn) {
-      if (this.retryStrategy.onlyOn === 'NETWORK_ERROR') {
+    if (this.retryStrategy) {
+      const retryStrategy = this.retryStrategy as RetryStrategy
+      if (retryStrategy.onlyOn === 'NETWORK_ERROR') {
         if (!this.supportsOnlyOnNetworkErrorRetryStrategy()) {
           diagnostics.add(new InvalidPropertyValueDiagnostic(
             'retryStrategy',
@@ -308,7 +310,7 @@ export abstract class Check extends Construct {
         diagnostics.add(new InvalidPropertyValueDiagnostic(
           'retryStrategy',
           new Error(
-            `Unsupported value "${this.retryStrategy.onlyOn}" for "onlyOn".`,
+            `Unsupported value "${retryStrategy.onlyOn}" for "onlyOn".`,
           ),
         ))
       }

packages/cli/src/constructs/retry-strategy-codegen.ts

@@ -40,7 +40,12 @@ export function valueForRetryStrategy (genfile: GeneratedFile, strategy?: RetryS
     if (options.sameRegion !== undefined) {
       builder.boolean('sameRegion', options.sameRegion)
     }
+  }
 
+  function buildOnlyOnOption (
+    options: RetryStrategyOptions,
+    builder: ObjectValueBuilder,
+  ): void {
     if (options.onlyOn !== undefined) {
       const onlyOn = Array.isArray(options.onlyOn) ? options.onlyOn : [options.onlyOn]
       if (onlyOn.length === 1) {
@@ -63,6 +68,7 @@ export function valueForRetryStrategy (genfile: GeneratedFile, strategy?: RetryS
     buildMaxRetriesOption(options, builder)
     buildMaxDurationSecondsOption(options, builder)
     buildSameRegionOption(options, builder)
+    buildOnlyOnOption(options, builder)
   }
 
   if (strategy === null || strategy === undefined) {
@@ -109,6 +115,7 @@ export function valueForRetryStrategy (genfile: GeneratedFile, strategy?: RetryS
           builder.object(builder => {
             buildBaseBackoffSecondsOption(strategy, builder)
             buildSameRegionOption(strategy, builder)
+            buildOnlyOnOption(strategy, builder)
           })
         })
       })

packages/cli/src/constructs/retry-strategy.ts

@@ -127,14 +127,14 @@ export type FixedRetryStrategyOptions = RetryStrategyOptions
 /**
  * Configuration for single retry retry strategies.
  */
-export interface SingleRetryRetryStrategy extends Pick<RetryStrategy, 'type' | 'baseBackoffSeconds' | 'sameRegion'> {
+export interface SingleRetryRetryStrategy extends Pick<RetryStrategy, 'type' | 'baseBackoffSeconds' | 'sameRegion' | 'onlyOn'> {
   type: 'SINGLE_RETRY'
 }
 
 /**
  * Options for configuring single retry retry strategy behavior.
  */
-export type SingleRetryRetryStrategyOptions = Pick<RetryStrategyOptions, 'baseBackoffSeconds' | 'sameRegion'>
+export type SingleRetryRetryStrategyOptions = Pick<RetryStrategyOptions, 'baseBackoffSeconds' | 'sameRegion' | 'onlyOn'>
 
 /**
  * Configuration for no retry retry strategies.
@@ -230,11 +230,12 @@ export class RetryStrategyBuilder {
    * A single retry will be performed.
    */
   static singleRetry (options?: SingleRetryRetryStrategyOptions): SingleRetryRetryStrategy {
-    const { baseBackoffSeconds, sameRegion } = RetryStrategyBuilder.defaults(options)
+    const { baseBackoffSeconds, sameRegion, onlyOn } = RetryStrategyBuilder.defaults(options)
     return {
       type: 'SINGLE_RETRY',
       baseBackoffSeconds,
       sameRegion,
+      onlyOn,
     }
   }