Merge branch 'main' into huijbers/lazify-2

packages/@aws-cdk/app-staging-synthesizer-alpha/package.json

@@ -96,7 +96,7 @@
     "@aws-cdk/pkglint": "0.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "0.0.0",
+    "aws-cdk-lib": "^0.0.0",
     "constructs": "^10.0.0"
   },
   "publishConfig": {

packages/@aws-cdk/aws-appconfig-alpha/package.json

@@ -93,7 +93,7 @@
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
-    "aws-cdk-lib": "0.0.0",
+    "aws-cdk-lib": "^0.0.0",
     "constructs": "^10.0.0"
   },
   "separate-module": false,

packages/@aws-cdk/aws-lambda-python-alpha/test/lambda-handler-custom-build/requirements.txt

@@ -2,6 +2,6 @@
 certifi==2023.7.22
 chardet==3.0.4
 idna==2.10
-urllib3==1.26.7
+urllib3==1.26.17
 # Requests used by this lambda
 requests==2.31.0

packages/@aws-cdk/aws-lambda-python-alpha/test/lambda-handler-project/lambda/requirements.txt

@@ -2,6 +2,6 @@
 certifi==2023.7.22
 chardet==3.0.4
 idna==2.10
-urllib3==1.26.7
+urllib3==1.26.17
 # Requests used by this lambda
 requests==2.31.0

packages/@aws-cdk/aws-lambda-python-alpha/test/lambda-handler/requirements.txt

@@ -2,6 +2,6 @@
 certifi==2023.7.22
 chardet==3.0.4
 idna==2.10
-urllib3==1.26.7
+urllib3==1.26.17
 # Requests used by this lambda
 requests==2.31.0

packages/@aws-cdk/custom-resource-handlers/package.json

@@ -51,7 +51,7 @@
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",
     "type": "git",
-    "directory": "packages/custom-resource-handlers"
+    "directory": "packages/@aws-cdk/custom-resource-handlers"
   },
   "keywords": [
     "aws",

packages/@aws-cdk/example-construct-library/package.json

@@ -86,7 +86,7 @@
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
-    "aws-cdk-lib": "0.0.0",
+    "aws-cdk-lib": "^0.0.0",
     "constructs": "^10.0.0"
   },
   "separate-module": false,

packages/aws-cdk-lib/aws-s3-deployment/lib/source.ts

@@ -58,8 +58,8 @@ export interface ISource {
  *     Source.asset('/local/path/to/directory')
  *     Source.asset('/local/path/to/a/file.zip')
  *     Source.data('hello/world/file.txt', 'Hello, world!')
- *     Source.dataJson('config.json', { baz: topic.topicArn })
- *     Source.dataYaml('config.yaml', { baz: topic.topicArn })
+ *     Source.jsonData('config.json', { baz: topic.topicArn })
+ *     Source.yamlData('config.yaml', { baz: topic.topicArn })
  *
  */
 export class Source {

scripts/align-version.js

@@ -26,7 +26,6 @@ for (const file of files) {
   }
 
   const version = packageVersionMap[pkg.name]
-  console.log(version);
   pkg.version = version;
 
   processSection(pkg.dependencies || { }, file);
@@ -41,13 +40,12 @@ for (const file of files) {
 function processSection(section, file) {
   for (const [ name, version ] of Object.entries(section)) {
     if (version === marker || version === '^' + marker) {
-      const version = packageVersionMap[name];
-
-      if (!version) {
+      const newVersion = packageVersionMap[name];
+      if (!newVersion) {
         throw new Error(`No package found ${name} within repository, which has version 0.0.0`);
       }
 
-      section[name] = version.replace(marker, version);
+      section[name] = version.replace(marker, newVersion);
     }
   }
 }

tools/@aws-cdk/pkglint/lib/rules.ts

@@ -1533,6 +1533,28 @@ export class ConstructsDependency extends ValidationRule {
   }
 }
 
+/**
+ * Peer dependencies should be a range, not a point version, to maximize compatibility
+ */
+export class PeerDependencyRange extends ValidationRule {
+  public readonly name = 'peerdependency/range';
+
+  public validate(pkg: PackageJson) {
+    const packages = ['aws-cdk-lib'];
+    for (const [name, version] of Object.entries(pkg.peerDependencies)) {
+      if (packages.includes(name) && version.match(/^[0-9]/)) {
+        pkg.report({
+          ruleName: this.name,
+          message: `peerDependency on" ${name}" should be a range, not a point version: "${version}"`,
+          fix: () => {
+            pkg.addPeerDependency(name, '^' + version);
+          },
+        });
+      }
+    }
+  }
+}
+
 /**
  * Do not announce new versions of AWS CDK modules in awscdk.io because it is very very spammy
  * and actually causes the @awscdkio twitter account to be blocked.

tools/@aws-cdk/spec2cdk/package.json

@@ -32,8 +32,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.17",
-    "@aws-cdk/service-spec-types": "^0.0.17",
+    "@aws-cdk/aws-service-spec": "^0.0.18",
+    "@aws-cdk/service-spec-types": "^0.0.18",
     "@cdklabs/tskb": "^0.0.1",
     "@cdklabs/typewriter": "^0.0.2",
     "camelcase": "^6",

yarn.lock

@@ -55,23 +55,23 @@
   resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
   integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==
 
-"@aws-cdk/aws-service-spec@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.17.tgz#99dd8577d9d7578dd6e7331f7d2ef9e87e24de57"
-  integrity sha512-WU1Wo2caXL+JJ2DF7thETBUE+UxvxKtOKA3T1dnTK7hQAthVJ0do2A4nTur8+0664rN12DASo3kWbUpQnU50jA==
+"@aws-cdk/aws-service-spec@^0.0.18":
+  version "0.0.18"
+  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.18.tgz#f0284514ce2c0c13ca6a1cc05dfb7b79d75a1409"
+  integrity sha512-ei/t8HhJiCwCHvHyTeLPj9TLp8QEymEexAyrvCJFopjNPwY3MGEOSAOeVhmuVrzwCwCXylSmpez0hSkv4w+kWQ==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.17"
+    "@aws-cdk/service-spec-types" "^0.0.18"
     "@cdklabs/tskb" "^0.0.1"
 
 "@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
   version "2.0.242"
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
   integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==
 
-"@aws-cdk/service-spec-types@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.17.tgz#adde4180cf7e2b00ac0e9025532efb6c2f270247"
-  integrity sha512-X/k57lQNs3g+9b6mCuMRCH4n8mDskkeIMDYAsy94eRpt+iP2N4pf/q/9hLDkJij/9CJTLOT8piUiLvWR/3vvDw==
+"@aws-cdk/service-spec-types@^0.0.18":
+  version "0.0.18"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.18.tgz#deaabcb63efad83ecf1c656f0653c146a2eae99d"
+  integrity sha512-Ru9VcbAezK5BvyOwK5DBMpeO/yGcS3Yc8jt7sQYtshBWQypq423m6KvcwCBB9gT/ZRZQ701aSYUcXwcBubXkDg==
   dependencies:
     "@cdklabs/tskb" "^0.0.1"