Minor fixed to adapt to the latest CDK versions.

Esen Sagynov · Esen Sagynov · commit 454f313b0dd4 · 2024-03-22T15:21:28.000+06:00
- Fix dependency versionsing. Must use the carrot `^` to ensure users can use any CDK version higher than then over tested here.
- Some constant enum names have changed in the newer versions.
- Granting permissions now require an IAM role instead of the handler.
- CloudFront distribution interface have changed.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "eslint.alwaysShowStatus": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "explorer.autoReveal": false
 }
diff --git a/examples/blue-green-container-deployment-example/package.json b/examples/blue-green-container-deployment-example/package.json
@@ -11,12 +11,12 @@
   "dependencies": {
     "@cloudcomponents/cdk-blue-green-container-deployment": "^2.1.0",
     "@cloudcomponents/cdk-container-registry": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/cloudfront-authorization-example/package.json b/examples/cloudfront-authorization-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/codecommit-backup-example/package.json b/examples/codecommit-backup-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/codepipeline-check-parameter-action-example/package.json b/examples/codepipeline-check-parameter-action-example/package.json
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-codepipeline-check-parameter-action": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/codepipeline-merge-action-example/package.json b/examples/codepipeline-merge-action-example/package.json
@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-codepipeline-merge-action": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/codepipeline-slack-approval-example/package.json b/examples/codepipeline-slack-approval-example/package.json
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-codepipeline-slack": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/container-audit-example/package.json b/examples/container-audit-example/package.json
@@ -11,12 +11,12 @@
   "dependencies": {
     "@cloudcomponents/cdk-codepipeline-anchore-inline-scan-action": "^2.1.0",
     "@cloudcomponents/cdk-codepipeline-dockerfile-linter-action": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/contentful-webhook-example/package.json b/examples/contentful-webhook-example/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/dependency-check-example/package.json b/examples/dependency-check-example/package.json
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-dependency-check": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/dynamodb-seeder-example/package.json b/examples/dynamodb-seeder-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/github-webhook-example/package.json b/examples/github-webhook-example/package.json
@@ -11,12 +11,12 @@
   "dependencies": {
     "@cloudcomponents/cdk-github-webhook": "^2.1.0",
     "@cloudcomponents/cdk-secret-key": "^2.0.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/notifications-example/package.json b/examples/notifications-example/package.json
@@ -11,12 +11,12 @@
   "dependencies": {
     "@cloudcomponents/cdk-chatops": "^2.1.0",
     "@cloudcomponents/cdk-developer-tools-notifications": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/pull-request-example/package.json b/examples/pull-request-example/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/responsive-email-template-example/package.json b/examples/responsive-email-template-example/package.json
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-responsive-email-template": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/s3-antivurs-example/package.json b/examples/s3-antivurs-example/package.json
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@cloudcomponents/cdk-s3-antivirus": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/static-website-example/package.json b/examples/static-website-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/stripe-webhook-example/package.json b/examples/stripe-webhook-example/package.json
@@ -11,12 +11,12 @@
   "dependencies": {
     "@cloudcomponents/cdk-secret-key": "^2.0.0",
     "@cloudcomponents/cdk-stripe-webhook": "^2.1.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/temp-stack-example/package.json b/examples/temp-stack-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/examples/wordpress-example/package.json b/examples/wordpress-example/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
-    "aws-cdk": "2.8.0"
+    "aws-cdk": "^2.28.0"
   }
 }
diff --git a/packages/cdk-blue-green-container-deployment/package.json b/packages/cdk-blue-green-container-deployment/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "custom-resource-helper": "^1.0.15",
diff --git a/packages/cdk-chatops/package.json b/packages/cdk-chatops/package.json
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "axios": "^0.25.0",
     "constructs": "10.0.41",
diff --git a/packages/cdk-cloudfront-authorization/package.json b/packages/cdk-cloudfront-authorization/package.json
@@ -67,7 +67,7 @@
     "@aws-cdk/assert": "2.28.0",
     "@types/cookie": "^0.4.1",
     "@types/jsonwebtoken": "^8.5.8",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-local-testing-library": "^0.0.7",
     "aws-sdk": "^2.1096.0",
     "axios": "^0.21.4",
diff --git a/packages/cdk-cloudfront-authorization/src/distributions.ts b/packages/cdk-cloudfront-authorization/src/distributions.ts
@@ -9,6 +9,7 @@ import {
   aws_cloudfront_origins,
   aws_s3,
 } from 'aws-cdk-lib';
+import { IGrantable, Grant } from 'aws-cdk-lib/aws-iam';
 import { Construct, IConstruct } from 'constructs';
 
 import { IAuthorization, IStaticSiteAuthorization, ISpaAuthorization } from './authorizations';
@@ -165,13 +166,15 @@ export class BaseDistribution extends Construct implements aws_cloudfront.IDistr
   public readonly stack: Stack;
   public readonly env: ResourceEnvironment;
 
+  private readonly distribution: aws_cloudfront.Distribution;
+
   constructor(scope: Construct, id: string, props: BaseDistributionProps) {
     super(scope, id);
 
     const removalPolicy = props.removalPolicy ?? RemovalPolicy.DESTROY;
     const origin = props.origin ?? this.defaultOrigin(removalPolicy);
 
-    const distribution = new aws_cloudfront.Distribution(this, 'Distribution', {
+    const distribution = this.distribution = new aws_cloudfront.Distribution(this, 'Distribution', {
       enabled: props.enabled ?? true,
       enableIpv6: props.enableIpv6 ?? true,
       comment: props.comment,
@@ -211,6 +214,14 @@ export class BaseDistribution extends Construct implements aws_cloudfront.IDistr
     };
   }
 
+  public grant(identity: IGrantable, ...actions: string[]): Grant {
+    return this.distribution.grant(identity, ...actions);
+  }
+
+  public grantCreateInvalidation(identity: IGrantable): Grant {
+    return this.distribution.grantCreateInvalidation(identity);
+  }
+
   public applyRemovalPolicy(policy: RemovalPolicy) {
     const child = this.node.defaultChild as IConstruct;
     if (!child || !CfnResource.isCfnResource(child)) {
diff --git a/packages/cdk-codecommit-backup/package.json b/packages/cdk-codecommit-backup/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
   },
diff --git a/packages/cdk-codepipeline-anchore-inline-scan-action/package.json b/packages/cdk-codepipeline-anchore-inline-scan-action/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
   },
diff --git a/packages/cdk-codepipeline-check-parameter-action/package.json b/packages/cdk-codepipeline-check-parameter-action/package.json
@@ -72,7 +72,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
diff --git a/packages/cdk-codepipeline-dockerfile-linter-action/package.json b/packages/cdk-codepipeline-dockerfile-linter-action/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
   },
diff --git a/packages/cdk-codepipeline-merge-action/package.json b/packages/cdk-codepipeline-merge-action/package.json
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "get-env-or-die": "^1.0.11",
diff --git a/packages/cdk-codepipeline-slack/package.json b/packages/cdk-codepipeline-slack/package.json
@@ -75,7 +75,7 @@
     "@slack/web-api": "^5.15.0",
     "@types/aws-serverless-express": "^3.3.3",
     "@types/express": "4.17.13",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "aws-serverless-express": "^3.4.0",
     "constructs": "10.0.41",
diff --git a/packages/cdk-container-registry/package.json b/packages/cdk-container-registry/package.json
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
diff --git a/packages/cdk-contentful-webhook/package.json b/packages/cdk-contentful-webhook/package.json
@@ -67,7 +67,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
     "@cloudcomponents/lambda-utils": "^0.2.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "contentful-management": "^6.1.1",
diff --git a/packages/cdk-contentful-webhook/src/contentful-webhook.ts b/packages/cdk-contentful-webhook/src/contentful-webhook.ts
@@ -28,7 +28,7 @@ export class ContentfulWebhook extends Construct {
     });
 
     if (accessToken.grantRead) {
-      accessToken.grantRead(handler);
+      accessToken.grantRead(handler.role!);
     }
 
     new CustomResource(this, 'CustomResource', {
diff --git a/packages/cdk-deletable-bucket/package.json b/packages/cdk-deletable-bucket/package.json
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.28.0",
-    "aws-cdk-lib": "2.28.0",
+    "aws-cdk-lib": "^2.28.0",
     "aws-sdk": "^2.1096.0",
     "constructs": "10.0.41",
     "jest-cdk-snapshot": "^2.0.1"
diff --git a/packages/cdk-dependency-check/package.json b/packages/cdk-dependency-check/package.json
diff --git a/packages/cdk-developer-tools-notifications/package.json b/packages/cdk-developer-tools-notifications/package.json
diff --git a/packages/cdk-dynamodb-seeder/package.json b/packages/cdk-dynamodb-seeder/package.json
diff --git a/packages/cdk-github-webhook/package.json b/packages/cdk-github-webhook/package.json
diff --git a/packages/cdk-lambda-at-edge-pattern/package.json b/packages/cdk-lambda-at-edge-pattern/package.json
diff --git a/packages/cdk-pull-request-approval-rule/package.json b/packages/cdk-pull-request-approval-rule/package.json
diff --git a/packages/cdk-pull-request-check/package.json b/packages/cdk-pull-request-check/package.json
diff --git a/packages/cdk-responsive-email-template/package.json b/packages/cdk-responsive-email-template/package.json
diff --git a/packages/cdk-s3-antivirus/package.json b/packages/cdk-s3-antivirus/package.json
diff --git a/packages/cdk-s3-antivirus/src/sandbox.ts b/packages/cdk-s3-antivirus/src/sandbox.ts
diff --git a/packages/cdk-secret-key/package.json b/packages/cdk-secret-key/package.json
diff --git a/packages/cdk-static-website/package.json b/packages/cdk-static-website/package.json
diff --git a/packages/cdk-stripe-webhook/package.json b/packages/cdk-stripe-webhook/package.json
diff --git a/packages/cdk-temp-stack/package.json b/packages/cdk-temp-stack/package.json
diff --git a/packages/cdk-wordpress/package.json b/packages/cdk-wordpress/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"eslint.alwaysShowStatus": true,`
`3`	`3`	`"editor.codeActionsOnSave": {`
`4`		`- "source.fixAll.eslint": true`
	`4`	`+ "source.fixAll.eslint": "explicit"`
`5`	`5`	`},`
`6`	`6`	`"explorer.autoReveal": false`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`},`
`17`	`17`	`"devDependencies": {`
`18`	`18`	`"@types/source-map-support": "^0.5.4",`
`19`		`- "aws-cdk": "2.8.0"`
	`19`	`+ "aws-cdk": "^2.28.0"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`},`
`18`	`18`	`"devDependencies": {`
`19`	`19`	`"@types/source-map-support": "^0.5.4",`
`20`		`- "aws-cdk": "2.8.0"`
	`20`	`+ "aws-cdk": "^2.28.0"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export class ContentfulWebhook extends Construct {`
`28`	`28`	`});`
`29`	`29`
`30`	`30`	`if (accessToken.grantRead) {`
`31`		`- accessToken.grantRead(handler);`
	`31`	`+ accessToken.grantRead(handler.role!);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`new CustomResource(this, 'CustomResource', {`