From 202d49c5e73ffba76e1570976792851fbbfa3632 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:09:06 +0000 Subject: [PATCH] chore: rollback `GenericSSMParameterImage` deprecation (backport #16798) (#16800) This is an automatic backport of pull request #16798 done by [Mergify](https://mergify.io). ---
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.io/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.io/
--- packages/@aws-cdk/aws-ec2/lib/machine-image.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk/aws-ec2/lib/machine-image.ts b/packages/@aws-cdk/aws-ec2/lib/machine-image.ts index c7340af1d47e5..731d9ea8d0c43 100644 --- a/packages/@aws-cdk/aws-ec2/lib/machine-image.ts +++ b/packages/@aws-cdk/aws-ec2/lib/machine-image.ts @@ -149,10 +149,12 @@ export interface MachineImageConfig { * on the instance if you are using this image. * * The AMI ID is selected using the values published to the SSM parameter store. - * - * @deprecated Use `MachineImage.fromSsmParameter()` instead */ export class GenericSSMParameterImage implements IMachineImage { + // FIXME: this class ought to be `@deprecated` and removed from v2, but that + // is causing build failure right now. Ref: https://github.com/aws/jsii/issues/3025 + // @-deprecated Use `MachineImage.fromSsmParameter()` instead + /** * Name of the SSM parameter we're looking up */ @@ -679,4 +681,4 @@ function lookupImage(scope: Construct, cachedInContext: boolean | undefined, par return cachedInContext ? ssm.StringParameter.valueFromLookup(scope, parameterName) : ssm.StringParameter.valueForTypedStringParameter(scope, parameterName, ssm.ParameterType.AWS_EC2_IMAGE_ID); -} \ No newline at end of file +}