fix(core): serviceTimeout for CustomResource does not work with token

packages/aws-cdk-lib/core/lib/custom-resource.ts

@@ -67,6 +67,19 @@ export interface CustomResourceProps {
    *
    * Maps to [ServiceTimeout](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-customresource.html#cfn-cloudformation-customresource-servicetimeout) property for the `AWS::CloudFormation::CustomResource` resource
    *
+   * A token can be specified for this property, but it must be specified with `Duration.seconds()`.
+   *
+   * @example
+   * const stack = new Stack();
+   * const durToken = new CfnParameter(stack, 'MyParameter', {
+   *   type: 'Number',
+   *   default: 60,
+   * });
+   * new CustomResource(stack, 'MyCustomResource', {
+   *   serviceToken: 'MyServiceToken',
+   *   serviceTimeout: Duration.seconds(durToken.valueAsNumber),
+   * });
+   *
    * @default Duration.seconds(3600)
    */
   readonly serviceTimeout?: Duration;
@@ -154,8 +167,7 @@ export class CustomResource extends Resource {
     const pascalCaseProperties = props.pascalCaseProperties ?? false;
     const properties = pascalCaseProperties ? uppercaseProperties(props.properties || {}) : (props.properties || {});
 
-    if (props.serviceTimeout !== undefined && !Token.isUnresolved(props.serviceTimeout)
-    ) {
+    if (props.serviceTimeout !== undefined && !props.serviceTimeout.isUnresolved()) {
       const serviceTimeoutSeconds = props.serviceTimeout.toSeconds();
 
       if (serviceTimeoutSeconds < 1 || serviceTimeoutSeconds > 3600) {

packages/aws-cdk-lib/core/test/custom-resource.test.ts

@@ -1,6 +1,6 @@
 import { toCloudFormation } from './util';
 import { Annotations } from '../../assertions';
-import { CustomResource, Duration, RemovalPolicy, Stack } from '../lib';
+import { CfnParameter, CustomResource, Duration, RemovalPolicy, Stack } from '../lib';
 
 describe('custom resource', () => {
   test('simple case provider identified by service token', () => {
@@ -201,6 +201,61 @@ describe('custom resource', () => {
     });
   });
 
+  test('set serviceTimeout with token as seconds', () => {
+    // GIVEN
+    const stack = new Stack();
+    const durToken = new CfnParameter(stack, 'MyParameter', {
+      type: 'Number',
+      default: 60,
+    });
+
+    // WHEN
+    new CustomResource(stack, 'MyCustomResource', {
+      serviceToken: 'MyServiceToken',
+      serviceTimeout: Duration.seconds(durToken.valueAsNumber),
+    });
+
+    // THEN
+    expect(toCloudFormation(stack)).toEqual({
+      Parameters: {
+        MyParameter: {
+          Default: 60,
+          Type: 'Number',
+        },
+      },
+      Resources: {
+        MyCustomResource: {
+          Type: 'AWS::CloudFormation::CustomResource',
+          Properties: {
+            ServiceToken: 'MyServiceToken',
+            ServiceTimeout: {
+              Ref: 'MyParameter',
+            },
+          },
+          UpdateReplacePolicy: 'Delete',
+          DeletionPolicy: 'Delete',
+        },
+      },
+    });
+  });
+
+  test('throws error when serviceTimeout is set with token as units other than seconds', () => {
+    // GIVEN
+    const stack = new Stack();
+    const durToken = new CfnParameter(stack, 'MyParameter', {
+      type: 'Number',
+      default: 60,
+    });
+
+    // WHEN
+    expect(() => {
+      new CustomResource(stack, 'MyCustomResource', {
+        serviceToken: 'MyServiceToken',
+        serviceTimeout: Duration.minutes(durToken.valueAsNumber),
+      });
+    }).toThrow('Duration must be specified as \'Duration.seconds()\' here since its value comes from a token and cannot be converted (got Duration.minutes)');
+  });
+
   test.each([0, 4000])('throw an error when serviceTimeout is set to %d seconds.', (invalidSeconds: number) => {
     // GIVEN
     const stack = new Stack();