diff --git a/packages/@aws-cdk/aws-appsync/lib/appsync-function.ts b/packages/@aws-cdk/aws-appsync/lib/appsync-function.ts index 7423317d0fa3e..46019afe6c2a9 100644 --- a/packages/@aws-cdk/aws-appsync/lib/appsync-function.ts +++ b/packages/@aws-cdk/aws-appsync/lib/appsync-function.ts @@ -142,7 +142,7 @@ export class AppsyncFunction extends Resource implements IAppsyncFunction { this.functionId = this.function.attrFunctionId; this.dataSource = props.dataSource; - this.function.addDependsOn(this.dataSource.ds); + this.function.addDependency(this.dataSource.ds); props.api.addSchemaDependency(this.function); } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts b/packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts index 83027eafd5603..0f7f16a37f0ab 100644 --- a/packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts +++ b/packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts @@ -518,7 +518,7 @@ export class GraphqlApi extends GraphqlApiBase { apiId: this.apiId, }); - domainNameAssociation.addDependsOn(this.domainNameResource); + domainNameAssociation.addDependency(this.domainNameResource); } if (modes.some((mode) => mode.authorizationType === AuthorizationType.API_KEY)) { @@ -526,7 +526,7 @@ export class GraphqlApi extends GraphqlApiBase { return mode.authorizationType === AuthorizationType.API_KEY && mode.apiKeyConfig; })?.apiKeyConfig; this.apiKeyResource = this.createAPIKey(config); - this.apiKeyResource.addDependsOn(this.schemaResource); + this.apiKeyResource.addDependency(this.schemaResource); this.apiKey = this.apiKeyResource.attrApiKey; } @@ -631,7 +631,7 @@ export class GraphqlApi extends GraphqlApiBase { * @param construct the dependee */ public addSchemaDependency(construct: CfnResource): boolean { - construct.addDependsOn(this.schemaResource); + construct.addDependency(this.schemaResource); return true; } diff --git a/packages/@aws-cdk/aws-appsync/lib/resolver.ts b/packages/@aws-cdk/aws-appsync/lib/resolver.ts index 3df7f44a068c5..72818cb59b966 100644 --- a/packages/@aws-cdk/aws-appsync/lib/resolver.ts +++ b/packages/@aws-cdk/aws-appsync/lib/resolver.ts @@ -122,7 +122,7 @@ export class Resolver extends Construct { }); props.api.addSchemaDependency(this.resolver); if (props.dataSource) { - this.resolver.addDependsOn(props.dataSource.ds); + this.resolver.addDependency(props.dataSource.ds); } this.arn = this.resolver.attrResolverArn; } diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json index e77fc63a8af4a..ebeda6f56846a 100644 --- a/packages/@aws-cdk/aws-cloudformation/package.json +++ b/packages/@aws-cdk/aws-cloudformation/package.json @@ -78,6 +78,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/assertions": "0.0.0", + "@aws-cdk/aws-logs": "0.0.0", "@aws-cdk/aws-events": "0.0.0", "@aws-cdk/aws-s3-assets": "0.0.0", "@aws-cdk/aws-sns-subscriptions": "0.0.0", diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json new file mode 100644 index 0000000000000..a513dc6283811 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json @@ -0,0 +1,19 @@ +{ + "version": "21.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts new file mode 100644 index 0000000000000..9bbf5854684b6 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts @@ -0,0 +1 @@ +export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context): Promise; diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js new file mode 100644 index 0000000000000..d8d501f248a23 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js @@ -0,0 +1,209 @@ +"use strict"; +/* eslint-disable no-console */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.handler = void 0; +// eslint-disable-next-line import/no-extraneous-dependencies +const AWS = require("aws-sdk"); +/** + * Creates a log group and doesn't throw if it exists. + * + * @param logGroupName the name of the log group to create. + * @param region to create the log group in + * @param options CloudWatch API SDK options. + */ +async function createLogGroupSafe(logGroupName, region, options) { + // If we set the log retention for a lambda, then due to the async nature of + // Lambda logging there could be a race condition when the same log group is + // already being created by the lambda execution. This can sometime result in + // an error "OperationAbortedException: A conflicting operation is currently + // in progress...Please try again." + // To avoid an error, we do as requested and try again. + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.createLogGroup({ logGroupName }).promise(); + return; + } + catch (error) { + if (error.code === 'ResourceAlreadyExistsException') { + // The log group is already created by the lambda execution + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +//delete a log group +async function deleteLogGroup(logGroupName, region, options) { + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise(); + return; + } + catch (error) { + if (error.code === 'ResourceNotFoundException') { + // The log group doesn't exist + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being deleted by another execution but we are out of retries + throw new Error('Out of attempts to delete a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +/** + * Puts or deletes a retention policy on a log group. + * + * @param logGroupName the name of the log group to create + * @param region the region of the log group + * @param options CloudWatch API SDK options. + * @param retentionInDays the number of days to retain the log events in the specified log group. + */ +async function setRetentionPolicy(logGroupName, region, options, retentionInDays) { + // The same as in createLogGroupSafe(), here we could end up with the race + // condition where a log group is either already being created or its retention + // policy is being updated. This would result in an OperationAbortedException, + // which we will try to catch and retry the command a number of times before failing + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + if (!retentionInDays) { + await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise(); + } + else { + await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise(); + } + return; + } + catch (error) { + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +async function handler(event, context) { + try { + console.log(JSON.stringify({ ...event, ResponseURL: '...' })); + // The target log group + const logGroupName = event.ResourceProperties.LogGroupName; + // The region of the target log group + const logGroupRegion = event.ResourceProperties.LogGroupRegion; + // Parse to AWS SDK retry options + const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry); + if (event.RequestType === 'Create' || event.RequestType === 'Update') { + // Act on the target log group + await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions); + await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10)); + if (event.RequestType === 'Create') { + // Set a retention policy of 1 day on the logs of this very function. + // Due to the async nature of the log group creation, the log group for this function might + // still be not created yet at this point. Therefore we attempt to create it. + // In case it is being created, createLogGroupSafe will handle the conflict. + const region = process.env.AWS_REGION; + await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions); + // If createLogGroupSafe fails, the log group is not created even after multiple attempts. + // In this case we have nothing to set the retention policy on but an exception will skip + // the next line. + await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1); + } + } + //When the requestType is delete, delete the log group if the removal policy is delete + if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') { + await deleteLogGroup(logGroupName, logGroupRegion, retryOptions); + //else retain the log group + } + await respond('SUCCESS', 'OK', logGroupName); + } + catch (e) { + console.log(e); + await respond('FAILED', e.message, event.ResourceProperties.LogGroupName); + } + function respond(responseStatus, reason, physicalResourceId) { + const responseBody = JSON.stringify({ + Status: responseStatus, + Reason: reason, + PhysicalResourceId: physicalResourceId, + StackId: event.StackId, + RequestId: event.RequestId, + LogicalResourceId: event.LogicalResourceId, + Data: { + // Add log group name as part of the response so that it's available via Fn::GetAtt + LogGroupName: event.ResourceProperties.LogGroupName, + }, + }); + console.log('Responding', responseBody); + // eslint-disable-next-line @typescript-eslint/no-require-imports + const parsedUrl = require('url').parse(event.ResponseURL); + const requestOptions = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + return new Promise((resolve, reject) => { + try { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const request = require('https').request(requestOptions, resolve); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); + } + function parseRetryOptions(rawOptions) { + const retryOptions = {}; + if (rawOptions) { + if (rawOptions.maxRetries) { + retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10); + } + if (rawOptions.base) { + retryOptions.retryOptions = { + base: parseInt(rawOptions.base, 10), + }; + } + } + return retryOptions; + } +} +exports.handler = handler; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\n\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as AWS from 'aws-sdk';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport type { RetryDelayOptions } from 'aws-sdk/lib/config-base';\n\ninterface SdkRetryOptions {\n  maxRetries?: number;\n  retryOptions?: RetryDelayOptions;\n}\n\n/**\n * Creates a log group and doesn't throw if it exists.\n *\n * @param logGroupName the name of the log group to create.\n * @param region to create the log group in\n * @param options CloudWatch API SDK options.\n */\nasync function createLogGroupSafe(logGroupName: string, region?: string, options?: SdkRetryOptions) {\n  // If we set the log retention for a lambda, then due to the async nature of\n  // Lambda logging there could be a race condition when the same log group is\n  // already being created by the lambda execution. This can sometime result in\n  // an error \"OperationAbortedException: A conflicting operation is currently\n  // in progress...Please try again.\"\n  // To avoid an error, we do as requested and try again.\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      await cloudwatchlogs.createLogGroup({ logGroupName }).promise();\n      return;\n    } catch (error) {\n      if (error.code === 'ResourceAlreadyExistsException') {\n        // The log group is already created by the lambda execution\n        return;\n      }\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being created by another execution but we are out of retries\n          throw new Error('Out of attempts to create a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\n//delete a log group\nasync function deleteLogGroup(logGroupName: string, region?: string, options?: SdkRetryOptions) {\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise();\n      return;\n    } catch (error) {\n      if (error.code === 'ResourceNotFoundException') {\n        // The log group doesn't exist\n        return;\n      }\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being deleted by another execution but we are out of retries\n          throw new Error('Out of attempts to delete a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\n/**\n * Puts or deletes a retention policy on a log group.\n *\n * @param logGroupName the name of the log group to create\n * @param region the region of the log group\n * @param options CloudWatch API SDK options.\n * @param retentionInDays the number of days to retain the log events in the specified log group.\n */\nasync function setRetentionPolicy(logGroupName: string, region?: string, options?: SdkRetryOptions, retentionInDays?: number) {\n  // The same as in createLogGroupSafe(), here we could end up with the race\n  // condition where a log group is either already being created or its retention\n  // policy is being updated. This would result in an OperationAbortedException,\n  // which we will try to catch and retry the command a number of times before failing\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      if (!retentionInDays) {\n        await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise();\n      } else {\n        await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise();\n      }\n      return;\n\n    } catch (error) {\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being created by another execution but we are out of retries\n          throw new Error('Out of attempts to create a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  try {\n    console.log(JSON.stringify({ ...event, ResponseURL: '...' }));\n\n    // The target log group\n    const logGroupName = event.ResourceProperties.LogGroupName;\n\n    // The region of the target log group\n    const logGroupRegion = event.ResourceProperties.LogGroupRegion;\n\n    // Parse to AWS SDK retry options\n    const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry);\n\n    if (event.RequestType === 'Create' || event.RequestType === 'Update') {\n      // Act on the target log group\n      await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions);\n      await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10));\n\n      if (event.RequestType === 'Create') {\n        // Set a retention policy of 1 day on the logs of this very function.\n        // Due to the async nature of the log group creation, the log group for this function might\n        // still be not created yet at this point. Therefore we attempt to create it.\n        // In case it is being created, createLogGroupSafe will handle the conflict.\n        const region = process.env.AWS_REGION;\n        await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions);\n        // If createLogGroupSafe fails, the log group is not created even after multiple attempts.\n        // In this case we have nothing to set the retention policy on but an exception will skip\n        // the next line.\n        await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1);\n      }\n    }\n\n    //When the requestType is delete, delete the log group if the removal policy is delete\n    if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') {\n      await deleteLogGroup(logGroupName, logGroupRegion, retryOptions);\n      //else retain the log group\n    }\n\n    await respond('SUCCESS', 'OK', logGroupName);\n  } catch (e) {\n    console.log(e);\n\n    await respond('FAILED', e.message, event.ResourceProperties.LogGroupName);\n  }\n\n  function respond(responseStatus: string, reason: string, physicalResourceId: string) {\n    const responseBody = JSON.stringify({\n      Status: responseStatus,\n      Reason: reason,\n      PhysicalResourceId: physicalResourceId,\n      StackId: event.StackId,\n      RequestId: event.RequestId,\n      LogicalResourceId: event.LogicalResourceId,\n      Data: {\n        // Add log group name as part of the response so that it's available via Fn::GetAtt\n        LogGroupName: event.ResourceProperties.LogGroupName,\n      },\n    });\n\n    console.log('Responding', responseBody);\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const parsedUrl = require('url').parse(event.ResponseURL);\n    const requestOptions = {\n      hostname: parsedUrl.hostname,\n      path: parsedUrl.path,\n      method: 'PUT',\n      headers: { 'content-type': '', 'content-length': responseBody.length },\n    };\n\n    return new Promise((resolve, reject) => {\n      try {\n        // eslint-disable-next-line @typescript-eslint/no-require-imports\n        const request = require('https').request(requestOptions, resolve);\n        request.on('error', reject);\n        request.write(responseBody);\n        request.end();\n      } catch (e) {\n        reject(e);\n      }\n    });\n  }\n\n  function parseRetryOptions(rawOptions: any): SdkRetryOptions {\n    const retryOptions: SdkRetryOptions = {};\n    if (rawOptions) {\n      if (rawOptions.maxRetries) {\n        retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10);\n      }\n      if (rawOptions.base) {\n        retryOptions.retryOptions = {\n          base: parseInt(rawOptions.base, 10),\n        };\n      }\n    }\n    return retryOptions;\n  }\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts new file mode 100644 index 0000000000000..1bb38a9f3d774 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts @@ -0,0 +1,221 @@ +/* eslint-disable no-console */ + +// eslint-disable-next-line import/no-extraneous-dependencies +import * as AWS from 'aws-sdk'; +// eslint-disable-next-line import/no-extraneous-dependencies +import type { RetryDelayOptions } from 'aws-sdk/lib/config-base'; + +interface SdkRetryOptions { + maxRetries?: number; + retryOptions?: RetryDelayOptions; +} + +/** + * Creates a log group and doesn't throw if it exists. + * + * @param logGroupName the name of the log group to create. + * @param region to create the log group in + * @param options CloudWatch API SDK options. + */ +async function createLogGroupSafe(logGroupName: string, region?: string, options?: SdkRetryOptions) { + // If we set the log retention for a lambda, then due to the async nature of + // Lambda logging there could be a race condition when the same log group is + // already being created by the lambda execution. This can sometime result in + // an error "OperationAbortedException: A conflicting operation is currently + // in progress...Please try again." + // To avoid an error, we do as requested and try again. + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.createLogGroup({ logGroupName }).promise(); + return; + } catch (error) { + if (error.code === 'ResourceAlreadyExistsException') { + // The log group is already created by the lambda execution + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +//delete a log group +async function deleteLogGroup(logGroupName: string, region?: string, options?: SdkRetryOptions) { + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise(); + return; + } catch (error) { + if (error.code === 'ResourceNotFoundException') { + // The log group doesn't exist + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being deleted by another execution but we are out of retries + throw new Error('Out of attempts to delete a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +/** + * Puts or deletes a retention policy on a log group. + * + * @param logGroupName the name of the log group to create + * @param region the region of the log group + * @param options CloudWatch API SDK options. + * @param retentionInDays the number of days to retain the log events in the specified log group. + */ +async function setRetentionPolicy(logGroupName: string, region?: string, options?: SdkRetryOptions, retentionInDays?: number) { + // The same as in createLogGroupSafe(), here we could end up with the race + // condition where a log group is either already being created or its retention + // policy is being updated. This would result in an OperationAbortedException, + // which we will try to catch and retry the command a number of times before failing + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + if (!retentionInDays) { + await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise(); + } else { + await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise(); + } + return; + + } catch (error) { + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) { + try { + console.log(JSON.stringify({ ...event, ResponseURL: '...' })); + + // The target log group + const logGroupName = event.ResourceProperties.LogGroupName; + + // The region of the target log group + const logGroupRegion = event.ResourceProperties.LogGroupRegion; + + // Parse to AWS SDK retry options + const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry); + + if (event.RequestType === 'Create' || event.RequestType === 'Update') { + // Act on the target log group + await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions); + await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10)); + + if (event.RequestType === 'Create') { + // Set a retention policy of 1 day on the logs of this very function. + // Due to the async nature of the log group creation, the log group for this function might + // still be not created yet at this point. Therefore we attempt to create it. + // In case it is being created, createLogGroupSafe will handle the conflict. + const region = process.env.AWS_REGION; + await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions); + // If createLogGroupSafe fails, the log group is not created even after multiple attempts. + // In this case we have nothing to set the retention policy on but an exception will skip + // the next line. + await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1); + } + } + + //When the requestType is delete, delete the log group if the removal policy is delete + if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') { + await deleteLogGroup(logGroupName, logGroupRegion, retryOptions); + //else retain the log group + } + + await respond('SUCCESS', 'OK', logGroupName); + } catch (e) { + console.log(e); + + await respond('FAILED', e.message, event.ResourceProperties.LogGroupName); + } + + function respond(responseStatus: string, reason: string, physicalResourceId: string) { + const responseBody = JSON.stringify({ + Status: responseStatus, + Reason: reason, + PhysicalResourceId: physicalResourceId, + StackId: event.StackId, + RequestId: event.RequestId, + LogicalResourceId: event.LogicalResourceId, + Data: { + // Add log group name as part of the response so that it's available via Fn::GetAtt + LogGroupName: event.ResourceProperties.LogGroupName, + }, + }); + + console.log('Responding', responseBody); + + // eslint-disable-next-line @typescript-eslint/no-require-imports + const parsedUrl = require('url').parse(event.ResponseURL); + const requestOptions = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + + return new Promise((resolve, reject) => { + try { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const request = require('https').request(requestOptions, resolve); + request.on('error', reject); + request.write(responseBody); + request.end(); + } catch (e) { + reject(e); + } + }); + } + + function parseRetryOptions(rawOptions: any): SdkRetryOptions { + const retryOptions: SdkRetryOptions = {}; + if (rawOptions) { + if (rawOptions.maxRetries) { + retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10); + } + if (rawOptions.base) { + retryOptions.retryOptions = { + base: parseInt(rawOptions.base, 10), + }; + } + } + return retryOptions; + } +} diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/cdk.out new file mode 100644 index 0000000000000..8ecc185e9dbee --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/integ.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/integ.json new file mode 100644 index 0000000000000..46d61a98f2f47 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/integ.json @@ -0,0 +1,13 @@ +{ + "version": "21.0.0", + "testCases": { + "DependsOnTest/DefaultTest": { + "stacks": [ + "replace-depends-on-test", + "nested-stack-depends-test" + ], + "assertionStack": "DependsOnTest/DefaultTest/DeployAssert", + "assertionStackName": "DependsOnTestDefaultTestDeployAssert3B3B50E2" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/manifest.json new file mode 100644 index 0000000000000..158178cf68b01 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/manifest.json @@ -0,0 +1,224 @@ +{ + "version": "21.0.0", + "artifacts": { + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + }, + "replace-depends-on-test.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "replace-depends-on-test.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "replace-depends-on-test": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "replace-depends-on-test.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "replace-depends-on-test.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "replace-depends-on-test.assets" + ], + "metadata": { + "/replace-depends-on-test/MyLambda/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaServiceRole4539ECB6" + } + ], + "/replace-depends-on-test/MyLambda/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaCCE802FB" + } + ], + "/replace-depends-on-test/MyLambda/LogRetention/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaLogRetention48BA931C" + } + ], + "/replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ], + "/replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A" + } + ], + "/replace-depends-on-test/CustomPolicy": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomPolicy" + } + ], + "/replace-depends-on-test/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/replace-depends-on-test/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "replace-depends-on-test" + }, + "nested-stack-depends-test.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "nested-stack-depends-test.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "nested-stack-depends-test": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "nested-stack-depends-test.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "nested-stack-depends-test.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "nested-stack-depends-test.assets" + ], + "metadata": { + "/nested-stack-depends-test/Stack1/Lambda1/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda1ServiceRoleF188C4B8" + } + ], + "/nested-stack-depends-test/Stack1/Lambda1/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda1DB8E9965" + } + ], + "/nested-stack-depends-test/Stack1.NestedStack/Stack1.NestedStackResource": [ + { + "type": "aws:cdk:logicalId", + "data": "Stack1NestedStackStack1NestedStackResource256CB8C4" + } + ], + "/nested-stack-depends-test/Stack2/Lambda2/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda2ServiceRole31A072E1" + } + ], + "/nested-stack-depends-test/Stack2/Lambda2/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda217CFB423" + } + ], + "/nested-stack-depends-test/Stack2.NestedStack/Stack2.NestedStackResource": [ + { + "type": "aws:cdk:logicalId", + "data": "Stack2NestedStackStack2NestedStackResource9F0678CF" + } + ], + "/nested-stack-depends-test/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/nested-stack-depends-test/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "nested-stack-depends-test" + }, + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "DependsOnTestDefaultTestDeployAssert3B3B50E2": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets" + ], + "metadata": { + "/DependsOnTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/DependsOnTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "DependsOnTest/DefaultTest/DeployAssert" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.assets.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.assets.json new file mode 100644 index 0000000000000..7f73a85d9077c --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.assets.json @@ -0,0 +1,45 @@ +{ + "version": "21.0.0", + "files": { + "d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2": { + "source": { + "path": "nestedstackdependstestStack1DE6783D8.nested.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431": { + "source": { + "path": "nestedstackdependstestStack2A36722CF.nested.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a": { + "source": { + "path": "nested-stack-depends-test.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.template.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.template.json new file mode 100644 index 0000000000000..cf6d4b0d46cee --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nested-stack-depends-test.template.json @@ -0,0 +1,95 @@ +{ + "Resources": { + "Stack1NestedStackStack1NestedStackResource256CB8C4": { + "Type": "AWS::CloudFormation::Stack", + "Properties": { + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json" + ] + ] + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "Stack2NestedStackStack2NestedStackResource9F0678CF": { + "Type": "AWS::CloudFormation::Stack", + "Properties": { + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json" + ] + ] + } + }, + "DependsOn": [ + "Stack1NestedStackStack1NestedStackResource256CB8C4" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json new file mode 100644 index 0000000000000..8b39a08a02151 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json @@ -0,0 +1,54 @@ +{ + "Resources": { + "Lambda1ServiceRoleF188C4B8": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "Lambda1DB8E9965": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "Lambda1ServiceRoleF188C4B8", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "Lambda1ServiceRoleF188C4B8" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json new file mode 100644 index 0000000000000..d1b0202b0afc1 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json @@ -0,0 +1,54 @@ +{ + "Resources": { + "Lambda2ServiceRole31A072E1": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "Lambda217CFB423": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "Lambda2ServiceRole31A072E1", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "Lambda2ServiceRole31A072E1" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.assets.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.assets.json new file mode 100644 index 0000000000000..e2083cbfc507f --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.assets.json @@ -0,0 +1,32 @@ +{ + "version": "21.0.0", + "files": { + "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347": { + "source": { + "path": "asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af": { + "source": { + "path": "replace-depends-on-test.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.template.json new file mode 100644 index 0000000000000..5574a9b261d30 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/replace-depends-on-test.template.json @@ -0,0 +1,188 @@ +{ + "Resources": { + "MyLambdaServiceRole4539ECB6": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "MyLambdaCCE802FB": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "MyLambdaServiceRole4539ECB6", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "MyLambdaServiceRole4539ECB6" + ] + }, + "MyLambdaLogRetention48BA931C": { + "Type": "Custom::LogRetention", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A", + "Arn" + ] + }, + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/lambda/", + { + "Ref": "MyLambdaCCE802FB" + } + ] + ] + }, + "RetentionInDays": 1 + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Handler": "index.handler", + "Runtime": "nodejs14.x", + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347.zip" + }, + "Role": { + "Fn::GetAtt": [ + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB", + "Arn" + ] + } + }, + "DependsOn": [ + "CustomPolicy", + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + ] + }, + "CustomPolicy": { + "Type": "AWS::IAM::ManagedPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "logs:DeleteRetentionPolicy", + "logs:PutRetentionPolicy" + ], + "Effect": "Allow", + "Resource": "*" + } + ], + "Version": "2012-10-17" + }, + "Roles": [ + { + "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/tree.json b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/tree.json new file mode 100644 index 0000000000000..9b65fee29f707 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/core-deps.integ.snapshot/tree.json @@ -0,0 +1,582 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.129" + } + }, + "replace-depends-on-test": { + "id": "replace-depends-on-test", + "path": "replace-depends-on-test", + "children": { + "MyLambda": { + "id": "MyLambda", + "path": "replace-depends-on-test/MyLambda", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "replace-depends-on-test/MyLambda/ServiceRole", + "children": { + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "MyLambdaServiceRole4539ECB6", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + }, + "LogRetention": { + "id": "LogRetention", + "path": "replace-depends-on-test/MyLambda/LogRetention", + "children": { + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/LogRetention/Resource", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-logs.LogRetention", + "version": "0.0.0" + } + }, + "LogGroup": { + "id": "LogGroup", + "path": "replace-depends-on-test/MyLambda/LogGroup", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a": { + "id": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a", + "children": { + "Code": { + "id": "Code", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "ServiceRole": { + "id": "ServiceRole", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole", + "children": { + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Resource", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.129" + } + }, + "CustomPolicy": { + "id": "CustomPolicy", + "path": "replace-depends-on-test/CustomPolicy", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "logs:DeleteRetentionPolicy", + "logs:PutRetentionPolicy" + ], + "Effect": "Allow", + "Resource": "*" + } + ], + "Version": "2012-10-17" + }, + "roles": [ + { + "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnManagedPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "nested-stack-depends-test": { + "id": "nested-stack-depends-test", + "path": "nested-stack-depends-test", + "children": { + "Stack1": { + "id": "Stack1", + "path": "nested-stack-depends-test/Stack1", + "children": { + "Lambda1": { + "id": "Lambda1", + "path": "nested-stack-depends-test/Stack1/Lambda1", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "nested-stack-depends-test/Stack1/Lambda1/ServiceRole", + "children": { + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack1/Lambda1/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack1/Lambda1/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "Lambda1ServiceRoleF188C4B8", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.NestedStack", + "version": "0.0.0" + } + }, + "Stack1.NestedStack": { + "id": "Stack1.NestedStack", + "path": "nested-stack-depends-test/Stack1.NestedStack", + "children": { + "Stack1.NestedStackResource": { + "id": "Stack1.NestedStackResource", + "path": "nested-stack-depends-test/Stack1.NestedStack/Stack1.NestedStackResource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", + "aws:cdk:cloudformation:props": { + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json" + ] + ] + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CfnStack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.129" + } + }, + "Stack2": { + "id": "Stack2", + "path": "nested-stack-depends-test/Stack2", + "children": { + "Lambda2": { + "id": "Lambda2", + "path": "nested-stack-depends-test/Stack2/Lambda2", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "nested-stack-depends-test/Stack2/Lambda2/ServiceRole", + "children": { + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack2/Lambda2/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack2/Lambda2/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "Lambda2ServiceRole31A072E1", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.NestedStack", + "version": "0.0.0" + } + }, + "Stack2.NestedStack": { + "id": "Stack2.NestedStack", + "path": "nested-stack-depends-test/Stack2.NestedStack", + "children": { + "Stack2.NestedStackResource": { + "id": "Stack2.NestedStackResource", + "path": "nested-stack-depends-test/Stack2.NestedStack/Stack2.NestedStackResource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", + "aws:cdk:cloudformation:props": { + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json" + ] + ] + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CfnStack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.129" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "DependsOnTest": { + "id": "DependsOnTest", + "path": "DependsOnTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "DependsOnTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "DependsOnTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.129" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "DependsOnTest/DefaultTest/DeployAssert", + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/deps.test.ts b/packages/@aws-cdk/aws-cloudformation/test/deps.test.ts index 980f17ef6fcb9..0dbb1a9c5ec1b 100644 --- a/packages/@aws-cdk/aws-cloudformation/test/deps.test.ts +++ b/packages/@aws-cdk/aws-cloudformation/test/deps.test.ts @@ -15,7 +15,7 @@ describe('resource dependencies', () => { const r2 = new CfnResource(stack, 'r2', { type: 'r2' }); // WHEN - r1.addDependsOn(r2); + r1.addDependency(r2); // THEN expect(app.synth().getStackArtifact(stack.artifactId).template?.Resources).toEqual({ @@ -304,7 +304,7 @@ describe('stack dependencies', () => { * Given a test function which sets the stage and verifies a dependency scenario * between two CloudFormation resources, returns two tests which exercise both * "construct dependency" (i.e. node.addDependency) and "resource dependency" - * (i.e. resource.addDependsOn). + * (i.e. resource.addDependency). * * @param testFunction The test function */ @@ -314,7 +314,7 @@ function matrixForResourceDependencyTest(testFunction: (addDep: (source: CfnReso testFunction((source, target) => source.node.addDependency(target)); }); test('resource dependency', () => { - testFunction((source, target) => source.addDependsOn(target)); + testFunction((source, target) => source.addDependency(target)); }); }; } diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json new file mode 100644 index 0000000000000..a513dc6283811 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json @@ -0,0 +1,19 @@ +{ + "version": "21.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts new file mode 100644 index 0000000000000..9bbf5854684b6 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.d.ts @@ -0,0 +1 @@ +export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context): Promise; diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js new file mode 100644 index 0000000000000..d8d501f248a23 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.js @@ -0,0 +1,209 @@ +"use strict"; +/* eslint-disable no-console */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.handler = void 0; +// eslint-disable-next-line import/no-extraneous-dependencies +const AWS = require("aws-sdk"); +/** + * Creates a log group and doesn't throw if it exists. + * + * @param logGroupName the name of the log group to create. + * @param region to create the log group in + * @param options CloudWatch API SDK options. + */ +async function createLogGroupSafe(logGroupName, region, options) { + // If we set the log retention for a lambda, then due to the async nature of + // Lambda logging there could be a race condition when the same log group is + // already being created by the lambda execution. This can sometime result in + // an error "OperationAbortedException: A conflicting operation is currently + // in progress...Please try again." + // To avoid an error, we do as requested and try again. + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.createLogGroup({ logGroupName }).promise(); + return; + } + catch (error) { + if (error.code === 'ResourceAlreadyExistsException') { + // The log group is already created by the lambda execution + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +//delete a log group +async function deleteLogGroup(logGroupName, region, options) { + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise(); + return; + } + catch (error) { + if (error.code === 'ResourceNotFoundException') { + // The log group doesn't exist + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being deleted by another execution but we are out of retries + throw new Error('Out of attempts to delete a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +/** + * Puts or deletes a retention policy on a log group. + * + * @param logGroupName the name of the log group to create + * @param region the region of the log group + * @param options CloudWatch API SDK options. + * @param retentionInDays the number of days to retain the log events in the specified log group. + */ +async function setRetentionPolicy(logGroupName, region, options, retentionInDays) { + // The same as in createLogGroupSafe(), here we could end up with the race + // condition where a log group is either already being created or its retention + // policy is being updated. This would result in an OperationAbortedException, + // which we will try to catch and retry the command a number of times before failing + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + if (!retentionInDays) { + await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise(); + } + else { + await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise(); + } + return; + } + catch (error) { + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } + else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} +async function handler(event, context) { + try { + console.log(JSON.stringify({ ...event, ResponseURL: '...' })); + // The target log group + const logGroupName = event.ResourceProperties.LogGroupName; + // The region of the target log group + const logGroupRegion = event.ResourceProperties.LogGroupRegion; + // Parse to AWS SDK retry options + const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry); + if (event.RequestType === 'Create' || event.RequestType === 'Update') { + // Act on the target log group + await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions); + await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10)); + if (event.RequestType === 'Create') { + // Set a retention policy of 1 day on the logs of this very function. + // Due to the async nature of the log group creation, the log group for this function might + // still be not created yet at this point. Therefore we attempt to create it. + // In case it is being created, createLogGroupSafe will handle the conflict. + const region = process.env.AWS_REGION; + await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions); + // If createLogGroupSafe fails, the log group is not created even after multiple attempts. + // In this case we have nothing to set the retention policy on but an exception will skip + // the next line. + await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1); + } + } + //When the requestType is delete, delete the log group if the removal policy is delete + if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') { + await deleteLogGroup(logGroupName, logGroupRegion, retryOptions); + //else retain the log group + } + await respond('SUCCESS', 'OK', logGroupName); + } + catch (e) { + console.log(e); + await respond('FAILED', e.message, event.ResourceProperties.LogGroupName); + } + function respond(responseStatus, reason, physicalResourceId) { + const responseBody = JSON.stringify({ + Status: responseStatus, + Reason: reason, + PhysicalResourceId: physicalResourceId, + StackId: event.StackId, + RequestId: event.RequestId, + LogicalResourceId: event.LogicalResourceId, + Data: { + // Add log group name as part of the response so that it's available via Fn::GetAtt + LogGroupName: event.ResourceProperties.LogGroupName, + }, + }); + console.log('Responding', responseBody); + // eslint-disable-next-line @typescript-eslint/no-require-imports + const parsedUrl = require('url').parse(event.ResponseURL); + const requestOptions = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + return new Promise((resolve, reject) => { + try { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const request = require('https').request(requestOptions, resolve); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); + } + function parseRetryOptions(rawOptions) { + const retryOptions = {}; + if (rawOptions) { + if (rawOptions.maxRetries) { + retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10); + } + if (rawOptions.base) { + retryOptions.retryOptions = { + base: parseInt(rawOptions.base, 10), + }; + } + } + return retryOptions; + } +} +exports.handler = handler; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\n\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as AWS from 'aws-sdk';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport type { RetryDelayOptions } from 'aws-sdk/lib/config-base';\n\ninterface SdkRetryOptions {\n  maxRetries?: number;\n  retryOptions?: RetryDelayOptions;\n}\n\n/**\n * Creates a log group and doesn't throw if it exists.\n *\n * @param logGroupName the name of the log group to create.\n * @param region to create the log group in\n * @param options CloudWatch API SDK options.\n */\nasync function createLogGroupSafe(logGroupName: string, region?: string, options?: SdkRetryOptions) {\n  // If we set the log retention for a lambda, then due to the async nature of\n  // Lambda logging there could be a race condition when the same log group is\n  // already being created by the lambda execution. This can sometime result in\n  // an error \"OperationAbortedException: A conflicting operation is currently\n  // in progress...Please try again.\"\n  // To avoid an error, we do as requested and try again.\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      await cloudwatchlogs.createLogGroup({ logGroupName }).promise();\n      return;\n    } catch (error) {\n      if (error.code === 'ResourceAlreadyExistsException') {\n        // The log group is already created by the lambda execution\n        return;\n      }\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being created by another execution but we are out of retries\n          throw new Error('Out of attempts to create a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\n//delete a log group\nasync function deleteLogGroup(logGroupName: string, region?: string, options?: SdkRetryOptions) {\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise();\n      return;\n    } catch (error) {\n      if (error.code === 'ResourceNotFoundException') {\n        // The log group doesn't exist\n        return;\n      }\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being deleted by another execution but we are out of retries\n          throw new Error('Out of attempts to delete a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\n/**\n * Puts or deletes a retention policy on a log group.\n *\n * @param logGroupName the name of the log group to create\n * @param region the region of the log group\n * @param options CloudWatch API SDK options.\n * @param retentionInDays the number of days to retain the log events in the specified log group.\n */\nasync function setRetentionPolicy(logGroupName: string, region?: string, options?: SdkRetryOptions, retentionInDays?: number) {\n  // The same as in createLogGroupSafe(), here we could end up with the race\n  // condition where a log group is either already being created or its retention\n  // policy is being updated. This would result in an OperationAbortedException,\n  // which we will try to catch and retry the command a number of times before failing\n  let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries;\n  const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base;\n  do {\n    try {\n      const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options });\n      if (!retentionInDays) {\n        await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise();\n      } else {\n        await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise();\n      }\n      return;\n\n    } catch (error) {\n      if (error.code === 'OperationAbortedException') {\n        if (retryCount > 0) {\n          retryCount--;\n          await new Promise(resolve => setTimeout(resolve, delay));\n          continue;\n        } else {\n          // The log group is still being created by another execution but we are out of retries\n          throw new Error('Out of attempts to create a logGroup');\n        }\n      }\n      throw error;\n    }\n  } while (true); // exit happens on retry count check\n}\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  try {\n    console.log(JSON.stringify({ ...event, ResponseURL: '...' }));\n\n    // The target log group\n    const logGroupName = event.ResourceProperties.LogGroupName;\n\n    // The region of the target log group\n    const logGroupRegion = event.ResourceProperties.LogGroupRegion;\n\n    // Parse to AWS SDK retry options\n    const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry);\n\n    if (event.RequestType === 'Create' || event.RequestType === 'Update') {\n      // Act on the target log group\n      await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions);\n      await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10));\n\n      if (event.RequestType === 'Create') {\n        // Set a retention policy of 1 day on the logs of this very function.\n        // Due to the async nature of the log group creation, the log group for this function might\n        // still be not created yet at this point. Therefore we attempt to create it.\n        // In case it is being created, createLogGroupSafe will handle the conflict.\n        const region = process.env.AWS_REGION;\n        await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions);\n        // If createLogGroupSafe fails, the log group is not created even after multiple attempts.\n        // In this case we have nothing to set the retention policy on but an exception will skip\n        // the next line.\n        await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1);\n      }\n    }\n\n    //When the requestType is delete, delete the log group if the removal policy is delete\n    if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') {\n      await deleteLogGroup(logGroupName, logGroupRegion, retryOptions);\n      //else retain the log group\n    }\n\n    await respond('SUCCESS', 'OK', logGroupName);\n  } catch (e) {\n    console.log(e);\n\n    await respond('FAILED', e.message, event.ResourceProperties.LogGroupName);\n  }\n\n  function respond(responseStatus: string, reason: string, physicalResourceId: string) {\n    const responseBody = JSON.stringify({\n      Status: responseStatus,\n      Reason: reason,\n      PhysicalResourceId: physicalResourceId,\n      StackId: event.StackId,\n      RequestId: event.RequestId,\n      LogicalResourceId: event.LogicalResourceId,\n      Data: {\n        // Add log group name as part of the response so that it's available via Fn::GetAtt\n        LogGroupName: event.ResourceProperties.LogGroupName,\n      },\n    });\n\n    console.log('Responding', responseBody);\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const parsedUrl = require('url').parse(event.ResponseURL);\n    const requestOptions = {\n      hostname: parsedUrl.hostname,\n      path: parsedUrl.path,\n      method: 'PUT',\n      headers: { 'content-type': '', 'content-length': responseBody.length },\n    };\n\n    return new Promise((resolve, reject) => {\n      try {\n        // eslint-disable-next-line @typescript-eslint/no-require-imports\n        const request = require('https').request(requestOptions, resolve);\n        request.on('error', reject);\n        request.write(responseBody);\n        request.end();\n      } catch (e) {\n        reject(e);\n      }\n    });\n  }\n\n  function parseRetryOptions(rawOptions: any): SdkRetryOptions {\n    const retryOptions: SdkRetryOptions = {};\n    if (rawOptions) {\n      if (rawOptions.maxRetries) {\n        retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10);\n      }\n      if (rawOptions.base) {\n        retryOptions.retryOptions = {\n          base: parseInt(rawOptions.base, 10),\n        };\n      }\n    }\n    return retryOptions;\n  }\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts new file mode 100644 index 0000000000000..1bb38a9f3d774 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347/index.ts @@ -0,0 +1,221 @@ +/* eslint-disable no-console */ + +// eslint-disable-next-line import/no-extraneous-dependencies +import * as AWS from 'aws-sdk'; +// eslint-disable-next-line import/no-extraneous-dependencies +import type { RetryDelayOptions } from 'aws-sdk/lib/config-base'; + +interface SdkRetryOptions { + maxRetries?: number; + retryOptions?: RetryDelayOptions; +} + +/** + * Creates a log group and doesn't throw if it exists. + * + * @param logGroupName the name of the log group to create. + * @param region to create the log group in + * @param options CloudWatch API SDK options. + */ +async function createLogGroupSafe(logGroupName: string, region?: string, options?: SdkRetryOptions) { + // If we set the log retention for a lambda, then due to the async nature of + // Lambda logging there could be a race condition when the same log group is + // already being created by the lambda execution. This can sometime result in + // an error "OperationAbortedException: A conflicting operation is currently + // in progress...Please try again." + // To avoid an error, we do as requested and try again. + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.createLogGroup({ logGroupName }).promise(); + return; + } catch (error) { + if (error.code === 'ResourceAlreadyExistsException') { + // The log group is already created by the lambda execution + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +//delete a log group +async function deleteLogGroup(logGroupName: string, region?: string, options?: SdkRetryOptions) { + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + await cloudwatchlogs.deleteLogGroup({ logGroupName }).promise(); + return; + } catch (error) { + if (error.code === 'ResourceNotFoundException') { + // The log group doesn't exist + return; + } + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being deleted by another execution but we are out of retries + throw new Error('Out of attempts to delete a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +/** + * Puts or deletes a retention policy on a log group. + * + * @param logGroupName the name of the log group to create + * @param region the region of the log group + * @param options CloudWatch API SDK options. + * @param retentionInDays the number of days to retain the log events in the specified log group. + */ +async function setRetentionPolicy(logGroupName: string, region?: string, options?: SdkRetryOptions, retentionInDays?: number) { + // The same as in createLogGroupSafe(), here we could end up with the race + // condition where a log group is either already being created or its retention + // policy is being updated. This would result in an OperationAbortedException, + // which we will try to catch and retry the command a number of times before failing + let retryCount = options?.maxRetries == undefined ? 10 : options.maxRetries; + const delay = options?.retryOptions?.base == undefined ? 10 : options.retryOptions.base; + do { + try { + const cloudwatchlogs = new AWS.CloudWatchLogs({ apiVersion: '2014-03-28', region, ...options }); + if (!retentionInDays) { + await cloudwatchlogs.deleteRetentionPolicy({ logGroupName }).promise(); + } else { + await cloudwatchlogs.putRetentionPolicy({ logGroupName, retentionInDays }).promise(); + } + return; + + } catch (error) { + if (error.code === 'OperationAbortedException') { + if (retryCount > 0) { + retryCount--; + await new Promise(resolve => setTimeout(resolve, delay)); + continue; + } else { + // The log group is still being created by another execution but we are out of retries + throw new Error('Out of attempts to create a logGroup'); + } + } + throw error; + } + } while (true); // exit happens on retry count check +} + +export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) { + try { + console.log(JSON.stringify({ ...event, ResponseURL: '...' })); + + // The target log group + const logGroupName = event.ResourceProperties.LogGroupName; + + // The region of the target log group + const logGroupRegion = event.ResourceProperties.LogGroupRegion; + + // Parse to AWS SDK retry options + const retryOptions = parseRetryOptions(event.ResourceProperties.SdkRetry); + + if (event.RequestType === 'Create' || event.RequestType === 'Update') { + // Act on the target log group + await createLogGroupSafe(logGroupName, logGroupRegion, retryOptions); + await setRetentionPolicy(logGroupName, logGroupRegion, retryOptions, parseInt(event.ResourceProperties.RetentionInDays, 10)); + + if (event.RequestType === 'Create') { + // Set a retention policy of 1 day on the logs of this very function. + // Due to the async nature of the log group creation, the log group for this function might + // still be not created yet at this point. Therefore we attempt to create it. + // In case it is being created, createLogGroupSafe will handle the conflict. + const region = process.env.AWS_REGION; + await createLogGroupSafe(`/aws/lambda/${context.functionName}`, region, retryOptions); + // If createLogGroupSafe fails, the log group is not created even after multiple attempts. + // In this case we have nothing to set the retention policy on but an exception will skip + // the next line. + await setRetentionPolicy(`/aws/lambda/${context.functionName}`, region, retryOptions, 1); + } + } + + //When the requestType is delete, delete the log group if the removal policy is delete + if (event.RequestType === 'Delete' && event.ResourceProperties.RemovalPolicy === 'destroy') { + await deleteLogGroup(logGroupName, logGroupRegion, retryOptions); + //else retain the log group + } + + await respond('SUCCESS', 'OK', logGroupName); + } catch (e) { + console.log(e); + + await respond('FAILED', e.message, event.ResourceProperties.LogGroupName); + } + + function respond(responseStatus: string, reason: string, physicalResourceId: string) { + const responseBody = JSON.stringify({ + Status: responseStatus, + Reason: reason, + PhysicalResourceId: physicalResourceId, + StackId: event.StackId, + RequestId: event.RequestId, + LogicalResourceId: event.LogicalResourceId, + Data: { + // Add log group name as part of the response so that it's available via Fn::GetAtt + LogGroupName: event.ResourceProperties.LogGroupName, + }, + }); + + console.log('Responding', responseBody); + + // eslint-disable-next-line @typescript-eslint/no-require-imports + const parsedUrl = require('url').parse(event.ResponseURL); + const requestOptions = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + + return new Promise((resolve, reject) => { + try { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const request = require('https').request(requestOptions, resolve); + request.on('error', reject); + request.write(responseBody); + request.end(); + } catch (e) { + reject(e); + } + }); + } + + function parseRetryOptions(rawOptions: any): SdkRetryOptions { + const retryOptions: SdkRetryOptions = {}; + if (rawOptions) { + if (rawOptions.maxRetries) { + retryOptions.maxRetries = parseInt(rawOptions.maxRetries, 10); + } + if (rawOptions.base) { + retryOptions.retryOptions = { + base: parseInt(rawOptions.base, 10), + }; + } + } + return retryOptions; + } +} diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/cdk.out b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/cdk.out new file mode 100644 index 0000000000000..8ecc185e9dbee --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/integ.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/integ.json new file mode 100644 index 0000000000000..46d61a98f2f47 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/integ.json @@ -0,0 +1,13 @@ +{ + "version": "21.0.0", + "testCases": { + "DependsOnTest/DefaultTest": { + "stacks": [ + "replace-depends-on-test", + "nested-stack-depends-test" + ], + "assertionStack": "DependsOnTest/DefaultTest/DeployAssert", + "assertionStackName": "DependsOnTestDefaultTestDeployAssert3B3B50E2" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/manifest.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/manifest.json new file mode 100644 index 0000000000000..f546ab43d55c3 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/manifest.json @@ -0,0 +1,224 @@ +{ + "version": "21.0.0", + "artifacts": { + "replace-depends-on-test.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "replace-depends-on-test.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "replace-depends-on-test": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "replace-depends-on-test.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "replace-depends-on-test.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "replace-depends-on-test.assets" + ], + "metadata": { + "/replace-depends-on-test/MyLambda/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaServiceRole4539ECB6" + } + ], + "/replace-depends-on-test/MyLambda/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaCCE802FB" + } + ], + "/replace-depends-on-test/MyLambda/LogRetention/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyLambdaLogRetention48BA931C" + } + ], + "/replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ], + "/replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A" + } + ], + "/replace-depends-on-test/CustomPolicy": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomPolicy" + } + ], + "/replace-depends-on-test/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/replace-depends-on-test/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "replace-depends-on-test" + }, + "nested-stack-depends-test.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "nested-stack-depends-test.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "nested-stack-depends-test": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "nested-stack-depends-test.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "nested-stack-depends-test.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "nested-stack-depends-test.assets" + ], + "metadata": { + "/nested-stack-depends-test/Stack1/Lambda1/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda1ServiceRoleF188C4B8" + } + ], + "/nested-stack-depends-test/Stack1/Lambda1/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda1DB8E9965" + } + ], + "/nested-stack-depends-test/Stack1.NestedStack/Stack1.NestedStackResource": [ + { + "type": "aws:cdk:logicalId", + "data": "Stack1NestedStackStack1NestedStackResource256CB8C4" + } + ], + "/nested-stack-depends-test/Stack2/Lambda2/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda2ServiceRole31A072E1" + } + ], + "/nested-stack-depends-test/Stack2/Lambda2/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Lambda217CFB423" + } + ], + "/nested-stack-depends-test/Stack2.NestedStack/Stack2.NestedStackResource": [ + { + "type": "aws:cdk:logicalId", + "data": "Stack2NestedStackStack2NestedStackResource9F0678CF" + } + ], + "/nested-stack-depends-test/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/nested-stack-depends-test/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "nested-stack-depends-test" + }, + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "DependsOnTestDefaultTestDeployAssert3B3B50E2": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "DependsOnTestDefaultTestDeployAssert3B3B50E2.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "DependsOnTestDefaultTestDeployAssert3B3B50E2.assets" + ], + "metadata": { + "/DependsOnTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/DependsOnTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "DependsOnTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.assets.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.assets.json new file mode 100644 index 0000000000000..7f73a85d9077c --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.assets.json @@ -0,0 +1,45 @@ +{ + "version": "21.0.0", + "files": { + "d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2": { + "source": { + "path": "nestedstackdependstestStack1DE6783D8.nested.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431": { + "source": { + "path": "nestedstackdependstestStack2A36722CF.nested.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a": { + "source": { + "path": "nested-stack-depends-test.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "c4e1a28f651cf56ff9d696ef9e4ce1c771896e999777d763e55f06b089b7c81a.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.template.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.template.json new file mode 100644 index 0000000000000..cf6d4b0d46cee --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nested-stack-depends-test.template.json @@ -0,0 +1,95 @@ +{ + "Resources": { + "Stack1NestedStackStack1NestedStackResource256CB8C4": { + "Type": "AWS::CloudFormation::Stack", + "Properties": { + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json" + ] + ] + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "Stack2NestedStackStack2NestedStackResource9F0678CF": { + "Type": "AWS::CloudFormation::Stack", + "Properties": { + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json" + ] + ] + } + }, + "DependsOn": [ + "Stack1NestedStackStack1NestedStackResource256CB8C4" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json new file mode 100644 index 0000000000000..8b39a08a02151 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack1DE6783D8.nested.template.json @@ -0,0 +1,54 @@ +{ + "Resources": { + "Lambda1ServiceRoleF188C4B8": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "Lambda1DB8E9965": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "Lambda1ServiceRoleF188C4B8", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "Lambda1ServiceRoleF188C4B8" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json new file mode 100644 index 0000000000000..d1b0202b0afc1 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/nestedstackdependstestStack2A36722CF.nested.template.json @@ -0,0 +1,54 @@ +{ + "Resources": { + "Lambda2ServiceRole31A072E1": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "Lambda217CFB423": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "Lambda2ServiceRole31A072E1", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "Lambda2ServiceRole31A072E1" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.assets.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.assets.json new file mode 100644 index 0000000000000..e2083cbfc507f --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.assets.json @@ -0,0 +1,32 @@ +{ + "version": "21.0.0", + "files": { + "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347": { + "source": { + "path": "asset.d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af": { + "source": { + "path": "replace-depends-on-test.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "57d6494f80ed197e8ed81877d3521488a65bc202ee15ffb64f4e58eabff000af.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json new file mode 100644 index 0000000000000..5574a9b261d30 --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json @@ -0,0 +1,188 @@ +{ + "Resources": { + "MyLambdaServiceRole4539ECB6": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "MyLambdaCCE802FB": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "foo" + }, + "Role": { + "Fn::GetAtt": [ + "MyLambdaServiceRole4539ECB6", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "MyLambdaServiceRole4539ECB6" + ] + }, + "MyLambdaLogRetention48BA931C": { + "Type": "Custom::LogRetention", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A", + "Arn" + ] + }, + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/lambda/", + { + "Ref": "MyLambdaCCE802FB" + } + ] + ] + }, + "RetentionInDays": 1 + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Handler": "index.handler", + "Runtime": "nodejs14.x", + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "d01c24641c7d8cb6488393ffceaefff282370a9a522bf9d77b21da73fa257347.zip" + }, + "Role": { + "Fn::GetAtt": [ + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB", + "Arn" + ] + } + }, + "DependsOn": [ + "CustomPolicy", + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + ] + }, + "CustomPolicy": { + "Type": "AWS::IAM::ManagedPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "logs:DeleteRetentionPolicy", + "logs:PutRetentionPolicy" + ], + "Effect": "Allow", + "Resource": "*" + } + ], + "Version": "2012-10-17" + }, + "Roles": [ + { + "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/tree.json b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/tree.json new file mode 100644 index 0000000000000..45159d69f419f --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.js.snapshot/tree.json @@ -0,0 +1,664 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "replace-depends-on-test": { + "id": "replace-depends-on-test", + "path": "replace-depends-on-test", + "children": { + "MyLambda": { + "id": "MyLambda", + "path": "replace-depends-on-test/MyLambda", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "replace-depends-on-test/MyLambda/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "replace-depends-on-test/MyLambda/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "MyLambdaServiceRole4539ECB6", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + }, + "LogRetention": { + "id": "LogRetention", + "path": "replace-depends-on-test/MyLambda/LogRetention", + "children": { + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/MyLambda/LogRetention/Resource", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-logs.LogRetention", + "version": "0.0.0" + } + }, + "LogGroup": { + "id": "LogGroup", + "path": "replace-depends-on-test/MyLambda/LogGroup", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + }, + "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a": { + "id": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a", + "children": { + "Code": { + "id": "Code", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "ServiceRole": { + "id": "ServiceRole", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "replace-depends-on-test/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/Resource", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.154" + } + }, + "CustomPolicy": { + "id": "CustomPolicy", + "path": "replace-depends-on-test/CustomPolicy", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "logs:DeleteRetentionPolicy", + "logs:PutRetentionPolicy" + ], + "Effect": "Allow", + "Resource": "*" + } + ], + "Version": "2012-10-17" + }, + "roles": [ + { + "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnManagedPolicy", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "replace-depends-on-test/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "replace-depends-on-test/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "nested-stack-depends-test": { + "id": "nested-stack-depends-test", + "path": "nested-stack-depends-test", + "children": { + "Stack1": { + "id": "Stack1", + "path": "nested-stack-depends-test/Stack1", + "children": { + "Lambda1": { + "id": "Lambda1", + "path": "nested-stack-depends-test/Stack1/Lambda1", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "nested-stack-depends-test/Stack1/Lambda1/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "nested-stack-depends-test/Stack1/Lambda1/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack1/Lambda1/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack1/Lambda1/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "Lambda1ServiceRoleF188C4B8", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.NestedStack", + "version": "0.0.0" + } + }, + "Stack1.NestedStack": { + "id": "Stack1.NestedStack", + "path": "nested-stack-depends-test/Stack1.NestedStack", + "children": { + "Stack1.NestedStackResource": { + "id": "Stack1.NestedStackResource", + "path": "nested-stack-depends-test/Stack1.NestedStack/Stack1.NestedStackResource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", + "aws:cdk:cloudformation:props": { + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/d80f241007964c163f30b1e491fb22d85422a376901bdf57f34ef94d71dcf4a2.json" + ] + ] + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CfnStack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.154" + } + }, + "Stack2": { + "id": "Stack2", + "path": "nested-stack-depends-test/Stack2", + "children": { + "Lambda2": { + "id": "Lambda2", + "path": "nested-stack-depends-test/Stack2/Lambda2", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "nested-stack-depends-test/Stack2/Lambda2/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "nested-stack-depends-test/Stack2/Lambda2/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack2/Lambda2/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "nested-stack-depends-test/Stack2/Lambda2/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "foo" + }, + "role": { + "Fn::GetAtt": [ + "Lambda2ServiceRole31A072E1", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "nodejs14.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.NestedStack", + "version": "0.0.0" + } + }, + "Stack2.NestedStack": { + "id": "Stack2.NestedStack", + "path": "nested-stack-depends-test/Stack2.NestedStack", + "children": { + "Stack2.NestedStackResource": { + "id": "Stack2.NestedStackResource", + "path": "nested-stack-depends-test/Stack2.NestedStack/Stack2.NestedStackResource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", + "aws:cdk:cloudformation:props": { + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/caff9f6719171b7d0611de54f70e0ef42e8e4f56432babf0d4beae6cb8bba431.json" + ] + ] + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CfnStack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.154" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "nested-stack-depends-test/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "nested-stack-depends-test/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "DependsOnTest": { + "id": "DependsOnTest", + "path": "DependsOnTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "DependsOnTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "DependsOnTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.154" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "DependsOnTest/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "DependsOnTest/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "DependsOnTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.154" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.ts b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.ts new file mode 100644 index 0000000000000..b8ea66419e9cc --- /dev/null +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.core-deps.ts @@ -0,0 +1,74 @@ +/* + * Real replaceDependency use case to test + * + * TestStack verification steps: + * - Deploy with `--no-clean` + * - Verify that the CloudFormation stack LogRetention CfnResource dependencies list CustomPolicy, not DefaultPolicy + * + * TestNestedStack verification steps: + * - Deploy with `--no-clean` + * - Verify that Stack2 lists Stack1 in DependsOn + */ +import * as iam from '@aws-cdk/aws-iam'; +import * as lambda from '@aws-cdk/aws-lambda'; +import { RetentionDays } from '@aws-cdk/aws-logs'; +import { App, Stack, CfnResource, NestedStack } from '@aws-cdk/core'; +import * as integ from '@aws-cdk/integ-tests'; +import { Construct } from 'constructs'; + +class TestStack extends Stack { + constructor(scope: Construct, id: string) { + super(scope, id); + new lambda.Function(this, 'MyLambda', { + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.NODEJS_14_X, + logRetention: RetentionDays.ONE_DAY, + }); + const logRetentionFunction = this.node.tryFindChild('LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a')!; + const serviceRole = logRetentionFunction.node.tryFindChild('ServiceRole') as iam.Role; + const defaultPolicy = serviceRole.node.tryFindChild('DefaultPolicy')!.node.defaultChild! as iam.CfnPolicy; + const customPolicy = new iam.CfnManagedPolicy(this, 'CustomPolicy', { + policyDocument: defaultPolicy.policyDocument, + roles: defaultPolicy.roles, + }); + const logRetentionResource = logRetentionFunction.node.tryFindChild('Resource') as CfnResource; + // Without replacing the dependency, Cfn will reject the template because it references this non-existent logical id + logRetentionResource.replaceDependency(defaultPolicy, customPolicy); + serviceRole.node.tryRemoveChild('DefaultPolicy'); + } +} + +class TestNestedStack extends Stack { + constructor(scope: Construct, id: string) { + super(scope, id); + const stack1 = new NestedStack(this, 'Stack1'); + const stack2 = new NestedStack(this, 'Stack2'); + const resource1 = new lambda.Function(stack1, 'Lambda1', { + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.NODEJS_14_X, + }).node.defaultChild! as CfnResource; + const resource2 = new lambda.Function(stack2, 'Lambda2', { + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.NODEJS_14_X, + }).node.defaultChild! as CfnResource; + + // The following two statements should cancel each other out + resource1.addDependency(resource2); + resource1.removeDependency(resource2); + + resource2.addDependency(resource1); + } +} + +const app = new App(); +const stack = new TestStack(app, 'replace-depends-on-test'); +const nestedStack = new TestNestedStack(app, 'nested-stack-depends-test'); + +new integ.IntegTest(app, 'DependsOnTest', { + testCases: [stack, nestedStack], +}); + +app.synth(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts index 631c3d6f84c26..c5239f88f3f9f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts @@ -103,8 +103,8 @@ const beanstalkEnv = new elasticbeanstalk.CfnEnvironment(stack, 'beanstlk-env', ], }); -beanstalkEnv.addDependsOn(instanceProfile); -beanstalkEnv.addDependsOn(beanstalkApp); +beanstalkEnv.addDependency(instanceProfile); +beanstalkEnv.addDependency(beanstalkApp); const pipeline = new codepipeline.Pipeline(stack, 'Pipeline', { artifactBucket: bucket, @@ -144,4 +144,4 @@ new integ.IntegTest(app, 'codepipeline-elastic-beanstalk-deploy', { stackUpdateWorkflow: false, }); -app.synth(); \ No newline at end of file +app.synth(); diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.dualstack.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.dualstack.ts index f19c0d7cbaa70..40034ed72c1c8 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.dualstack.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.dualstack.ts @@ -94,7 +94,7 @@ vpc.publicSubnets.forEach((subnet, idx) => { cfnSubnet.ipv6CidrBlock = cdk.Fn.select(idx, ipv6Cidrs); // The subnet depends on the ipv6 cidr being allocated. - cfnSubnet.addDependsOn(ipv6Block); + cfnSubnet.addDependency(ipv6Block); group1.node.addDependency(subnet); group2.node.addDependency(subnet); diff --git a/packages/@aws-cdk/aws-logs/lib/log-retention.ts b/packages/@aws-cdk/aws-logs/lib/log-retention.ts index 0f1c8ebcd8902..7350d089488c3 100644 --- a/packages/@aws-cdk/aws-logs/lib/log-retention.ts +++ b/packages/@aws-cdk/aws-logs/lib/log-retention.ts @@ -186,10 +186,10 @@ class LogRetentionFunction extends Construct implements cdk.ITaggable { // Function dependencies role.node.children.forEach((child) => { if (cdk.CfnResource.isCfnResource(child)) { - resource.addDependsOn(child); + resource.addDependency(child); } if (Construct.isConstruct(child) && child.node.defaultChild && cdk.CfnResource.isCfnResource(child.node.defaultChild)) { - resource.addDependsOn(child.node.defaultChild); + resource.addDependency(child.node.defaultChild); } }); } diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/private/association-manager.ts b/packages/@aws-cdk/aws-servicecatalog/lib/private/association-manager.ts index dd44ef0f022fc..d9bd1e68475d8 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/private/association-manager.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/private/association-manager.ts @@ -50,7 +50,7 @@ export class AssociationManager { }); // Add dependsOn to force proper order in deployment. - constraint.addDependsOn(association.cfnPortfolioProductAssociation); + constraint.addDependency(association.cfnPortfolioProductAssociation); } else { throw new Error(`Cannot have multiple tag update constraints for association ${this.prettyPrintAssociation(portfolio, product)}`); } @@ -70,7 +70,7 @@ export class AssociationManager { }); // Add dependsOn to force proper order in deployment. - constraint.addDependsOn(association.cfnPortfolioProductAssociation); + constraint.addDependency(association.cfnPortfolioProductAssociation); } else { throw new Error(`Topic ${topic.node.path} is already subscribed to association ${this.prettyPrintAssociation(portfolio, product)}`); } @@ -93,7 +93,7 @@ export class AssociationManager { }); // Add dependsOn to force proper order in deployment. - constraint.addDependsOn(association.cfnPortfolioProductAssociation); + constraint.addDependency(association.cfnPortfolioProductAssociation); } else { throw new Error(`Provisioning rule ${options.rule.ruleName} already configured on association ${this.prettyPrintAssociation(portfolio, product)}`); } @@ -133,7 +133,7 @@ export class AssociationManager { }); // Add dependsOn to force proper order in deployment. - constraint.addDependsOn(association.cfnPortfolioProductAssociation); + constraint.addDependency(association.cfnPortfolioProductAssociation); } else { throw new Error(`Cannot configure multiple StackSet deployment constraints for association ${this.prettyPrintAssociation(portfolio, product)}`); } @@ -173,7 +173,7 @@ export class AssociationManager { }); // Add dependsOn to force proper order in deployment. - constraint.addDependsOn(association.cfnPortfolioProductAssociation); + constraint.addDependency(association.cfnPortfolioProductAssociation); } else { throw new Error(`Cannot set multiple launch roles for association ${this.prettyPrintAssociation(portfolio, product)}`); } diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/databrew/integ.start-job-run.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/databrew/integ.start-job-run.ts index 973f405880c2c..056d97535a81e 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/databrew/integ.start-job-run.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/databrew/integ.start-job-run.ts @@ -86,8 +86,8 @@ class GlueDataBrewJobStack extends cdk.Stack { datasetName: dataset.name, recipeName: recipe.name, }); - project.addDependsOn(dataset); - project.addDependsOn(recipe); + project.addDependency(dataset); + project.addDependency(recipe); const job = new databrew.CfnJob(this, 'DataBrew Job', { name: 'job-1', @@ -100,7 +100,7 @@ class GlueDataBrewJobStack extends cdk.Stack { }, }], }); - job.addDependsOn(project); + job.addDependency(project); const startGlueDataBrewJob = new GlueDataBrewStartJobRun(this, 'Start DataBrew Job run', { name: job.name, diff --git a/packages/@aws-cdk/core/README.md b/packages/@aws-cdk/core/README.md index da983bbf62ca5..c9a97272cf271 100644 --- a/packages/@aws-cdk/core/README.md +++ b/packages/@aws-cdk/core/README.md @@ -460,6 +460,10 @@ A stack dependency has the following implications: automatically deploy `stackB`. - `stackB`'s deployment will be performed *before* `stackA`'s deployment. +### CfnResource Dependencies + +To make declaring dependencies between `CfnResource` objects easier, you can declare dependencies from one `CfnResource` object on another by using the `cfnResource1.addDependency(cfnResource2)` method. This method will work for resources both within the same stack and across stacks as it detects the relative location of the two resources and adds the dependency either to the resource or between the relevant stacks, as appropriate. If more complex logic is in needed, you can similarly remove, replace, or view dependencies between `CfnResource` objects with the `CfnResource` `removeDependency`, `replaceDependency`, and `obtainDependencies` methods, respectively. + ## Custom Resources Custom Resources are CloudFormation resources that are implemented by arbitrary @@ -885,13 +889,13 @@ rawBucket.cfnOptions.metadata = { ``` Resource dependencies (the `DependsOn` attribute) is modified using the -`cfnResource.addDependsOn` method: +`cfnResource.addDependency` method: ```ts const resourceA = new CfnResource(this, 'ResourceA', resourceProps); const resourceB = new CfnResource(this, 'ResourceB', resourceProps); -resourceB.addDependsOn(resourceA); +resourceB.addDependency(resourceA); ``` [cfn-resource-attributes]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-product-attribute-reference.html diff --git a/packages/@aws-cdk/core/lib/cfn-resource.ts b/packages/@aws-cdk/core/lib/cfn-resource.ts index ebd6e0825fdb8..b99053c40665c 100644 --- a/packages/@aws-cdk/core/lib/cfn-resource.ts +++ b/packages/@aws-cdk/core/lib/cfn-resource.ts @@ -6,7 +6,7 @@ import { CfnCondition } from './cfn-condition'; import { CfnRefElement } from './cfn-element'; import { CfnCreationPolicy, CfnDeletionPolicy, CfnUpdatePolicy } from './cfn-resource-policy'; import { Construct, IConstruct, Node } from 'constructs'; -import { addDependency } from './deps'; +import { addDependency, obtainDependencies, removeDependency } from './deps'; import { CfnReference } from './private/cfn-reference'; import { CLOUDFORMATION_TOKEN_RESOLVER } from './private/cloudformation-lang'; import { Reference } from './reference'; @@ -274,6 +274,16 @@ export class CfnResource extends CfnRefElement { this.addPropertyOverride(propertyPath, undefined); } + /** + * Indicates that this resource depends on another resource and cannot be + * provisioned unless the other resource has been successfully provisioned. + * + * @deprecated use addDependency + */ + public addDependsOn(target: CfnResource) { + return this.addDependency(target); + } + /** * Indicates that this resource depends on another resource and cannot be * provisioned unless the other resource has been successfully provisioned. @@ -281,13 +291,52 @@ export class CfnResource extends CfnRefElement { * This can be used for resources across stacks (or nested stack) boundaries * and the dependency will automatically be transferred to the relevant scope. */ - public addDependsOn(target: CfnResource) { + public addDependency(target: CfnResource) { + // skip this dependency if the target is not part of the output + if (!target.shouldSynthesize()) { + return; + } + + addDependency(this, target); + } + + /** + * Indicates that this resource no longer depends on another resource. + * + * This can be used for resources across stacks (including nested stacks) + * and the dependency will automatically be removed from the relevant scope. + */ + public removeDependency(target: CfnResource) : void { // skip this dependency if the target is not part of the output if (!target.shouldSynthesize()) { return; } - addDependency(this, target, `"${Node.of(this).path}" depends on "${Node.of(target).path}"`); + removeDependency(this, target); + } + + /** + * Retrieves an array of resources this resource depends on. + * + * This assembles dependencies on resources across stacks (including nested stacks) + * automatically. + */ + public obtainDependencies() { + return obtainDependencies(this); + } + + /** + * Replaces one dependency with another. + * @param target The dependency to replace + * @param newTarget The new dependency to add + */ + public replaceDependency(target: CfnResource, newTarget: CfnResource) : void { + if (this.obtainDependencies().includes(target)) { + this.removeDependency(target); + this.addDependency(newTarget); + } else { + throw new Error(`"${Node.of(this).path}" does not depend on "${Node.of(target).path}"`); + } } /** @@ -330,7 +379,7 @@ export class CfnResource extends CfnRefElement { * dependency between two resources that are directly defined in the same * stacks. * - * Use `resource.addDependsOn` to define the dependency between two resources, + * Use `resource.addDependency` to define the dependency between two resources, * which also takes stack boundaries into account. * * @internal @@ -339,6 +388,24 @@ export class CfnResource extends CfnRefElement { this.dependsOn.add(target); } + /** + * Get a shallow copy of dependencies between this resource and other resources + * in the same stack. + */ + public obtainResourceDependencies() { + return Array.from(this.dependsOn.values()); + } + + /** + * Remove a dependency between this resource and other resources in the same + * stack. + * + * @internal + */ + public _removeResourceDependency(target: CfnResource) { + this.dependsOn.delete(target); + } + /** * Emits CloudFormation for this resource. * @internal diff --git a/packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts b/packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts index aa39ffb609f27..593a88caf3d93 100644 --- a/packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts +++ b/packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts @@ -305,7 +305,7 @@ export class CustomResourceProvider extends Construct { }); if (this._role) { - handler.addDependsOn(this._role); + handler.addDependency(this._role); } if (this.node.tryGetContext(cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT)) { diff --git a/packages/@aws-cdk/core/lib/deps.ts b/packages/@aws-cdk/core/lib/deps.ts index e0ef970b6e359..23579a7a8a734 100644 --- a/packages/@aws-cdk/core/lib/deps.ts +++ b/packages/@aws-cdk/core/lib/deps.ts @@ -3,7 +3,7 @@ import { Stack } from './stack'; import { Stage } from './stage'; import { findLastCommonElement, pathToTopLevelStack as pathToRoot } from './util'; -type Element = CfnResource | Stack; +export type Element = CfnResource | Stack; /** * Adds a dependency between two resources or stacks, across stack and nested @@ -13,18 +13,53 @@ type Element = CfnResource | Stack; * - Try to find the deepest common stack between the two elements * - If there isn't a common stack, it means the elements belong to two * disjoined stack-trees and therefore we apply the dependency at the - * assembly/app level between the two topl-level stacks. + * assembly/app level between the two top-level stacks. * - If we did find a common stack, we apply the dependency as a CloudFormation * "DependsOn" between the resources that "represent" our source and target * either directly or through the AWS::CloudFormation::Stack resources that * "lead" to them. * - * @param source The source resource/stack (the depedent) + * @param source The source resource/stack (the dependent) * @param target The target resource/stack (the dependency) - * @param reason Optional resource to associate with the dependency for + */ +export function addDependency(source: Element, target: Element, reason?: string) { + operateOnDependency(DependencyOperation.ADD, source, target, reason); +} + +/** + * Removes a dependency between two resources or stacks, across stack and nested + * stack boundaries. + * + * The algorithm consists of: + * - Try to find the deepest common stack between the two elements + * - If there isn't a common stack, it means the elements belong to two + * disjoined stack-trees and therefore we applied the dependency at the + * assembly/app level between the two top-level stacks; remove it there. + * - If we did find a common stack, we applied the dependency as a CloudFormation + * "DependsOn" between the resources that "represent" our source and target + * either directly or through the AWS::CloudFormation::Stack resources that + * "lead" to them and must remove it there. + * + * @param source The source resource/stack (the dependent) + * @param target The target resource/stack (the dependency) + * @param reason Optional description to associate with the dependency for * diagnostics */ -export function addDependency(source: T, target: T, reason?: string) { +export function removeDependency(source: Element, target: Element) { + operateOnDependency(DependencyOperation.REMOVE, source, target); +} + +enum DependencyOperation { + ADD, + REMOVE +} + +/** + * Find the appropriate location for a dependency and add or remove it + * + * @internal + */ +function operateOnDependency(operation: DependencyOperation, source: Element, target: Element, description?: string) { if (source === target) { return; } @@ -36,7 +71,7 @@ export function addDependency(source: T, target: T, reason?: const targetStage = Stage.of(targetStack); if (sourceStage !== targetStage) { // eslint-disable-next-line max-len - throw new Error(`You cannot add a dependency from '${source.node.path}' (in ${describeStage(sourceStage)}) to '${target.node.path}' (in ${describeStage(targetStage)}): dependency cannot cross stage boundaries`); + throw new Error(`You cannot have a dependency from '${source.node.path}' (in ${describeStage(sourceStage)}) to '${target.node.path}' (in ${describeStage(targetStage)}): dependency cannot cross stage boundaries`); } // find the deepest common stack between the two elements @@ -44,12 +79,25 @@ export function addDependency(source: T, target: T, reason?: const targetPath = pathToRoot(targetStack); const commonStack = findLastCommonElement(sourcePath, targetPath); - // if there is no common stack, then define a assembly-level dependency + // if there is no common stack, then look for an assembly-level dependency // between the two top-level stacks if (!commonStack) { const topLevelSource = sourcePath[0]; // first path element is the top-level stack const topLevelTarget = targetPath[0]; - topLevelSource._addAssemblyDependency(topLevelTarget, reason); + const reason = { source, target, description }; + switch (operation) { + case DependencyOperation.ADD: { + topLevelSource._addAssemblyDependency(topLevelTarget, reason); + break; + } + case DependencyOperation.REMOVE: { + topLevelSource._removeAssemblyDependency(topLevelTarget, reason); + break; + } + default: { + throw new Error(`Unsupported dependency operation: ${operation}`); + } + } return; } @@ -70,31 +118,67 @@ export function addDependency(source: T, target: T, reason?: // `source` is a direct or indirect nested stack of `target`, and this is not // possible (nested stacks cannot depend on their parents). if (commonStack === target) { - throw new Error(`Nested stack '${sourceStack.node.path}' cannot depend on a parent stack '${targetStack.node.path}': ${reason}`); + throw new Error(`Nested stack '${sourceStack.node.path}' cannot depend on a parent stack '${targetStack.node.path}'`); } // we have a common stack from which we can reach both `source` and `target` // now we need to find two resources which are defined directly in this stack // and which can "lead us" to the source/target. - const sourceResource = resourceInCommonStackFor(source); - const targetResource = resourceInCommonStackFor(target); - sourceResource._addResourceDependency(targetResource); - - function resourceInCommonStackFor(element: CfnResource | Stack): CfnResource { - const resource = Stack.isStack(element) ? element.nestedStackResource : element; - if (!resource) { - throw new Error('assertion failure'); // see "assertion" above + const sourceResource = resourceInCommonStackFor(source, commonStack); + const targetResource = resourceInCommonStackFor(target, commonStack); + switch (operation) { + case DependencyOperation.ADD: { + sourceResource._addResourceDependency(targetResource); + break; + } + case DependencyOperation.REMOVE: { + sourceResource._removeResourceDependency(targetResource); + break; } + default: { + throw new Error(`Unsupported dependency operation: ${operation}`); + } + } +} - const resourceStack = Stack.of(resource); +/** + * Get a list of all resource-to-resource dependencies assembled from this Element, Stack or assembly-dependencies + * @param source The source resource/stack (the dependent) + */ +export function obtainDependencies(source: Element) { + let dependencies: Element[] = []; + if (source instanceof CfnResource) { + dependencies = source.obtainResourceDependencies(); + } - // we reached a resource defined in the common stack - if (commonStack === resourceStack) { - return resource; - } + let stacks = pathToRoot(Stack.of(source)); + stacks.forEach((stack) => { + dependencies = [...dependencies, ...stack._obtainAssemblyDependencies({ source: source })]; + }); - return resourceInCommonStackFor(resourceStack); + return dependencies; +} + +/** + * Find the resource in a common stack that 'points' to the given element + * + * @internal + */ +function resourceInCommonStackFor(element: Element, commonStack: Stack): CfnResource { + const resource: CfnResource = (Stack.isStack(element) ? element.nestedStackResource : element) as CfnResource; + if (!resource) { + // see "assertion" in operateOnDependency above + throw new Error(`Unexpected value for resource when looking at ${element}!`); } + + const resourceStack = Stack.of(resource); + + // we reached a resource defined in the common stack + if (commonStack === resourceStack) { + return resource; + } + + return resourceInCommonStackFor(resourceStack, commonStack); } /** diff --git a/packages/@aws-cdk/core/lib/index.ts b/packages/@aws-cdk/core/lib/index.ts index 378017a1fdefb..11a30ae57a65e 100644 --- a/packages/@aws-cdk/core/lib/index.ts +++ b/packages/@aws-cdk/core/lib/index.ts @@ -34,6 +34,7 @@ export * from './duration'; export * from './expiration'; export * from './size'; export * from './stack-trace'; +export { Element } from './deps'; export * from './app'; export * from './context-provider'; diff --git a/packages/@aws-cdk/core/lib/private/prepare-app.ts b/packages/@aws-cdk/core/lib/private/prepare-app.ts index 7e1959b4a4293..e7d73ee631cb2 100644 --- a/packages/@aws-cdk/core/lib/private/prepare-app.ts +++ b/packages/@aws-cdk/core/lib/private/prepare-app.ts @@ -22,7 +22,7 @@ export function prepareApp(root: IConstruct) { for (const target of targetCfnResources) { for (const source of sourceCfnResources) { - source.addDependsOn(target); + source.addDependency(target); } } } diff --git a/packages/@aws-cdk/core/lib/stack.ts b/packages/@aws-cdk/core/lib/stack.ts index e1e71d06ebdf3..7d7997bd3d328 100644 --- a/packages/@aws-cdk/core/lib/stack.ts +++ b/packages/@aws-cdk/core/lib/stack.ts @@ -859,32 +859,137 @@ export class Stack extends Construct implements ITaggable { * * @internal */ - public _addAssemblyDependency(target: Stack, reason?: string) { + public _addAssemblyDependency(target: Stack, reason: StackDependencyReason = {}) { // defensive: we should never get here for nested stacks if (this.nested || target.nested) { throw new Error('Cannot add assembly-level dependencies for nested stacks'); } + // Fill in reason details if not provided + if (!reason.source) { + reason.source = this; + } + if (!reason.target) { + reason.target = target; + } + if (!reason.description) { + reason.description = 'no description provided'; + } - reason = reason || 'dependency added using stack.addDependency()'; const cycle = target.stackDependencyReasons(this); if (cycle !== undefined) { + const cycleDescription = cycle.map((cycleReason) => { + return cycleReason.description; + }).join(', '); // eslint-disable-next-line max-len - throw new Error(`'${target.node.path}' depends on '${this.node.path}' (${cycle.join(', ')}). Adding this dependency (${reason}) would create a cyclic reference.`); + throw new Error(`'${target.node.path}' depends on '${this.node.path}' (${cycleDescription}). Adding this dependency (${reason.description}) would create a cyclic reference.`); } let dep = this._stackDependencies[Names.uniqueId(target)]; if (!dep) { - dep = this._stackDependencies[Names.uniqueId(target)] = { - stack: target, - reasons: [], - }; + dep = this._stackDependencies[Names.uniqueId(target)] = { stack: target, reasons: [] }; + } + // Check for a duplicate reason already existing + let existingReasons: Set = new Set(); + dep.reasons.forEach((existingReason) => { + if (existingReason.source == reason.source && existingReason.target == reason.target) { + existingReasons.add(existingReason); + } + }); + if (existingReasons.size > 0) { + // Dependency already exists and for the provided reason + return; } - dep.reasons.push(reason); if (process.env.CDK_DEBUG_DEPS) { // eslint-disable-next-line no-console - console.error(`[CDK_DEBUG_DEPS] stack "${this.node.path}" depends on "${target.node.path}" because: ${reason}`); + console.error(`[CDK_DEBUG_DEPS] stack "${reason.source.node.path}" depends on "${reason.target.node.path}"`); + } + } + + /** + * Called implicitly by the `obtainDependencies` helper function in order to + * collect resource dependencies across two top-level stacks at the assembly level. + * + * Use `stack.obtainDependencies` to see the dependencies between any two stacks. + * + * @internal + */ + public _obtainAssemblyDependencies(reasonFilter: StackDependencyReason): Element[] { + if (!reasonFilter.source) { + throw new Error('reasonFilter.source must be defined!'); + } + // Assume reasonFilter has only source defined + let dependencies: Set = new Set(); + Object.values(this._stackDependencies).forEach((dep) => { + dep.reasons.forEach((reason) => { + if (reasonFilter.source == reason.source) { + if (!reason.target) { + throw new Error(`Encountered an invalid dependency target from source '${reasonFilter.source!.node.path}'`); + } + dependencies.add(reason.target); + } + }); + }); + return Array.from(dependencies); + } + + /** + * Called implicitly by the `removeDependency` helper function in order to + * remove a dependency between two top-level stacks at the assembly level. + * + * Use `stack.addDependency` to define the dependency between any two stacks, + * and take into account nested stack relationships. + * + * @internal + */ + public _removeAssemblyDependency(target: Stack, reasonFilter: StackDependencyReason={}) { + // defensive: we should never get here for nested stacks + if (this.nested || target.nested) { + throw new Error('There cannot be assembly-level dependencies for nested stacks'); + } + // No need to check for a dependency cycle when removing one + + // Fill in reason details if not provided + if (!reasonFilter.source) { + reasonFilter.source = this; + } + if (!reasonFilter.target) { + reasonFilter.target = target; + } + + let dep = this._stackDependencies[Names.uniqueId(target)]; + if (!dep) { + // Dependency doesn't exist - return now + return; + } + + // Find and remove the specified reason from the dependency + let matchedReasons: Set = new Set(); + dep.reasons.forEach((reason) => { + if (reasonFilter.source == reason.source && reasonFilter.target == reason.target) { + matchedReasons.add(reason); + } + }); + if (matchedReasons.size > 1) { + throw new Error(`There cannot be more than one reason for dependency removal, found: ${matchedReasons}`); + } + if (matchedReasons.size == 0) { + // Reason is already not there - return now + return; + } + let matchedReason = Array.from(matchedReasons)[0]; + + let index = dep.reasons.indexOf(matchedReason, 0); + dep.reasons.splice(index, 1); + // If that was the last reason, remove the dependency + if (dep.reasons.length == 0) { + delete this._stackDependencies[Names.uniqueId(target)]; + } + + if (process.env.CDK_DEBUG_DEPS) { + // eslint-disable-next-line no-console + console.log(`[CDK_DEBUG_DEPS] stack "${this.node.path}" no longer depends on "${target.node.path}" because: ${reasonFilter}`); } } @@ -1261,7 +1366,7 @@ export class Stack extends Construct implements ITaggable { * Returns the list of reasons on the dependency path, or undefined * if there is no dependency. */ - private stackDependencyReasons(other: Stack): string[] | undefined { + private stackDependencyReasons(other: Stack): StackDependencyReason[] | undefined { if (this === other) { return []; } for (const dep of Object.values(this._stackDependencies)) { const ret = dep.stack.stackDependencyReasons(other); @@ -1537,9 +1642,15 @@ function generateExportName(stackExports: Construct, id: string) { return prefix + localPart.slice(Math.max(0, localPart.length - maxLength + prefix.length)); } +interface StackDependencyReason { + source?: Element; + target?: Element; + description?: string; +} + interface StackDependency { stack: Stack; - reasons: string[]; + reasons: StackDependencyReason[]; } interface ResolvedExport { @@ -1575,7 +1686,7 @@ function count(xs: string[]): Record { // These imports have to be at the end to prevent circular imports import { CfnOutput } from './cfn-output'; -import { addDependency } from './deps'; +import { addDependency, Element } from './deps'; import { FileSystem } from './fs'; import { Names } from './names'; import { Reference } from './reference'; @@ -1589,4 +1700,3 @@ import { getExportable } from './private/refs'; import { Fact, RegionInfo } from '@aws-cdk/region-info'; import { deployTimeLookup } from './private/region-lookup'; import { makeUniqueResourceName } from './private/unique-resource-name'; - diff --git a/packages/@aws-cdk/core/test/cfn-resource.test.ts b/packages/@aws-cdk/core/test/cfn-resource.test.ts index 4bc11c5ea43a4..8ab282f10c5ac 100644 --- a/packages/@aws-cdk/core/test/cfn-resource.test.ts +++ b/packages/@aws-cdk/core/test/cfn-resource.test.ts @@ -3,6 +3,7 @@ import { VALIDATE_SNAPSHOT_REMOVAL_POLICY } from '@aws-cdk/cx-api'; import { Construct } from 'constructs'; import * as core from '../lib'; import { getWarnings } from './util'; +import { Names } from '../lib'; describe('cfn resource', () => { describe('._toCloudFormation', () => { @@ -136,6 +137,142 @@ describe('cfn resource', () => { }); }); + describe('dependency methods', () => { + test('can explicitly add a dependency between resources', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + resource1.addDependency(resource2); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + DependsOn: [ + 'Resource2', + ], + }, + Resource2: { + Type: 'Test::Resource::Fake2', + }, + }); + }); + + test('can explicitly remove a dependency between resources', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + resource1.addDependency(resource2); + resource1.removeDependency(resource2); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + }, + Resource2: { + Type: 'Test::Resource::Fake2', + }, + }); + }); + + test('can explicitly add, obtain, and remove dependencies across stacks', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + // Use a really long construct id to identify issues between Names.uniqueId and Names.uniqueResourceName + const reallyLongConstructId = 'A'.repeat(247); + const stack2 = new core.Stack(app, reallyLongConstructId, { stackName: 'TestStack2' }); + // Sanity check since this test depends on the discrepancy + expect(Names.uniqueId(stack2)).not.toBe(Names.uniqueResourceName(stack2, {})); + const resource1 = new core.CfnResource(stack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack2, 'Resource2', { type: 'Test::Resource::Fake2' }); + const resource3 = new core.CfnResource(stack1, 'Resource3', { type: 'Test::Resource::Fake3' }); + + resource1.addDependency(resource2); + // Adding the same resource dependency twice should be a no-op + resource1.addDependency(resource2); + resource1.addDependency(resource3); + expect(stack1.dependencies.length).toEqual(1); + expect(stack1.dependencies[0].node.id).toEqual(stack2.node.id); + // obtainDependencies should assemble and flatten resource-to-resource dependencies even across stacks + expect(resource1.obtainDependencies().map(x => x.node.path)).toEqual([resource3.node.path, resource2.node.path]); + + resource1.removeDependency(resource2); + // For symmetry, removing a dependency that doesn't exist should be a no-op + resource1.removeDependency(resource2); + expect(stack1.dependencies.length).toEqual(0); + }); + + test('can explicitly add, then replace dependencies across stacks', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + const stack2 = new core.Stack(app, 'TestStack2'); + const stack3 = new core.Stack(app, 'TestStack3'); + const resource1 = new core.CfnResource(stack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack2, 'Resource2', { type: 'Test::Resource::Fake2' }); + const resource3 = new core.CfnResource(stack3, 'Resource3', { type: 'Test::Resource::Fake3' }); + + resource1.addDependency(resource2); + // Adding the same resource dependency twice should be a no-op + resource1.replaceDependency(resource2, resource3); + expect(stack1.dependencies).toEqual([stack3]); + // obtainDependencies should assemble and flatten resource-to-resource dependencies even across stacks + expect(resource1.obtainDependencies().map(x => x.node.path)).toEqual([resource3.node.path]); + + // Replacing a dependency that doesn't exist should raise an exception + expect(() => { + resource1.replaceDependency(resource2, resource3); + }).toThrow(/ does not depend on /); + }); + + test('do nothing if source is target', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + resource1.addDependency(resource1); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + }, + }); + }); + + test('do nothing if target does not synth', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + + class NoSynthResource extends core.CfnResource { + protected shouldSynthesize(): boolean { + return false; + } + } + + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new NoSynthResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + resource1.removeDependency(resource2); + resource1.addDependency(resource2); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + }, + }); + }); + + test('replace throws an error if oldTarget is not depended on', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + const resource3 = new core.CfnResource(stack, 'Resource3', { type: 'Test::Resource::Fake3' }); + expect(() => { + resource1.replaceDependency(resource2, resource3); + }).toThrow(/does not depend on/); + }); + }); + test('applyRemovalPolicy default includes Update policy', () => { // GIVEN const app = new core.App(); diff --git a/packages/@aws-cdk/core/test/deps.test.ts b/packages/@aws-cdk/core/test/deps.test.ts new file mode 100644 index 0000000000000..5a6eb0a40a8d9 --- /dev/null +++ b/packages/@aws-cdk/core/test/deps.test.ts @@ -0,0 +1,128 @@ +import * as core from '../lib'; +import { Names } from '../lib'; +import { addDependency, obtainDependencies, removeDependency } from '../lib/deps'; +import { Construct } from 'constructs'; + +describe('deps', () => { + describe('dependency methods', () => { + test('can explicitly add a dependency between resources', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + addDependency(resource1, resource2); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + DependsOn: [ + 'Resource2', + ], + }, + Resource2: { + Type: 'Test::Resource::Fake2', + }, + }); + }); + + test('can explicitly remove a dependency between resources', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack, 'Resource2', { type: 'Test::Resource::Fake2' }); + addDependency(resource1, resource2); + removeDependency(resource1, resource2); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + }, + Resource2: { + Type: 'Test::Resource::Fake2', + }, + }); + }); + + test('can explicitly add, obtain, and remove dependencies across stacks', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + // Use a really long construct id to identify issues between Names.uniqueId and Names.uniqueResourceName + const reallyLongConstructId = 'A'.repeat(247); + const stack2 = new core.Stack(app, reallyLongConstructId, { stackName: 'TestStack2' }); + // Sanity check since this test depends on the discrepancy + expect(Names.uniqueId(stack2)).not.toBe(Names.uniqueResourceName(stack2, {})); + const resource1 = new core.CfnResource(stack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(stack2, 'Resource2', { type: 'Test::Resource::Fake2' }); + const resource3 = new core.CfnResource(stack1, 'Resource3', { type: 'Test::Resource::Fake3' }); + + addDependency(resource1, resource2); + // Adding the same resource dependency twice should be a no-op + addDependency(resource1, resource2); + addDependency(resource1, resource3); + expect(stack1.dependencies.length).toEqual(1); + expect(stack1.dependencies[0].node.id).toEqual(stack2.node.id); + // obtainDependencies should assemble and flatten resource-to-resource dependencies even across stacks + expect(obtainDependencies(resource1).map(x => x.node.path)).toEqual([resource3.node.path, resource2.node.path]); + + removeDependency(resource1, resource2); + // For symmetry, removing a dependency that doesn't exist should be a no-op + removeDependency(resource1, resource2); + expect(stack1.dependencies.length).toEqual(0); + }); + + test('do nothing if source is target', () => { + const app = new core.App(); + const stack = new core.Stack(app, 'TestStack'); + const resource1 = new core.CfnResource(stack, 'Resource1', { type: 'Test::Resource::Fake1' }); + addDependency(resource1, resource1); + + expect(app.synth().getStackByName(stack.stackName).template.Resources).toEqual({ + Resource1: { + Type: 'Test::Resource::Fake1', + }, + }); + }); + + test('handle source being common stack', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + const resource1 = new core.CfnResource(stack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + + // If source is the common stack, this should be a noop + addDependency(stack1, resource1); + expect(stack1.dependencies.length).toEqual(0); + }); + + test('throws error if target is common stack', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + const resource1 = new core.CfnResource(stack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + + expect(() => { + addDependency(resource1, stack1); + }).toThrow(/cannot depend on /); + }); + + test('can explicitly add, obtain, and remove dependencies across nested stacks', () => { + const app = new core.App(); + const stack1 = new core.Stack(app, 'TestStack1'); + const construct1 = new Construct(stack1, 'CommonConstruct'); + // Use a really long construct id to identify issues between Names.uniqueId and Names.uniqueResourceName + const nestedStack1 = new core.Stack(construct1, 'TestNestedStack1'); + const nestedStack2 = new core.Stack(construct1, 'TestNestedStack2'); + const resource1 = new core.CfnResource(nestedStack1, 'Resource1', { type: 'Test::Resource::Fake1' }); + const resource2 = new core.CfnResource(nestedStack2, 'Resource2', { type: 'Test::Resource::Fake2' }); + + addDependency(resource1, resource2); + // Adding the same resource dependency twice should be a no-op + addDependency(resource1, resource2); + expect(nestedStack1.dependencies.length).toEqual(1); + expect(nestedStack1.dependencies[0].node.id).toEqual(nestedStack2.node.id); + + removeDependency(resource1, resource2); + // For symmetry, removing a dependency that doesn't exist should be a no-op + removeDependency(resource1, resource2); + expect(stack1.dependencies.length).toEqual(0); + }); + }); +}); diff --git a/packages/@aws-cdk/core/test/integration.deps.readme b/packages/@aws-cdk/core/test/integration.deps.readme new file mode 100644 index 0000000000000..4797f34bca848 --- /dev/null +++ b/packages/@aws-cdk/core/test/integration.deps.readme @@ -0,0 +1,5 @@ ++--------------------------------------------------------------------------+ +| Since cdk-integ depends on cdk which depends on @aws-cdk/core (as a "dev | +| dependency"), this integration test has been added to the package | +| @aws-cdk/aws-cloudformation under `test/integ.core-deps.ts` | ++--------------------------------------------------------------------------+ diff --git a/packages/@aws-cdk/core/test/resource.test.ts b/packages/@aws-cdk/core/test/resource.test.ts index fe247827bb3d6..07f53d3e8fe66 100644 --- a/packages/@aws-cdk/core/test/resource.test.ts +++ b/packages/@aws-cdk/core/test/resource.test.ts @@ -151,11 +151,11 @@ describe('resource', () => { const dependent = new CfnResource(stack, 'Dependent', { type: 'R' }); // WHEN - dependent.addDependsOn(r1); - dependent.addDependsOn(r1); - dependent.addDependsOn(r1); - dependent.addDependsOn(r1); - dependent.addDependsOn(r1); + dependent.addDependency(r1); + dependent.addDependency(r1); + dependent.addDependency(r1); + dependent.addDependency(r1); + dependent.addDependency(r1); // THEN expect(toCloudFormation(stack)).toEqual({ diff --git a/packages/@aws-cdk/core/test/stack.test.ts b/packages/@aws-cdk/core/test/stack.test.ts index 8a7da057a9def..ee1a12412d3ca 100644 --- a/packages/@aws-cdk/core/test/stack.test.ts +++ b/packages/@aws-cdk/core/test/stack.test.ts @@ -1080,7 +1080,7 @@ describe('stack', () => { RefToResource1: resourceA.ref, }, }); - resource2.addDependsOn(resourceB); + resource2.addDependency(resourceB); // THEN const assembly = app.synth(); @@ -1116,6 +1116,206 @@ describe('stack', () => { expect(assembly.getStackArtifact(child2.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual(['ParentChild18FAEF419']); }); + test('_addAssemblyDependency adds to _stackDependencies', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'ChildA'); + const resource1 = new CfnResource(child1, 'Resource1', { type: 'R1' }); + const resource2 = new CfnResource(child1, 'Resource2', { type: 'R2' }); + const resourceA = new CfnResource(childA, 'ResourceA', { type: 'RA' }); + + childA._addAssemblyDependency(child1, { source: resourceA, target: resource1 }); + childA._addAssemblyDependency(child1, { source: resourceA, target: resource2 }); + + expect(childA._obtainAssemblyDependencies({ source: resourceA })) + .toEqual([resource1, resource2]); + + const assembly = app.synth(); + + expect(assembly.getStackArtifact(child1.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + expect(assembly.getStackArtifact(childA.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual(['ParentChild18FAEF419']); + }); + + test('_addAssemblyDependency adds one StackDependencyReason with defaults', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'ChildA'); + + childA._addAssemblyDependency(child1); + + expect(childA._obtainAssemblyDependencies({ source: childA })) + .toEqual([child1]); + + const assembly = app.synth(); + + expect(assembly.getStackArtifact(child1.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + expect(assembly.getStackArtifact(childA.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual(['ParentChild18FAEF419']); + }); + + test('_addAssemblyDependency raises error on cycle', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const child2 = new Stack(parent, 'Child2'); + + child2._addAssemblyDependency(child1); + expect(() => child1._addAssemblyDependency(child2)).toThrow("'Parent/Child2' depends on"); + }); + + test('_addAssemblyDependency raises error for nested stacks', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new NestedStack(parent, 'Child1'); + const child2 = new NestedStack(parent, 'Child2'); + + expect(() => child1._addAssemblyDependency(child2)).toThrow('Cannot add assembly-level'); + }); + + test('_addAssemblyDependency handles duplicate dependency reasons', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const child2 = new Stack(parent, 'Child2'); + + child2._addAssemblyDependency(child1); + const depsBefore = child2._obtainAssemblyDependencies({ source: child2 }); + child2._addAssemblyDependency(child1); + expect(depsBefore).toEqual(child2._obtainAssemblyDependencies({ source: child2 })); + }); + + test('_removeAssemblyDependency removes one StackDependencyReason of two from _stackDependencies', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'ChildA'); + const resource1 = new CfnResource(child1, 'Resource1', { type: 'R1' }); + const resource2 = new CfnResource(child1, 'Resource2', { type: 'R2' }); + const resourceA = new CfnResource(childA, 'ResourceA', { type: 'RA' }); + + childA._addAssemblyDependency(child1, { source: resourceA, target: resource1 }); + childA._addAssemblyDependency(child1, { source: resourceA, target: resource2 }); + childA._removeAssemblyDependency(child1, { source: resourceA, target: resource1 }); + + expect(childA._obtainAssemblyDependencies({ source: resourceA })).toEqual([resource2]); + + const assembly = app.synth(); + + expect(assembly.getStackArtifact(child1.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + expect(assembly.getStackArtifact(childA.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual(['ParentChild18FAEF419']); + }); + + test('_removeAssemblyDependency removes a StackDependency from _stackDependencies with the last reason', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'Child2'); + const resource1 = new CfnResource(child1, 'Resource1', { type: 'R1' }); + const resource2 = new CfnResource(child1, 'Resource2', { type: 'R2' }); + const resourceA = new CfnResource(childA, 'ResourceA', { type: 'RA' }); + + childA._addAssemblyDependency(child1, { source: resourceA, target: resource1 }); + childA._addAssemblyDependency(child1, { source: resourceA, target: resource2 }); + childA._removeAssemblyDependency(child1, { source: resourceA, target: resource1 }); + childA._removeAssemblyDependency(child1, { source: resourceA, target: resource2 }); + + expect(childA._obtainAssemblyDependencies({ source: childA })).toEqual([]); + + const assembly = app.synth(); + + expect(assembly.getStackArtifact(child1.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + expect(assembly.getStackArtifact(childA.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + }); + + test('_removeAssemblyDependency removes a StackDependency with default reason', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'Child2'); + + childA._addAssemblyDependency(child1); + childA._removeAssemblyDependency(child1); + + expect(childA._obtainAssemblyDependencies({ source: childA })).toEqual([]); + + const assembly = app.synth(); + + expect(assembly.getStackArtifact(child1.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + expect(assembly.getStackArtifact(childA.artifactId).dependencies.map((x: { id: any; }) => x.id)).toEqual([]); + }); + + test('_removeAssemblyDependency raises an error for nested stacks', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new NestedStack(parent, 'Child1'); + const childA = new NestedStack(parent, 'Child2'); + + expect(() => childA._removeAssemblyDependency(child1)).toThrow('There cannot be assembly-level'); + }); + + test('_removeAssemblyDependency handles a non-matching dependency reason', () => { + const app = new App({ + context: { + '@aws-cdk/core:stackRelativeExports': true, + [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false, + }, + }); + const parent = new Stack(app, 'Parent'); + const child1 = new Stack(parent, 'Child1'); + const childA = new Stack(parent, 'Child2'); + const resource1 = new CfnResource(child1, 'Resource1', { type: 'R1' }); + const resourceA = new CfnResource(childA, 'ResourceA', { type: 'RA' }); + + childA._addAssemblyDependency(child1); + childA._removeAssemblyDependency(child1, { source: resourceA, target: resource1 }); + }); + test('automatic cross-stack references and manual exports look the same', () => { // GIVEN: automatic const appA = new App({ context: { '@aws-cdk/core:stackRelativeExports': true } }); diff --git a/packages/aws-cdk-lib/README.md b/packages/aws-cdk-lib/README.md index da983bbf62ca5..c9a97272cf271 100644 --- a/packages/aws-cdk-lib/README.md +++ b/packages/aws-cdk-lib/README.md @@ -460,6 +460,10 @@ A stack dependency has the following implications: automatically deploy `stackB`. - `stackB`'s deployment will be performed *before* `stackA`'s deployment. +### CfnResource Dependencies + +To make declaring dependencies between `CfnResource` objects easier, you can declare dependencies from one `CfnResource` object on another by using the `cfnResource1.addDependency(cfnResource2)` method. This method will work for resources both within the same stack and across stacks as it detects the relative location of the two resources and adds the dependency either to the resource or between the relevant stacks, as appropriate. If more complex logic is in needed, you can similarly remove, replace, or view dependencies between `CfnResource` objects with the `CfnResource` `removeDependency`, `replaceDependency`, and `obtainDependencies` methods, respectively. + ## Custom Resources Custom Resources are CloudFormation resources that are implemented by arbitrary @@ -885,13 +889,13 @@ rawBucket.cfnOptions.metadata = { ``` Resource dependencies (the `DependsOn` attribute) is modified using the -`cfnResource.addDependsOn` method: +`cfnResource.addDependency` method: ```ts const resourceA = new CfnResource(this, 'ResourceA', resourceProps); const resourceB = new CfnResource(this, 'ResourceB', resourceProps); -resourceB.addDependsOn(resourceA); +resourceB.addDependency(resourceA); ``` [cfn-resource-attributes]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-product-attribute-reference.html