@servicevic-oss/cdk-cleanup-certificate-validation-records 0.0.4 → 0.0.6

package/.jsii

@@ -3512,7 +3512,7 @@
   },
   "name": "@servicevic-oss/cdk-cleanup-certificate-validation-records",
   "readme": {
-    "markdown": "# cdk-cleanup-certificate-validation-records\n\nThis CDK construct takes care of cleaning up the orphaned Route53 CNAME validation records\nleft behind when deleting a certificate that had DNS validation enabled.\n\nThe issue is better explained here: https://github.com/aws/aws-cdk/issues/11201\n\n## Usage\n\n### Explicit instantiation\n\nThe construct can be instantiated explicitely to cleanup after a specific certificate\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nexport class TestStack extends cdk.Stack {\n  constructor(scope: Construct, id: string, props: TestStackProps) {\n    super(scope, id, props);\n\n    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {\n      zoneName: 'my.zone.net',\n    });\n\n    const cert1 = new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `mydomain.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n      subjectAlternativeNames: [\n        `mydomain2.${zone.zoneName}`,\n        `mydomain3.${zone.zoneName}`,\n      ],\n    });\n    const cert2 = new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `another.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n    });\n\n    new CertificateValidationRecordCleanup(this, `cleanup-${cert1.node.id}`, {\n      certificate: cert1,\n      hostedZone: zone,\n    });\n\n    new CertificateValidationRecordCleanup(this, `cleanup-${cert2.node.id}`, {\n      certificate: cert2,\n      hostedZone: zone,\n    });\n  };\n}\n```\n\n### Implicit instantiation using Aspects with knowledge of the hosted zone\n\nThe construct can be instantiated automatically against any Certificate resource created within a stack\nthrough the use of Aspects\n\nIn this example, we have knowledge of the hosted zone\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nexport class TestStack extends cdk.Stack {\n  constructor(scope: Construct, id: string, props: TestStackProps) {\n    super(scope, id, props);\n\n    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {\n      zoneName: 'my.zone.net',\n    });\n\n    new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `mydomain.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n      subjectAlternativeNames: [\n        `mydomain2.${zone.zoneName}`,\n        `mydomain3.${zone.zoneName}`,\n      ],\n    });\n    new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `another.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n    });\n\n    cdk.Aspects.of(this).add({\n      visit: (c) => {\n        if (c instanceof cdk.aws_certificatemanager.Certificate) {\n          new CertificateValidationRecordCleanup(this, `cleanup-${c.node.id}`, {\n            certificate: c,\n            hostedZone: zone,\n          });\n        }\n      },\n    });\n  };\n}\n```\n\n### Implicit instantiation using Aspects without knowledge of the hosted zone\n\nThe construct can be instantiated automatically against any Certificate resource created within a stack\nthrough the use of Aspects\n\nIn this example, we have no knowledge of the hosted zone used to validate the certificate so we use a bit of brute force to derive it from the Certificate L1 resource\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nconst app = new cdk.App();\n\nconst blackBoxStack = new BlackBoxStack(app, 'my-blackbox-stack');\n\ncdk.Aspects.of(blackBoxStack).add({\n  visit: (c) => {\n    if (c instanceof cdk.aws_certificatemanager.Certificate) {\n      const cfnRes = c.node.defaultChild as cdk.aws_certificatemanager.CfnCertificate;\n      const valOpts = (cfnRes.domainValidationOptions as cdk.aws_certificatemanager.CfnCertificate.DomainValidationOptionProperty[])[0];\n\n      new CertificateValidationRecordCleanup(c, `cleanup-${c.node.id}`, {\n        certificate: c,\n        hostedZone: cdk.aws_route53.HostedZone.fromHostedZoneId(c, `lookup-${c.node.id}`, valOpts.hostedZoneId!),\n      });\n    }\n  },\n});\n```"
+    "markdown": "# cdk-cleanup-certificate-validation-records\n\nThis CDK construct takes care of cleaning up the orphaned Route53 CNAME validation records\nleft behind when deleting a certificate that had DNS validation enabled.\n\nThe issue is better explained here: https://github.com/aws/aws-cdk/issues/11201\n\n## Usage\n\n### With wrapper class\n\nThe simplest usage is via the wrapper class `CertificateWithCleanup`.\n\nThe class extends the standard `Certificate` construct and adds the cleanup automatically\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nexport class TestStack extends cdk.Stack {\n  constructor(scope: Construct, id: string, props: TestStackProps) {\n    super(scope, id, props);\n\n    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {\n      zoneName: 'my.zone.net',\n    });\n\n    const cert1 = new CertificateWithCleanup(this, 'Cert', {\n      domainName: `mydomain.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n      subjectAlternativeNames: [\n        `mydomain2.${zone.zoneName}`,\n        `mydomain3.${zone.zoneName}`,\n      ],\n    });\n  };\n}\n```\n\n### Explicit instantiation\n\nThe construct can be instantiated explicitely to cleanup after a specific certificate\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nexport class TestStack extends cdk.Stack {\n  constructor(scope: Construct, id: string, props: TestStackProps) {\n    super(scope, id, props);\n\n    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {\n      zoneName: 'my.zone.net',\n    });\n\n    const cert1 = new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `mydomain.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n      subjectAlternativeNames: [\n        `mydomain2.${zone.zoneName}`,\n        `mydomain3.${zone.zoneName}`,\n      ],\n    });\n    const cert2 = new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `another.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n    });\n\n    new CertificateValidationRecordCleanup(this, `cleanup-${cert1.node.id}`, {\n      certificate: cert1,\n      hostedZone: zone,\n    });\n\n    new CertificateValidationRecordCleanup(this, `cleanup-${cert2.node.id}`, {\n      certificate: cert2,\n      hostedZone: zone,\n    });\n  };\n}\n```\n\n### Implicit instantiation using Aspects with knowledge of the hosted zone\n\nThe construct can be instantiated automatically against any Certificate resource created within a stack\nthrough the use of Aspects\n\nIn this example, we have knowledge of the hosted zone\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nexport class TestStack extends cdk.Stack {\n  constructor(scope: Construct, id: string, props: TestStackProps) {\n    super(scope, id, props);\n\n    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {\n      zoneName: 'my.zone.net',\n    });\n\n    new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `mydomain.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n      subjectAlternativeNames: [\n        `mydomain2.${zone.zoneName}`,\n        `mydomain3.${zone.zoneName}`,\n      ],\n    });\n    new cdk.aws_certificatemanager.Certificate(this, 'Cert', {\n      domainName: `another.${zone.zoneName}`,\n      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),\n    });\n\n    cdk.Aspects.of(this).add({\n      visit: (c) => {\n        if (c instanceof cdk.aws_certificatemanager.Certificate) {\n          new CertificateValidationRecordCleanup(this, `cleanup-${c.node.id}`, {\n            certificate: c,\n            hostedZone: zone,\n          });\n        }\n      },\n    });\n  };\n}\n```\n\n### Implicit instantiation using Aspects without knowledge of the hosted zone\n\nThe construct can be instantiated automatically against any Certificate resource created within a stack\nthrough the use of Aspects\n\nIn this example, we have no knowledge of the hosted zone used to validate the certificate so we use a bit of brute force to derive it from the Certificate L1 resource\n\n```typescript\nimport * as cdk from 'aws-cdk-lib';\nimport { CertificateValidationRecordCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'\n\nconst app = new cdk.App();\n\nconst blackBoxStack = new BlackBoxStack(app, 'my-blackbox-stack');\n\ncdk.Aspects.of(blackBoxStack).add({\n  visit: (c) => {\n    if (c instanceof cdk.aws_certificatemanager.Certificate) {\n      const cfnRes = c.node.defaultChild as cdk.aws_certificatemanager.CfnCertificate;\n      const valOpts = (cfnRes.domainValidationOptions as cdk.aws_certificatemanager.CfnCertificate.DomainValidationOptionProperty[])[0];\n\n      new CertificateValidationRecordCleanup(c, `cleanup-${c.node.id}`, {\n        certificate: c,\n        hostedZone: cdk.aws_route53.HostedZone.fromHostedZoneId(c, `lookup-${c.node.id}`, valOpts.hostedZoneId!),\n      });\n    }\n  },\n});\n```"
   },
   "repository": {
     "type": "git",
@@ -3539,7 +3539,7 @@
         },
         "locationInModule": {
           "filename": "src/index.ts",
-          "line": 29
+          "line": 28
         },
         "parameters": [
           {
@@ -3565,7 +3565,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 22
+        "line": 21
       },
       "name": "CertificateValidationRecordCleanup",
       "properties": [
@@ -3577,7 +3577,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 23
+            "line": 22
           },
           "name": "HANDLER_UID",
           "static": true,
@@ -3593,7 +3593,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 24
+            "line": 23
           },
           "name": "PROVIDER_UID",
           "static": true,
@@ -3608,7 +3608,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 26
+            "line": 25
           },
           "name": "handlerFunction",
           "type": {
@@ -3622,7 +3622,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 27
+            "line": 26
           },
           "name": "provider",
           "type": {
@@ -3680,8 +3680,53 @@
         }
       ],
       "symbolId": "src/index:CertificateValidationRecordCleanupProps"
+    },
+    "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup": {
+      "assembly": "@servicevic-oss/cdk-cleanup-certificate-validation-records",
+      "base": "aws-cdk-lib.aws_certificatemanager.Certificate",
+      "docs": {
+        "stability": "stable",
+        "summary": "A wrapper class for a vanilla `Certificate` object with automatic cleanup attached."
+      },
+      "fqn": "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup",
+      "initializer": {
+        "docs": {
+          "stability": "stable"
+        },
+        "locationInModule": {
+          "filename": "src/index.ts",
+          "line": 83
+        },
+        "parameters": [
+          {
+            "name": "scope",
+            "type": {
+              "fqn": "constructs.Construct"
+            }
+          },
+          {
+            "name": "id",
+            "type": {
+              "primitive": "string"
+            }
+          },
+          {
+            "name": "props",
+            "type": {
+              "fqn": "aws-cdk-lib.aws_certificatemanager.CertificateProps"
+            }
+          }
+        ]
+      },
+      "kind": "class",
+      "locationInModule": {
+        "filename": "src/index.ts",
+        "line": 82
+      },
+      "name": "CertificateWithCleanup",
+      "symbolId": "src/index:CertificateWithCleanup"
     }
   },
-  "version": "0.0.4",
-  "fingerprint": "YiU9qXtaSKZs464RgPVo+XkFxh3vAKX3c6H0TxzbFtE="
+  "version": "0.0.6",
+  "fingerprint": "n6UiUq4qsb5AbW9nTFPQt0cENJ0NL6n0pMZGcoNroVE="
 }

package/API.md

@@ -153,6 +153,258 @@ public readonly PROVIDER_UID: string;
 
 ---
 
+### CertificateWithCleanup <a name="CertificateWithCleanup" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup"></a>
+
+A wrapper class for a vanilla `Certificate` object with automatic cleanup attached.
+
+#### Initializers <a name="Initializers" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer"></a>
+
+```typescript
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+new CertificateWithCleanup(scope: Construct, id: string, props: CertificateProps)
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.props">props</a></code> | <code>aws-cdk-lib.aws_certificatemanager.CertificateProps</code> | *No description.* |
+
+---
+
+##### `scope`<sup>Required</sup> <a name="scope" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.scope"></a>
+
+- *Type:* constructs.Construct
+
+---
+
+##### `id`<sup>Required</sup> <a name="id" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.id"></a>
+
+- *Type:* string
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.Initializer.parameter.props"></a>
+
+- *Type:* aws-cdk-lib.aws_certificatemanager.CertificateProps
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.toString">toString</a></code> | Returns a string representation of this construct. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.metricDaysToExpiry">metricDaysToExpiry</a></code> | Return the DaysToExpiry metric for this AWS Certificate Manager Certificate. By default, this is the minimum value over 1 day. |
+
+---
+
+##### `toString` <a name="toString" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.toString"></a>
+
+```typescript
+public toString(): string
+```
+
+Returns a string representation of this construct.
+
+##### `applyRemovalPolicy` <a name="applyRemovalPolicy" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.applyRemovalPolicy"></a>
+
+```typescript
+public applyRemovalPolicy(policy: RemovalPolicy): void
+```
+
+Apply the given removal policy to this resource.
+
+The Removal Policy controls what happens to this resource when it stops
+being managed by CloudFormation, either because you've removed it from the
+CDK application or because you've made a change that requires the resource
+to be replaced.
+
+The resource can be deleted (`RemovalPolicy.DESTROY`), or left in your AWS
+account for data recovery and cleanup later (`RemovalPolicy.RETAIN`).
+
+###### `policy`<sup>Required</sup> <a name="policy" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.applyRemovalPolicy.parameter.policy"></a>
+
+- *Type:* aws-cdk-lib.RemovalPolicy
+
+---
+
+##### `metricDaysToExpiry` <a name="metricDaysToExpiry" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.metricDaysToExpiry"></a>
+
+```typescript
+public metricDaysToExpiry(props?: MetricOptions): Metric
+```
+
+Return the DaysToExpiry metric for this AWS Certificate Manager Certificate. By default, this is the minimum value over 1 day.
+
+This metric is no longer emitted once the certificate has effectively
+expired, so alarms configured on this metric should probably treat missing
+data as "breaching".
+
+###### `props`<sup>Optional</sup> <a name="props" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.metricDaysToExpiry.parameter.props"></a>
+
+- *Type:* aws-cdk-lib.aws_cloudwatch.MetricOptions
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isConstruct">isConstruct</a></code> | Checks if `x` is a construct. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isOwnedResource">isOwnedResource</a></code> | Returns true if the construct was created by CDK, and false otherwise. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.fromCertificateArn">fromCertificateArn</a></code> | Import a certificate. |
+
+---
+
+##### ~~`isConstruct`~~ <a name="isConstruct" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isConstruct"></a>
+
+```typescript
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+CertificateWithCleanup.isConstruct(x: any)
+```
+
+Checks if `x` is a construct.
+
+###### `x`<sup>Required</sup> <a name="x" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isConstruct.parameter.x"></a>
+
+- *Type:* any
+
+Any object.
+
+---
+
+##### `isOwnedResource` <a name="isOwnedResource" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isOwnedResource"></a>
+
+```typescript
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+CertificateWithCleanup.isOwnedResource(construct: IConstruct)
+```
+
+Returns true if the construct was created by CDK, and false otherwise.
+
+###### `construct`<sup>Required</sup> <a name="construct" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isOwnedResource.parameter.construct"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
+##### `isResource` <a name="isResource" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isResource"></a>
+
+```typescript
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+CertificateWithCleanup.isResource(construct: IConstruct)
+```
+
+Check whether the given construct is a Resource.
+
+###### `construct`<sup>Required</sup> <a name="construct" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.isResource.parameter.construct"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
+##### `fromCertificateArn` <a name="fromCertificateArn" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.fromCertificateArn"></a>
+
+```typescript
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+CertificateWithCleanup.fromCertificateArn(scope: Construct, id: string, certificateArn: string)
+```
+
+Import a certificate.
+
+###### `scope`<sup>Required</sup> <a name="scope" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.fromCertificateArn.parameter.scope"></a>
+
+- *Type:* constructs.Construct
+
+---
+
+###### `id`<sup>Required</sup> <a name="id" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.fromCertificateArn.parameter.id"></a>
+
+- *Type:* string
+
+---
+
+###### `certificateArn`<sup>Required</sup> <a name="certificateArn" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.fromCertificateArn.parameter.certificateArn"></a>
+
+- *Type:* string
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.env">env</a></code> | <code>aws-cdk-lib.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.stack">stack</a></code> | <code>aws-cdk-lib.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.certificateArn">certificateArn</a></code> | <code>string</code> | The certificate's ARN. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.node"></a>
+
+```typescript
+public readonly node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `env`<sup>Required</sup> <a name="env" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.env"></a>
+
+```typescript
+public readonly env: ResourceEnvironment;
+```
+
+- *Type:* aws-cdk-lib.ResourceEnvironment
+
+The environment this resource belongs to.
+
+For resources that are created and managed by the CDK
+(generally, those created by creating new class instances like Role, Bucket, etc.),
+this is always the same as the environment of the stack they belong to;
+however, for imported resources
+(those obtained from static methods like fromRoleArn, fromBucketName, etc.),
+that might be different than the stack they were imported into.
+
+---
+
+##### `stack`<sup>Required</sup> <a name="stack" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.stack"></a>
+
+```typescript
+public readonly stack: Stack;
+```
+
+- *Type:* aws-cdk-lib.Stack
+
+The stack in which this resource is defined.
+
+---
+
+##### `certificateArn`<sup>Required</sup> <a name="certificateArn" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup.property.certificateArn"></a>
+
+```typescript
+public readonly certificateArn: string;
+```
+
+- *Type:* string
+
+The certificate's ARN.
+
+---
+
+
 ## Structs <a name="Structs" id="Structs"></a>
 
 ### CertificateValidationRecordCleanupProps <a name="CertificateValidationRecordCleanupProps" id="@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateValidationRecordCleanupProps"></a>

package/README.md

@@ -7,6 +7,37 @@ The issue is better explained here: https://github.com/aws/aws-cdk/issues/11201
 
 ## Usage
 
+### With wrapper class
+
+The simplest usage is via the wrapper class `CertificateWithCleanup`.
+
+The class extends the standard `Certificate` construct and adds the cleanup automatically
+
+```typescript
+import * as cdk from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { CertificateWithCleanup } from '@servicevic-oss/cdk-cleanup-certificate-validation-records'
+
+export class TestStack extends cdk.Stack {
+  constructor(scope: Construct, id: string, props: TestStackProps) {
+    super(scope, id, props);
+
+    zone = new cdk.aws_route53.PublicHostedZone(this, 'Zone', {
+      zoneName: 'my.zone.net',
+    });
+
+    const cert1 = new CertificateWithCleanup(this, 'Cert', {
+      domainName: `mydomain.${zone.zoneName}`,
+      validation: cdk.aws_certificatemanager.CertificateValidation.fromDns(zone),
+      subjectAlternativeNames: [
+        `mydomain2.${zone.zoneName}`,
+        `mydomain3.${zone.zoneName}`,
+      ],
+    });
+  };
+}
+```
+
 ### Explicit instantiation
 
 The construct can be instantiated explicitely to cleanup after a specific certificate

package/lib/index.d.ts

@@ -23,3 +23,9 @@ export declare class CertificateValidationRecordCleanup extends Construct {
     private getOrCreateFunction;
     private getOrCreateProvider;
 }
+/**
+ * A wrapper class for a vanilla `Certificate` object with automatic cleanup attached
+ */
+export declare class CertificateWithCleanup extends cdk.aws_certificatemanager.Certificate {
+    constructor(scope: Construct, id: string, props: cdk.aws_certificatemanager.CertificateProps);
+}

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CertificateValidationRecordCleanup = void 0;
+exports.CertificateWithCleanup = exports.CertificateValidationRecordCleanup = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const path_1 = require("path");
 const cdk = require("aws-cdk-lib");
@@ -57,7 +57,25 @@ class CertificateValidationRecordCleanup extends constructs_1.Construct {
 }
 exports.CertificateValidationRecordCleanup = CertificateValidationRecordCleanup;
 _a = JSII_RTTI_SYMBOL_1;
-CertificateValidationRecordCleanup[_a] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateValidationRecordCleanup", version: "0.0.4" };
+CertificateValidationRecordCleanup[_a] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateValidationRecordCleanup", version: "0.0.6" };
 CertificateValidationRecordCleanup.HANDLER_UID = 'CertRecordsCleanupHandler-2B663BAB-7981';
 CertificateValidationRecordCleanup.PROVIDER_UID = 'CertRecordsCleanupProvider-57EBF059-2E26';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwrQkFBNEI7QUFDNUIsbUNBQW1DO0FBQ25DLDJDQUF1QztBQWV2Qzs7O0dBR0c7QUFDSCxNQUFhLGtDQUFtQyxTQUFRLHNCQUFTO0lBTy9ELFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBOEM7UUFDdEYsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBQ2xELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFFM0MsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsb0JBQW9CLENBQUMsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQztZQUM5RSxPQUFPLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQztZQUNwQyxTQUFTLEVBQUUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQztTQUM5QyxDQUFDLENBQUMsQ0FBQztRQUNKLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxFQUFFLG9CQUFvQixDQUFDLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUM7WUFDOUUsT0FBTyxFQUFFO2dCQUNQLGtDQUFrQztnQkFDbEMsZ0NBQWdDO2FBQ2pDO1lBQ0QsU0FBUyxFQUFFLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUM7U0FDNUMsQ0FBQyxDQUFDLENBQUM7UUFFSixJQUFJLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRTtZQUN2QyxZQUFZLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3hDLFlBQVksRUFBRSw0Q0FBNEM7WUFDMUQsVUFBVSxFQUFFO2dCQUNWLFlBQVksRUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFlBQVk7Z0JBQzNDLGNBQWMsRUFBRSxLQUFLLENBQUMsV0FBVyxDQUFDLGNBQWM7YUFDakQ7U0FDRixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRU8sbUJBQW1CO1FBQ3pCLE1BQU0sRUFBRSxHQUFHLGtDQUFrQyxDQUFDLFdBQVcsQ0FBQztRQUMxRCxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQyxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBeUMsSUFBSSxJQUFJLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNoSSxXQUFXLEVBQUUsdUVBQXVFO1lBQ3BGLEtBQUssRUFBRSxJQUFBLFdBQUksRUFBQyxTQUFTLEVBQUUsbURBQW1ELENBQUM7WUFDM0UsWUFBWSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLFFBQVE7WUFDakQsT0FBTyxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUNqQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sbUJBQW1CO1FBQ3pCLE1BQU0sRUFBRSxHQUFHLGtDQUFrQyxDQUFDLFlBQVksQ0FBQztRQUMzRCxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQyxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBa0MsSUFBSSxJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNsSCxjQUFjLEVBQUUsSUFBSSxDQUFDLGVBQWU7WUFDcEMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLFFBQVE7U0FDbEQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7QUF2REgsZ0ZBd0RDOzs7QUF2RGlCLDhDQUFXLEdBQUcseUNBQXlDLENBQUM7QUFDeEQsK0NBQVksR0FBRywwQ0FBMEMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGpvaW4gfSBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIGNkayBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcblxuZXhwb3J0IGludGVyZmFjZSBDZXJ0aWZpY2F0ZVZhbGlkYXRpb25SZWNvcmRDbGVhbnVwUHJvcHMge1xuICAvKipcbiAgICogVGhlIFJvdXRlNTMgaG9zdGVkIHpvbmUgd2hlcmUgdGhlIGNlcnRpZmljYXRlIHZhbGlkYXRpb24gcmVjb3JkcyBoYXZlIGJlZW4gY3JlYXRlZCBmb3IgYSBjZXJ0aWZpY2F0ZVxuICAgKi9cbiAgcmVhZG9ubHkgaG9zdGVkWm9uZTogY2RrLmF3c19yb3V0ZTUzLklIb3N0ZWRab25lO1xuXG4gIC8qKlxuICAgKiBUaGUgQUNNIGNlcnRpZmljYXRlIHRoYXQgY3JlYXRlZCB0aGUgdmFsaWRhdGlvbiByZWNvcmRzXG4gICAqL1xuICByZWFkb25seSBjZXJ0aWZpY2F0ZTogY2RrLmF3c19jZXJ0aWZpY2F0ZW1hbmFnZXIuSUNlcnRpZmljYXRlO1xufVxuXG5cbi8qKlxuICogVGhpcyBjb25zdHJ1Y3RzIHdpbGwgdGFrZSBjYXJlIG9mIGRlbGV0aW5nIHRoZSBvcnBoYW5lZCByb3V0ZTUzIHJlY29yZHMgdGhhdCBBQ00gd2lsbFxuICogbGVhdmUgYmVoaW5kIHdoZW4gZGVsZXRpbmcgYSBETlMgdmFsaWRhdGVkIGNlcnRpZmljYXRlXG4gKi9cbmV4cG9ydCBjbGFzcyBDZXJ0aWZpY2F0ZVZhbGlkYXRpb25SZWNvcmRDbGVhbnVwIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgc3RhdGljIHJlYWRvbmx5IEhBTkRMRVJfVUlEID0gJ0NlcnRSZWNvcmRzQ2xlYW51cEhhbmRsZXItMkI2NjNCQUItNzk4MSc7XG4gIHN0YXRpYyByZWFkb25seSBQUk9WSURFUl9VSUQgPSAnQ2VydFJlY29yZHNDbGVhbnVwUHJvdmlkZXItNTdFQkYwNTktMkUyNic7XG5cbiAgcHVibGljIHJlYWRvbmx5IGhhbmRsZXJGdW5jdGlvbjogY2RrLmF3c19sYW1iZGFfbm9kZWpzLk5vZGVqc0Z1bmN0aW9uO1xuICBwdWJsaWMgcmVhZG9ubHkgcHJvdmlkZXI6IGNkay5jdXN0b21fcmVzb3VyY2VzLlByb3ZpZGVyO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb25SZWNvcmRDbGVhbnVwUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgdGhpcy5oYW5kbGVyRnVuY3Rpb24gPSB0aGlzLmdldE9yQ3JlYXRlRnVuY3Rpb24oKTtcbiAgICB0aGlzLnByb3ZpZGVyID0gdGhpcy5nZXRPckNyZWF0ZVByb3ZpZGVyKCk7XG5cbiAgICB0aGlzLmhhbmRsZXJGdW5jdGlvbi5yb2xlPy5hZGRUb1ByaW5jaXBhbFBvbGljeShuZXcgY2RrLmF3c19pYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICAgIGFjdGlvbnM6IFsnYWNtOkRlc2NyaWJlQ2VydGlmaWNhdGUnXSxcbiAgICAgIHJlc291cmNlczogW3Byb3BzLmNlcnRpZmljYXRlLmNlcnRpZmljYXRlQXJuXSxcbiAgICB9KSk7XG4gICAgdGhpcy5oYW5kbGVyRnVuY3Rpb24ucm9sZT8uYWRkVG9QcmluY2lwYWxQb2xpY3kobmV3IGNkay5hd3NfaWFtLlBvbGljeVN0YXRlbWVudCh7XG4gICAgICBhY3Rpb25zOiBbXG4gICAgICAgICdyb3V0ZTUzOkNoYW5nZVJlc291cmNlUmVjb3JkU2V0cycsXG4gICAgICAgICdyb3V0ZTUzOkxpc3RSZXNvdXJjZVJlY29yZFNldHMnLFxuICAgICAgXSxcbiAgICAgIHJlc291cmNlczogW3Byb3BzLmhvc3RlZFpvbmUuaG9zdGVkWm9uZUFybl0sXG4gICAgfSkpO1xuXG4gICAgbmV3IGNkay5DdXN0b21SZXNvdXJjZSh0aGlzLCAnUmVzb3VyY2UnLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHRoaXMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcmVzb3VyY2VUeXBlOiAnQ3VzdG9tOjpDZXJ0aWZpY2F0ZVZhbGlkYXRpb25SZWNvcmRDbGVhbnVwJyxcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgSG9zdGVkWm9uZUlkOiBwcm9wcy5ob3N0ZWRab25lLmhvc3RlZFpvbmVJZCxcbiAgICAgICAgQ2VydGlmaWNhdGVBcm46IHByb3BzLmNlcnRpZmljYXRlLmNlcnRpZmljYXRlQXJuLFxuICAgICAgfSxcbiAgICB9KTtcblxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLmNlcnRpZmljYXRlLCBwcm9wcy5ob3N0ZWRab25lKTtcbiAgfVxuXG4gIHByaXZhdGUgZ2V0T3JDcmVhdGVGdW5jdGlvbigpOiBjZGsuYXdzX2xhbWJkYV9ub2RlanMuTm9kZWpzRnVuY3Rpb24ge1xuICAgIGNvbnN0IGlkID0gQ2VydGlmaWNhdGVWYWxpZGF0aW9uUmVjb3JkQ2xlYW51cC5IQU5ETEVSX1VJRDtcbiAgICBjb25zdCBzdGFjayA9IGNkay5TdGFjay5vZih0aGlzKTtcbiAgICByZXR1cm4gc3RhY2subm9kZS50cnlGaW5kQ2hpbGQoaWQpIGFzIGNkay5hd3NfbGFtYmRhX25vZGVqcy5Ob2RlanNGdW5jdGlvbiA/PyBuZXcgY2RrLmF3c19sYW1iZGFfbm9kZWpzLk5vZGVqc0Z1bmN0aW9uKHN0YWNrLCBpZCwge1xuICAgICAgZGVzY3JpcHRpb246ICdIYW5kbGVyIGZ1bmN0aW9uIGZvciB0aGUgQ2VydGlmaWNhdGVWYWxpZGF0aW9uUmVjb3JkQ2xlYW51cCBjb25zdHJ1Y3QnLFxuICAgICAgZW50cnk6IGpvaW4oX19kaXJuYW1lLCAnY2xlYW51cC1jZXJ0aWZpY2F0ZS12YWxpZGF0aW9uLXJlY29yZHMuaGFuZGxlci5qcycpLFxuICAgICAgbG9nUmV0ZW50aW9uOiBjZGsuYXdzX2xvZ3MuUmV0ZW50aW9uRGF5cy5PTkVfV0VFSyxcbiAgICAgIHRpbWVvdXQ6IGNkay5EdXJhdGlvbi5taW51dGVzKDIpLFxuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBnZXRPckNyZWF0ZVByb3ZpZGVyKCk6IGNkay5jdXN0b21fcmVzb3VyY2VzLlByb3ZpZGVyIHtcbiAgICBjb25zdCBpZCA9IENlcnRpZmljYXRlVmFsaWRhdGlvblJlY29yZENsZWFudXAuUFJPVklERVJfVUlEO1xuICAgIGNvbnN0IHN0YWNrID0gY2RrLlN0YWNrLm9mKHRoaXMpO1xuICAgIHJldHVybiBzdGFjay5ub2RlLnRyeUZpbmRDaGlsZChpZCkgYXMgY2RrLmN1c3RvbV9yZXNvdXJjZXMuUHJvdmlkZXIgPz8gbmV3IGNkay5jdXN0b21fcmVzb3VyY2VzLlByb3ZpZGVyKHN0YWNrLCBpZCwge1xuICAgICAgb25FdmVudEhhbmRsZXI6IHRoaXMuaGFuZGxlckZ1bmN0aW9uLFxuICAgICAgbG9nUmV0ZW50aW9uOiBjZGsuYXdzX2xvZ3MuUmV0ZW50aW9uRGF5cy5PTkVfV0VFSyxcbiAgICB9KTtcbiAgfVxufVxuIl19
+/**
+ * A wrapper class for a vanilla `Certificate` object with automatic cleanup attached
+ */
+class CertificateWithCleanup extends cdk.aws_certificatemanager.Certificate {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+        if (props.validation && props.validation.props.hostedZone && props.validation?.method == cdk.aws_certificatemanager.ValidationMethod.DNS) {
+            // Attach a cleanup construct
+            new CertificateValidationRecordCleanup(this, `cleanup-${id}`, {
+                certificate: this,
+                hostedZone: props.validation.props.hostedZone,
+            });
+        }
+    }
+}
+exports.CertificateWithCleanup = CertificateWithCleanup;
+_b = JSII_RTTI_SYMBOL_1;
+CertificateWithCleanup[_b] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup", version: "0.0.6" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'path';\nimport * as cdk from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\n\nexport interface CertificateValidationRecordCleanupProps {\n  /**\n   * The Route53 hosted zone where the certificate validation records have been created for a certificate\n   */\n  readonly hostedZone: cdk.aws_route53.IHostedZone;\n\n  /**\n   * The ACM certificate that created the validation records\n   */\n  readonly certificate: cdk.aws_certificatemanager.ICertificate;\n}\n\n/**\n * This constructs will take care of deleting the orphaned route53 records that ACM will\n * leave behind when deleting a DNS validated certificate\n */\nexport class CertificateValidationRecordCleanup extends Construct {\n  static readonly HANDLER_UID = 'CertRecordsCleanupHandler-2B663BAB-7981';\n  static readonly PROVIDER_UID = 'CertRecordsCleanupProvider-57EBF059-2E26';\n\n  public readonly handlerFunction: cdk.aws_lambda_nodejs.NodejsFunction;\n  public readonly provider: cdk.custom_resources.Provider;\n\n  constructor(scope: Construct, id: string, props: CertificateValidationRecordCleanupProps) {\n    super(scope, id);\n\n    this.handlerFunction = this.getOrCreateFunction();\n    this.provider = this.getOrCreateProvider();\n\n    this.handlerFunction.role?.addToPrincipalPolicy(new cdk.aws_iam.PolicyStatement({\n      actions: ['acm:DescribeCertificate'],\n      resources: [props.certificate.certificateArn],\n    }));\n    this.handlerFunction.role?.addToPrincipalPolicy(new cdk.aws_iam.PolicyStatement({\n      actions: [\n        'route53:ChangeResourceRecordSets',\n        'route53:ListResourceRecordSets',\n      ],\n      resources: [props.hostedZone.hostedZoneArn],\n    }));\n\n    new cdk.CustomResource(this, 'Resource', {\n      serviceToken: this.provider.serviceToken,\n      resourceType: 'Custom::CertificateValidationRecordCleanup',\n      properties: {\n        HostedZoneId: props.hostedZone.hostedZoneId,\n        CertificateArn: props.certificate.certificateArn,\n      },\n    });\n\n    this.node.addDependency(props.certificate, props.hostedZone);\n  }\n\n  private getOrCreateFunction(): cdk.aws_lambda_nodejs.NodejsFunction {\n    const id = CertificateValidationRecordCleanup.HANDLER_UID;\n    const stack = cdk.Stack.of(this);\n    return stack.node.tryFindChild(id) as cdk.aws_lambda_nodejs.NodejsFunction ?? new cdk.aws_lambda_nodejs.NodejsFunction(stack, id, {\n      description: 'Handler function for the CertificateValidationRecordCleanup construct',\n      entry: join(__dirname, 'cleanup-certificate-validation-records.handler.js'),\n      logRetention: cdk.aws_logs.RetentionDays.ONE_WEEK,\n      timeout: cdk.Duration.minutes(2),\n    });\n  }\n\n  private getOrCreateProvider(): cdk.custom_resources.Provider {\n    const id = CertificateValidationRecordCleanup.PROVIDER_UID;\n    const stack = cdk.Stack.of(this);\n    return stack.node.tryFindChild(id) as cdk.custom_resources.Provider ?? new cdk.custom_resources.Provider(stack, id, {\n      onEventHandler: this.handlerFunction,\n      logRetention: cdk.aws_logs.RetentionDays.ONE_WEEK,\n    });\n  }\n}\n\n/**\n * A wrapper class for a vanilla `Certificate` object with automatic cleanup attached\n */\nexport class CertificateWithCleanup extends cdk.aws_certificatemanager.Certificate {\n  constructor(scope: Construct, id: string, props: cdk.aws_certificatemanager.CertificateProps) {\n    super(scope, id, props);\n\n    if (props.validation && props.validation.props.hostedZone && props.validation?.method == cdk.aws_certificatemanager.ValidationMethod.DNS) {\n      // Attach a cleanup construct\n      new CertificateValidationRecordCleanup(this, `cleanup-${id}`, {\n        certificate: this,\n        hostedZone: props.validation.props.hostedZone,\n      });\n    }\n  }\n}"]}

package/package.json

@@ -81,7 +81,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.4",
+  "version": "0.0.6",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",