Merge branch 'main' into iankhou-app-staging-synth-qualifier

Author: iankhou

packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts

@@ -252,7 +252,7 @@ export class ResolveSsmParameterAtLaunchImage implements IMachineImage {
   /**
    * Return the image to use in the given context
    */
-  public getImage(_: Construct): MachineImageConfig {
+  public getImage(_scope: Construct): MachineImageConfig {
     const versionString = this.props.parameterVersion ? `:${this.props.parameterVersion}` : '';
     const osType = this.props.os ?? OperatingSystemType.LINUX;
     return {

packages/aws-cdk-lib/custom-resources/lib/provider-framework/provider.ts

@@ -123,7 +123,7 @@ export interface ProviderProps {
    * service principal.
    *
    * @default - A default role will be created.
-   * @deprecated - Use frameworkOnEventLambdaRole, frameworkIsCompleteLambdaRole, frameworkOnTimeoutLambdaRole
+   * @deprecated - Use frameworkOnEventRole, frameworkCompleteAndTimeoutRole
    */
   readonly role?: iam.IRole;