From b06511c0f30787436272aa4b7b3edf9606028d06 Mon Sep 17 00:00:00 2001 From: awstools Date: Thu, 7 Nov 2024 19:32:09 +0000 Subject: [PATCH] feat(client-synthetics): Add support to toggle if a canary will automatically delete provisioned canary resources such as Lambda functions and layers when a canary is deleted. This behavior can be controlled via the new ProvisionedResourceCleanup property exposed in the CreateCanary and UpdateCanary APIs. --- .../src/commands/CreateCanaryCommand.ts | 2 + .../src/commands/DeleteCanaryCommand.ts | 6 +-- .../src/commands/DescribeCanariesCommand.ts | 1 + .../src/commands/GetCanaryCommand.ts | 1 + .../src/commands/UpdateCanaryCommand.ts | 1 + .../client-synthetics/src/models/models_0.ts | 54 ++++++++++++++++++- .../src/protocols/Aws_restJson1.ts | 3 ++ .../sdk-codegen/aws-models/synthetics.json | 41 ++++++++++++-- 8 files changed, 101 insertions(+), 8 deletions(-) diff --git a/clients/client-synthetics/src/commands/CreateCanaryCommand.ts b/clients/client-synthetics/src/commands/CreateCanaryCommand.ts index 0a6c10276b98..f76a1f8fff78 100644 --- a/clients/client-synthetics/src/commands/CreateCanaryCommand.ts +++ b/clients/client-synthetics/src/commands/CreateCanaryCommand.ts @@ -85,6 +85,7 @@ export interface CreateCanaryCommandOutput extends CreateCanaryResponse, __Metad * ResourcesToReplicateTags: [ // ResourceList * "lambda-function", * ], + * ProvisionedResourceCleanup: "AUTOMATIC" || "OFF", * Tags: { // TagMap * "": "STRING_VALUE", * }, @@ -151,6 +152,7 @@ export interface CreateCanaryCommandOutput extends CreateCanaryResponse, __Metad * // ], * // BaseCanaryRunId: "STRING_VALUE", * // }, + * // ProvisionedResourceCleanup: "AUTOMATIC" || "OFF", * // Tags: { // TagMap * // "": "STRING_VALUE", * // }, diff --git a/clients/client-synthetics/src/commands/DeleteCanaryCommand.ts b/clients/client-synthetics/src/commands/DeleteCanaryCommand.ts index bf0da42dfb94..de28154e9ae1 100644 --- a/clients/client-synthetics/src/commands/DeleteCanaryCommand.ts +++ b/clients/client-synthetics/src/commands/DeleteCanaryCommand.ts @@ -29,11 +29,11 @@ export interface DeleteCanaryCommandOutput extends DeleteCanaryResponse, __Metad /** *

Permanently deletes the specified canary.

- *

If you specify DeleteLambda to true, CloudWatch Synthetics also deletes + *

If the canary's ProvisionedResourceCleanup field is set to AUTOMATIC + * or you specify DeleteLambda in this operation as true, CloudWatch Synthetics also deletes * the Lambda functions and layers that are used by the canary.

*

Other resources used and created by the canary are not automatically deleted. - * After you delete a canary that you do not intend to - * use again, you + * After you delete a canary, you * should also delete the following:

*
    *
  • diff --git a/clients/client-synthetics/src/commands/DescribeCanariesCommand.ts b/clients/client-synthetics/src/commands/DescribeCanariesCommand.ts index f2c442e9ef76..9686e1c8148b 100644 --- a/clients/client-synthetics/src/commands/DescribeCanariesCommand.ts +++ b/clients/client-synthetics/src/commands/DescribeCanariesCommand.ts @@ -108,6 +108,7 @@ export interface DescribeCanariesCommandOutput extends DescribeCanariesResponse, * // ], * // BaseCanaryRunId: "STRING_VALUE", * // }, + * // ProvisionedResourceCleanup: "AUTOMATIC" || "OFF", * // Tags: { // TagMap * // "": "STRING_VALUE", * // }, diff --git a/clients/client-synthetics/src/commands/GetCanaryCommand.ts b/clients/client-synthetics/src/commands/GetCanaryCommand.ts index 40f1d6d29433..04555b94c8d7 100644 --- a/clients/client-synthetics/src/commands/GetCanaryCommand.ts +++ b/clients/client-synthetics/src/commands/GetCanaryCommand.ts @@ -96,6 +96,7 @@ export interface GetCanaryCommandOutput extends GetCanaryResponse, __MetadataBea * // ], * // BaseCanaryRunId: "STRING_VALUE", * // }, + * // ProvisionedResourceCleanup: "AUTOMATIC" || "OFF", * // Tags: { // TagMap * // "": "STRING_VALUE", * // }, diff --git a/clients/client-synthetics/src/commands/UpdateCanaryCommand.ts b/clients/client-synthetics/src/commands/UpdateCanaryCommand.ts index 6aa657ce7f2b..622db7af16ad 100644 --- a/clients/client-synthetics/src/commands/UpdateCanaryCommand.ts +++ b/clients/client-synthetics/src/commands/UpdateCanaryCommand.ts @@ -90,6 +90,7 @@ export interface UpdateCanaryCommandOutput extends UpdateCanaryResponse, __Metad * KmsKeyArn: "STRING_VALUE", * }, * }, + * ProvisionedResourceCleanup: "AUTOMATIC" || "OFF", * }; * const command = new UpdateCanaryCommand(input); * const response = await client.send(command); diff --git a/clients/client-synthetics/src/models/models_0.ts b/clients/client-synthetics/src/models/models_0.ts index b5014bbaf62a..e12fac3d8596 100644 --- a/clients/client-synthetics/src/models/models_0.ts +++ b/clients/client-synthetics/src/models/models_0.ts @@ -275,6 +275,21 @@ export interface CanaryCodeOutput { Handler?: string; } +/** + * @public + * @enum + */ +export const ProvisionedResourceCleanupSetting = { + AUTOMATIC: "AUTOMATIC", + OFF: "OFF", +} as const; + +/** + * @public + */ +export type ProvisionedResourceCleanupSetting = + (typeof ProvisionedResourceCleanupSetting)[keyof typeof ProvisionedResourceCleanupSetting]; + /** *

    A structure that contains information about a canary run.

    * @public @@ -588,6 +603,17 @@ export interface Canary { */ VisualReference?: VisualReferenceOutput; + /** + *

    Specifies whether to also delete the Lambda functions and layers used by this canary + * when the canary is deleted. If it is AUTOMATIC, the Lambda functions and layers will be deleted + * when the canary is deleted.

    + *

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter + * of the DeleteCanary operation + * determines whether the Lambda functions and layers will be deleted.

    + * @public + */ + ProvisionedResourceCleanup?: ProvisionedResourceCleanupSetting; + /** *

    The list of key-value pairs that are associated with the canary.

    * @public @@ -1054,11 +1080,22 @@ export interface CreateCanaryRequest { *

    To have the tags that you apply to this canary also be applied to the Lambda function that * the canary uses, specify this parameter with the value lambda-function.

    *

    If you specify this parameter and don't specify any tags in the Tags - * parameter, the canary creation fails.

    + * parameter, the canary creation fails.

    * @public */ ResourcesToReplicateTags?: ResourceToTag[]; + /** + *

    Specifies whether to also delete the Lambda functions and layers used by this canary + * when the canary is deleted. If you omit this parameter, the default of AUTOMATIC is used, which means + * that the Lambda functions and layers will be deleted when the canary is deleted.

    + *

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter + * of the DeleteCanary operation + * determines whether the Lambda functions and layers will be deleted.

    + * @public + */ + ProvisionedResourceCleanup?: ProvisionedResourceCleanupSetting; + /** *

    A list of key-value pairs to associate with the canary. * You can associate as many as 50 tags with a canary.

    @@ -1201,7 +1238,10 @@ export interface DeleteCanaryRequest { /** *

    Specifies whether to also delete the Lambda functions and layers used by this canary. The default - * is false.

    + * is false.

    + *

    Your setting for this parameter is used only if the canary doesn't have AUTOMATIC for its + * ProvisionedResourceCleanup field. If that field is set to AUTOMATIC, then the + * Lambda functions and layers will be deleted when this canary is deleted.

    *

    Type: Boolean

    * @public */ @@ -2037,6 +2077,16 @@ export interface UpdateCanaryRequest { * @public */ ArtifactConfig?: ArtifactConfigInput; + + /** + *

    Specifies whether to also delete the Lambda functions and layers used by this canary + * when the canary is deleted.

    + *

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter + * of the DeleteCanary operation + * determines whether the Lambda functions and layers will be deleted.

    + * @public + */ + ProvisionedResourceCleanup?: ProvisionedResourceCleanupSetting; } /** diff --git a/clients/client-synthetics/src/protocols/Aws_restJson1.ts b/clients/client-synthetics/src/protocols/Aws_restJson1.ts index 9ced6f56f0e0..30ca715fb221 100644 --- a/clients/client-synthetics/src/protocols/Aws_restJson1.ts +++ b/clients/client-synthetics/src/protocols/Aws_restJson1.ts @@ -134,6 +134,7 @@ export const se_CreateCanaryCommand = async ( ExecutionRoleArn: [], FailureRetentionPeriodInDays: [], Name: [], + ProvisionedResourceCleanup: [], ResourcesToReplicateTags: (_) => _json(_), RunConfig: (_) => _json(_), RuntimeVersion: [], @@ -537,6 +538,7 @@ export const se_UpdateCanaryCommand = async ( Code: (_) => se_CanaryCodeInput(_, context), ExecutionRoleArn: [], FailureRetentionPeriodInDays: [], + ProvisionedResourceCleanup: [], RunConfig: (_) => _json(_), RuntimeVersion: [], Schedule: (_) => _json(_), @@ -1290,6 +1292,7 @@ const de_Canary = (output: any, context: __SerdeContext): Canary => { FailureRetentionPeriodInDays: __expectInt32, Id: __expectString, Name: __expectString, + ProvisionedResourceCleanup: __expectString, RunConfig: _json, RuntimeVersion: __expectString, Schedule: _json, diff --git a/codegen/sdk-codegen/aws-models/synthetics.json b/codegen/sdk-codegen/aws-models/synthetics.json index 924074ae5c49..b631e29cc5ba 100644 --- a/codegen/sdk-codegen/aws-models/synthetics.json +++ b/codegen/sdk-codegen/aws-models/synthetics.json @@ -284,6 +284,12 @@ "smithy.api#documentation": "

    If this canary performs visual monitoring by comparing screenshots, this structure contains the ID of the canary run to use as the baseline for screenshots, and the coordinates\n of any parts of the screen to ignore during the visual monitoring comparison.

    " } }, + "ProvisionedResourceCleanup": { + "target": "com.amazonaws.synthetics#ProvisionedResourceCleanupSetting", + "traits": { + "smithy.api#documentation": "

    Specifies whether to also delete the Lambda functions and layers used by this canary\n when the canary is deleted. If it is AUTOMATIC, the Lambda functions and layers will be deleted\n when the canary is deleted.

    \n

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter\n of the DeleteCanary operation\n determines whether the Lambda functions and layers will be deleted.

    " + } + }, "Tags": { "target": "com.amazonaws.synthetics#TagMap", "traits": { @@ -946,7 +952,13 @@ "ResourcesToReplicateTags": { "target": "com.amazonaws.synthetics#ResourceList", "traits": { - "smithy.api#documentation": "

    To have the tags that you apply to this canary also be applied to the Lambda function that\n the canary uses, specify this parameter with the value lambda-function.

    \n

    If you specify this parameter and don't specify any tags in the Tags\n parameter, the canary creation fails.

    " + "smithy.api#documentation": "

    To have the tags that you apply to this canary also be applied to the Lambda function that\n the canary uses, specify this parameter with the value lambda-function.

    \n

    If you specify this parameter and don't specify any tags in the Tags\n parameter, the canary creation fails.

    " + } + }, + "ProvisionedResourceCleanup": { + "target": "com.amazonaws.synthetics#ProvisionedResourceCleanupSetting", + "traits": { + "smithy.api#documentation": "

    Specifies whether to also delete the Lambda functions and layers used by this canary\n when the canary is deleted. If you omit this parameter, the default of AUTOMATIC is used, which means\n that the Lambda functions and layers will be deleted when the canary is deleted.

    \n

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter\n of the DeleteCanary operation\n determines whether the Lambda functions and layers will be deleted.

    " } }, "Tags": { @@ -1069,7 +1081,7 @@ } ], "traits": { - "smithy.api#documentation": "

    Permanently deletes the specified canary.

    \n

    If you specify DeleteLambda to true, CloudWatch Synthetics also deletes\n the Lambda functions and layers that are used by the canary.

    \n

    Other resources used and created by the canary are not automatically deleted. \n After you delete a canary that you do not intend to\n use again, you\n should also delete the following:

    \n
      \n
    • \n

      The CloudWatch alarms created for this canary. These alarms have a name of\n Synthetics-Alarm-first-198-characters-of-canary-name-canaryId-alarm number\n \n

      \n
      • \n
    • \n

      Amazon S3 objects and buckets, such as the canary's artifact location.

      \n
      • \n
    • \n

      IAM roles created for the canary. If they were created in the console, these roles\n have the name \n role/service-role/CloudWatchSyntheticsRole-First-21-Characters-of-CanaryName\n \n

      \n
      • \n
    • \n

      CloudWatch Logs log groups created for the canary. These logs groups have the name\n /aws/lambda/cwsyn-First-21-Characters-of-CanaryName\n \n

      \n
      • \n
    \n

    Before you delete a canary, you might want to use GetCanary to display\n the information about this canary. Make\n note of the information returned by this operation so that you can delete these resources\n after you delete the canary.

    ", + "smithy.api#documentation": "

    Permanently deletes the specified canary.

    \n

    If the canary's ProvisionedResourceCleanup field is set to AUTOMATIC \n or you specify DeleteLambda in this operation as true, CloudWatch Synthetics also deletes\n the Lambda functions and layers that are used by the canary.

    \n

    Other resources used and created by the canary are not automatically deleted. \n After you delete a canary, you\n should also delete the following:

    \n
      \n
    • \n

      The CloudWatch alarms created for this canary. These alarms have a name of\n Synthetics-Alarm-first-198-characters-of-canary-name-canaryId-alarm number\n \n

      \n
      • \n
    • \n

      Amazon S3 objects and buckets, such as the canary's artifact location.

      \n
      • \n
    • \n

      IAM roles created for the canary. If they were created in the console, these roles\n have the name \n role/service-role/CloudWatchSyntheticsRole-First-21-Characters-of-CanaryName\n \n

      \n
      • \n
    • \n

      CloudWatch Logs log groups created for the canary. These logs groups have the name\n /aws/lambda/cwsyn-First-21-Characters-of-CanaryName\n \n

      \n
      • \n
    \n

    Before you delete a canary, you might want to use GetCanary to display\n the information about this canary. Make\n note of the information returned by this operation so that you can delete these resources\n after you delete the canary.

    ", "smithy.api#http": { "method": "DELETE", "uri": "/canary/{Name}", @@ -1092,7 +1104,7 @@ "target": "com.amazonaws.synthetics#boolean", "traits": { "smithy.api#default": false, - "smithy.api#documentation": "

    Specifies whether to also delete the Lambda functions and layers used by this canary. The default\n is false.

    \n

    Type: Boolean

    ", + "smithy.api#documentation": "

    Specifies whether to also delete the Lambda functions and layers used by this canary. The default\n is false.

    \n

    Your setting for this parameter is used only if the canary doesn't have AUTOMATIC for its \n ProvisionedResourceCleanup field. If that field is set to AUTOMATIC, then the \n Lambda functions and layers will be deleted when this canary is deleted.

    \n

    Type: Boolean

    ", "smithy.api#httpQuery": "deleteLambda" } } @@ -2242,6 +2254,23 @@ "smithy.api#pattern": "^.+$" } }, + "com.amazonaws.synthetics#ProvisionedResourceCleanupSetting": { + "type": "enum", + "members": { + "AUTOMATIC": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "AUTOMATIC" + } + }, + "OFF": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "OFF" + } + } + } + }, "com.amazonaws.synthetics#RequestEntityTooLargeException": { "type": "structure", "members": { @@ -3914,6 +3943,12 @@ "traits": { "smithy.api#documentation": "

    A structure that contains the configuration for canary artifacts, \n including the encryption-at-rest settings for artifacts that \n the canary uploads to Amazon S3.

    " } + }, + "ProvisionedResourceCleanup": { + "target": "com.amazonaws.synthetics#ProvisionedResourceCleanupSetting", + "traits": { + "smithy.api#documentation": "

    Specifies whether to also delete the Lambda functions and layers used by this canary\n when the canary is deleted.

    \n

    If the value of this parameter is OFF, then the value of the DeleteLambda parameter\n of the DeleteCanary operation\n determines whether the Lambda functions and layers will be deleted.

    " + } } }, "traits": {