diff --git a/packages/@aws-cdk/aws-codepipeline-api/package.json b/packages/@aws-cdk/aws-codepipeline-api/package.json index 13ef88626f382..1a5472b8b50ac 100644 --- a/packages/@aws-cdk/aws-codepipeline-api/package.json +++ b/packages/@aws-cdk/aws-codepipeline-api/package.json @@ -60,11 +60,7 @@ "dependencies": { "@aws-cdk/aws-events": "^0.9.2", "@aws-cdk/aws-iam": "^0.9.2", - "@aws-cdk/cdk": "^0.9.2", - "@aws-cdk/util": "^0.9.2" + "@aws-cdk/cdk": "^0.9.2" }, - "bundledDependencies": [ - "@aws-cdk/util" - ], "homepage": "https://github.com/awslabs/aws-cdk" } diff --git a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts index ba909b1ee6ef5..08499a5e5aa5e 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts @@ -3,7 +3,6 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); import cdk = require('@aws-cdk/cdk'); -import util = require('@aws-cdk/util'); import { cloudformation } from './codepipeline.generated'; import { CommonStageProps, Stage, StagePlacement } from './stage'; @@ -204,10 +203,10 @@ export class Pipeline extends cdk.Construct implements events.IEventRuleTarget { * @override */ public validate(): string[] { - return util.flatten([ - this.validateHasStages(), - this.validateSourceActionLocations() - ]); + return [ + ...this.validateHasStages(), + ...this.validateSourceActionLocations() + ]; } /** @@ -292,12 +291,16 @@ export class Pipeline extends cdk.Construct implements events.IEventRuleTarget { } private validateSourceActionLocations(): string[] { - return util.flatMap(this.stages, (stage, i) => { - const onlySourceActionsPermitted = i === 0; - return util.flatMap(stage.actions, (action, _) => - actions.validateSourceAction(onlySourceActionsPermitted, action.category, action.id, stage.id) - ); - }); + const errors = new Array(); + let firstStage = true; + for (const stage of this.stages) { + const onlySourceActionsPermitted = firstStage; + for (const action of stage.actions) { + errors.push(...actions.validateSourceAction(onlySourceActionsPermitted, action.category, action.id, stage.id)); + } + firstStage = false; + } + return errors; } private validateHasStages(): string[] { diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json index 2bae7e4b77bc5..5dba0c1f01931 100644 --- a/packages/@aws-cdk/aws-codepipeline/package.json +++ b/packages/@aws-cdk/aws-codepipeline/package.json @@ -75,11 +75,7 @@ "@aws-cdk/aws-events": "^0.9.2", "@aws-cdk/aws-iam": "^0.9.2", "@aws-cdk/aws-s3": "^0.9.2", - "@aws-cdk/cdk": "^0.9.2", - "@aws-cdk/util": "^0.9.2" + "@aws-cdk/cdk": "^0.9.2" }, - "bundledDependencies": [ - "@aws-cdk/util" - ], "homepage": "https://github.com/awslabs/aws-cdk" } diff --git a/packages/@aws-cdk/aws-ec2/lib/vpc.ts b/packages/@aws-cdk/aws-ec2/lib/vpc.ts index 234c76552b5a5..e273c34967e4f 100644 --- a/packages/@aws-cdk/aws-ec2/lib/vpc.ts +++ b/packages/@aws-cdk/aws-ec2/lib/vpc.ts @@ -1,5 +1,4 @@ import cdk = require('@aws-cdk/cdk'); -import { Obj } from '@aws-cdk/util'; import { cloudformation } from './ec2.generated'; import { NetworkBuilder } from './network-util'; import { DEFAULT_SUBNET_NAME, subnetId } from './util'; @@ -252,7 +251,7 @@ export class VpcNetwork extends VpcNetworkRef implements cdk.ITaggable { /** * Mapping of NatGateway by AZ */ - private natGatewayByAZ: Obj = {}; + private natGatewayByAZ: { [az: string]: string } = {}; /** * Subnet configurations for this VPC @@ -530,7 +529,7 @@ export class VpcPublicSubnet extends VpcSubnet { /** * Creates a new managed NAT gateway attached to this public subnet. * Also adds the EIP for the managed NAT. - * Returns the NAT Gateway ref + * @returns A ref to the the NAT Gateway ID */ public addNatGateway() { // Create a NAT Gateway in this public subnet @@ -541,7 +540,7 @@ export class VpcPublicSubnet extends VpcSubnet { }).eipAllocationId, tags: new cdk.TagManager(this), }); - return ngw.ref; + return ngw.natGatewayId; } } diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json index e7b2549108a22..2e86668fea041 100644 --- a/packages/@aws-cdk/aws-ec2/package.json +++ b/packages/@aws-cdk/aws-ec2/package.json @@ -60,11 +60,7 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.9.2", - "@aws-cdk/cdk": "^0.9.2", - "@aws-cdk/util": "^0.9.2" + "@aws-cdk/cdk": "^0.9.2" }, - "bundledDependencies": [ - "@aws-cdk/util" - ], "homepage": "https://github.com/awslabs/aws-cdk" } diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json index 5963a0465b029..cdc3055e126d9 100644 --- a/packages/@aws-cdk/aws-events/package.json +++ b/packages/@aws-cdk/aws-events/package.json @@ -60,11 +60,7 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.9.2", - "@aws-cdk/cdk": "^0.9.2", - "@aws-cdk/util": "^0.9.2" + "@aws-cdk/cdk": "^0.9.2" }, - "bundledDependencies": [ - "@aws-cdk/util" - ], "homepage": "https://github.com/awslabs/aws-cdk" } diff --git a/packages/@aws-cdk/aws-quickstarts/lib/database.ts b/packages/@aws-cdk/aws-quickstarts/lib/database.ts index f57d135d9ef1f..86d85de571426 100644 --- a/packages/@aws-cdk/aws-quickstarts/lib/database.ts +++ b/packages/@aws-cdk/aws-quickstarts/lib/database.ts @@ -1,7 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import rds = require('@aws-cdk/aws-rds'); import cdk = require('@aws-cdk/cdk'); -import util = require('@aws-cdk/util'); export interface SqlServerProps { instanceClass?: string; @@ -34,22 +33,16 @@ export class SqlServer extends cdk.Construct implements ec2.IConnectable { dbSubnetGroupDescription: 'Database subnet group', }); - const p = util.applyDefaults(props, { - instanceClass: 'db.m4.large', - engine: 'sqlserver-se', - engineVersion: '13.00.4422.0.v1', - licenseModel: 'license-included', - allocatedStorage: 200 - }); + const allocatedStorage = props.allocatedStorage !== undefined ? props.allocatedStorage : 200; new rds.cloudformation.DBInstanceResource(this, 'Resource', { - allocatedStorage: p.allocatedStorage.toString(), - dbInstanceClass: p.instanceClass, - engine: p.engine, - engineVersion: p.engineVersion, - licenseModel: p.licenseModel, - masterUsername: p.masterUsername, - masterUserPassword: p.masterPassword, + allocatedStorage: allocatedStorage.toString(), + dbInstanceClass: props.instanceClass || 'db.m4.large', + engine: props.engine || 'sqlserver-se', + engineVersion: props.engineVersion || '13.00.4422.0.v1', + licenseModel: props.licenseModel || 'license-included', + masterUsername: props.masterUsername, + masterUserPassword: props.masterPassword, port: SqlServer.PORT.toString(), dbSubnetGroupName: subnetGroup.ref, vpcSecurityGroups: [ securityGroup.securityGroupId ] diff --git a/packages/@aws-cdk/aws-quickstarts/package.json b/packages/@aws-cdk/aws-quickstarts/package.json index fb7a3fd56906f..705b6d1484fad 100644 --- a/packages/@aws-cdk/aws-quickstarts/package.json +++ b/packages/@aws-cdk/aws-quickstarts/package.json @@ -56,11 +56,7 @@ "@aws-cdk/aws-ec2": "^0.9.2", "@aws-cdk/aws-iam": "^0.9.2", "@aws-cdk/aws-rds": "^0.9.2", - "@aws-cdk/cdk": "^0.9.2", - "@aws-cdk/util": "^0.9.2" + "@aws-cdk/cdk": "^0.9.2" }, - "bundledDependencies": [ - "@aws-cdk/util" - ], "homepage": "https://github.com/awslabs/aws-cdk" } diff --git a/packages/@aws-cdk/util/.gitignore b/packages/@aws-cdk/util/.gitignore deleted file mode 100644 index c021ccfe7bf91..0000000000000 --- a/packages/@aws-cdk/util/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.js -*.js.map -*.d.ts -dist - -.LAST_BUILD -.nyc_output -coverage -.nycrc -.LAST_PACKAGE \ No newline at end of file diff --git a/packages/@aws-cdk/util/.npmignore b/packages/@aws-cdk/util/.npmignore deleted file mode 100644 index 9c1c8aa04fa14..0000000000000 --- a/packages/@aws-cdk/util/.npmignore +++ /dev/null @@ -1,10 +0,0 @@ -# Don't include original .ts files when doing `npm pack` -*.ts -!*.d.ts -coverage -.nyc_output -*.tgz - -dist -.LAST_PACKAGE -.LAST_BUILD \ No newline at end of file diff --git a/packages/@aws-cdk/util/LICENSE b/packages/@aws-cdk/util/LICENSE deleted file mode 100644 index 1739faaebb745..0000000000000 --- a/packages/@aws-cdk/util/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2018-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/@aws-cdk/util/NOTICE b/packages/@aws-cdk/util/NOTICE deleted file mode 100644 index 95fd48569c743..0000000000000 --- a/packages/@aws-cdk/util/NOTICE +++ /dev/null @@ -1,2 +0,0 @@ -AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/util/README.md b/packages/@aws-cdk/util/README.md deleted file mode 100644 index 938d8de0f8789..0000000000000 --- a/packages/@aws-cdk/util/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## Utility routines used for implementing AWS CDK libraries -This module is part of the [AWS Cloud Development Kit](https://github.com/awslabs/aws-cdk) project. diff --git a/packages/@aws-cdk/util/package-lock.json b/packages/@aws-cdk/util/package-lock.json deleted file mode 100644 index 19e9506eb9734..0000000000000 --- a/packages/@aws-cdk/util/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@aws-cdk/util", - "version": "0.9.0", - "lockfileVersion": 1 -} diff --git a/packages/@aws-cdk/util/package.json b/packages/@aws-cdk/util/package.json deleted file mode 100644 index f5850fea80f1f..0000000000000 --- a/packages/@aws-cdk/util/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@aws-cdk/util", - "version": "0.9.2", - "description": "Utility routines used for implementing CDK libraries", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "repository": { - "type": "git", - "url": "https://github.com/awslabs/aws-cdk.git" - }, - "scripts": { - "build": "cdk-build", - "watch": "cdk-watch", - "lint": "cdk-lint", - "test": "cdk-test", - "pkglint": "pkglint -f", - "package": "cdk-package" - }, - "keywords": [ - "aws", - "cdk", - "constructs", - "util" - ], - "author": { - "name": "Amazon Web Services", - "url": "https://aws.amazon.com", - "organization": true - }, - "license": "Apache-2.0", - "devDependencies": { - "cdk-build-tools": "^0.9.2", - "pkglint": "^0.9.2" - }, - "homepage": "https://github.com/awslabs/aws-cdk" -} diff --git a/packages/@aws-cdk/util/tsconfig.json b/packages/@aws-cdk/util/tsconfig.json deleted file mode 100644 index 2ff4f884032c9..0000000000000 --- a/packages/@aws-cdk/util/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "target":"es2018", - "lib": ["es2016", "es2017.object", "es2017.string"], - "module": "commonjs", - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, - "inlineSourceMap": true, - "inlineSources": true, - "strictPropertyInitialization": false, - "experimentalDecorators": true - } -} - diff --git a/packages/aws-cdk/bin/cdk.ts b/packages/aws-cdk/bin/cdk.ts index 7bdbbe2c2c0e8..3520922392b63 100644 --- a/packages/aws-cdk/bin/cdk.ts +++ b/packages/aws-cdk/bin/cdk.ts @@ -2,7 +2,6 @@ import 'source-map-support/register'; import cxapi = require('@aws-cdk/cx-api'); -import cdkUtil = require('@aws-cdk/util'); import childProcess = require('child_process'); import colors = require('colors/safe'); import fs = require('fs-extra'); @@ -10,6 +9,7 @@ import minimatch = require('minimatch'); import util = require('util'); import YAML = require('yamljs'); import yargs = require('yargs'); +import cdkUtil = require('../lib/util'); import { bootstrapEnvironment, deployStack, destroyStack, loadToolkitInfo, Mode, SDK } from '../lib'; import contextplugins = require('../lib/contextplugins'); diff --git a/packages/aws-cdk/lib/renames.ts b/packages/aws-cdk/lib/renames.ts index 0c54b2d634cc0..f5926e172b483 100644 --- a/packages/aws-cdk/lib/renames.ts +++ b/packages/aws-cdk/lib/renames.ts @@ -1,5 +1,5 @@ import cxapi = require('@aws-cdk/cx-api'); -import util = require('@aws-cdk/util'); +import util = require('./util'); export type RenameTable = {[key: string]: string}; diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts index 4503f41c9cbd5..1210eb601763e 100644 --- a/packages/aws-cdk/lib/settings.ts +++ b/packages/aws-cdk/lib/settings.ts @@ -1,8 +1,8 @@ -import util = require('@aws-cdk/util'); import fs = require('fs-extra'); import os = require('os'); import fs_path = require('path'); import { warning } from './logging'; +import util = require('./util'); export type SettingsMap = {[key: string]: any}; diff --git a/packages/@aws-cdk/util/lib/arrays.ts b/packages/aws-cdk/lib/util/arrays.ts similarity index 100% rename from packages/@aws-cdk/util/lib/arrays.ts rename to packages/aws-cdk/lib/util/arrays.ts diff --git a/packages/@aws-cdk/util/lib/index.ts b/packages/aws-cdk/lib/util/index.ts similarity index 100% rename from packages/@aws-cdk/util/lib/index.ts rename to packages/aws-cdk/lib/util/index.ts diff --git a/packages/@aws-cdk/util/lib/objects.ts b/packages/aws-cdk/lib/util/objects.ts similarity index 100% rename from packages/@aws-cdk/util/lib/objects.ts rename to packages/aws-cdk/lib/util/objects.ts diff --git a/packages/@aws-cdk/util/lib/types.ts b/packages/aws-cdk/lib/util/types.ts similarity index 100% rename from packages/@aws-cdk/util/lib/types.ts rename to packages/aws-cdk/lib/util/types.ts diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index e80561b2f591a..beac1c8609ca1 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -46,7 +46,6 @@ "dependencies": { "@aws-cdk/cloudformation-diff": "^0.9.2", "@aws-cdk/cx-api": "^0.9.2", - "@aws-cdk/util": "^0.9.2", "archiver": "^2.1.1", "aws-sdk": "^2.259.1", "camelcase": "^5.0.0", diff --git a/packages/@aws-cdk/util/test/test.applydefaults.ts b/packages/aws-cdk/test/util/test.applydefaults.ts similarity index 85% rename from packages/@aws-cdk/util/test/test.applydefaults.ts rename to packages/aws-cdk/test/util/test.applydefaults.ts index 0eb38d643e102..e5a523fdafd80 100644 --- a/packages/@aws-cdk/util/test/test.applydefaults.ts +++ b/packages/aws-cdk/test/util/test.applydefaults.ts @@ -1,5 +1,5 @@ import { Test } from 'nodeunit'; -import { applyDefaults } from '../lib'; +import { applyDefaults } from '../../lib/util'; export = { 'applyDefaults() works'(test: Test) { diff --git a/packages/@aws-cdk/util/test/test.arrays.ts b/packages/aws-cdk/test/util/test.arrays.ts similarity index 92% rename from packages/@aws-cdk/util/test/test.arrays.ts rename to packages/aws-cdk/test/util/test.arrays.ts index ecb9404f1f751..bb42b7858f21e 100644 --- a/packages/@aws-cdk/util/test/test.arrays.ts +++ b/packages/aws-cdk/test/util/test.arrays.ts @@ -1,5 +1,5 @@ import { Test } from 'nodeunit'; -import { flatMap, flatten, partition } from '../lib'; +import { flatMap, flatten, partition } from '../../lib/util'; export = { 'flatten combines arrays'(test: Test) { diff --git a/packages/@aws-cdk/util/test/test.objects.ts b/packages/aws-cdk/test/util/test.objects.ts similarity index 95% rename from packages/@aws-cdk/util/test/test.objects.ts rename to packages/aws-cdk/test/util/test.objects.ts index 7548bd8c94289..25525da0bf42f 100644 --- a/packages/@aws-cdk/util/test/test.objects.ts +++ b/packages/aws-cdk/test/util/test.objects.ts @@ -1,5 +1,5 @@ import { Test } from 'nodeunit'; -import { deepClone, deepGet, deepMerge, deepSet } from '../lib'; +import { deepClone, deepGet, deepMerge, deepSet } from '../../lib/util'; export = { 'deepSet can set deeply'(test: Test) {