From 511d210b3c5a26eb3d78ce75dfe84ff495dc19c3 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Thu, 17 Oct 2024 10:32:46 +0200 Subject: [PATCH 1/2] Upgrade pu/pu to 3.136.1 --- nodejs/eks/package.json | 2 +- nodejs/eks/yarn.lock | 38 +++++++++++++++++++++++++++++++++++++- provider/go.mod | 4 ++-- provider/go.sum | 8 ++++---- sdk/nodejs/package.json | 2 +- sdk/nodejs/yarn.lock | 8 ++++---- sdk/python/pyproject.toml | 2 +- 7 files changed, 50 insertions(+), 14 deletions(-) diff --git a/nodejs/eks/package.json b/nodejs/eks/package.json index 6f0b22b34..ad3b0db86 100644 --- a/nodejs/eks/package.json +++ b/nodejs/eks/package.json @@ -24,7 +24,7 @@ "dependencies": { "@pulumi/aws": "^6.18.2", "@pulumi/kubernetes": "^4.1.1", - "@pulumi/pulumi": "^3.47.0", + "@pulumi/pulumi": "^3.136.1", "https-proxy-agent": "^5.0.1", "jest": "^29.7.0", "js-yaml": "^4.1.0", diff --git a/nodejs/eks/yarn.lock b/nodejs/eks/yarn.lock index 7efd1c108..8cac817f5 100644 --- a/nodejs/eks/yarn.lock +++ b/nodejs/eks/yarn.lock @@ -1679,7 +1679,7 @@ shell-quote "^1.6.1" tmp "^0.0.33" -"@pulumi/pulumi@^3.0.0", "@pulumi/pulumi@^3.25.0", "@pulumi/pulumi@^3.47.0": +"@pulumi/pulumi@^3.0.0", "@pulumi/pulumi@^3.25.0": version "3.124.0" resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.124.0.tgz#520e80c6b0bac41976360aca595e7d79a73633c9" integrity sha512-5ytgK1RQYZD310aj0+RTauBpnB1RVO0j4Ql7tvpioklwRmOclVzTMyeaR2xd02Gpw9iyRwvoWHxgCV0owPdu+w== @@ -1715,6 +1715,42 @@ tmp "^0.2.1" upath "^1.1.0" +"@pulumi/pulumi@^3.136.1": + version "3.136.1" + resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.136.1.tgz#1ef187cdb3f3b4abf119ae6088e76edb20947ed4" + integrity sha512-bO+AVYKyf4dFDVSbBRoCiwAVE0JhugwAEv5FmWit+VHE3f9eoy1qrw7t5DmGmAiL2cGCwTpvVEIf4y1N7360ZA== + dependencies: + "@grpc/grpc-js" "^1.10.1" + "@logdna/tail-file" "^2.0.6" + "@npmcli/arborist" "^7.3.1" + "@opentelemetry/api" "^1.9" + "@opentelemetry/exporter-zipkin" "^1.25" + "@opentelemetry/instrumentation" "^0.52" + "@opentelemetry/instrumentation-grpc" "^0.52" + "@opentelemetry/resources" "^1.25" + "@opentelemetry/sdk-trace-base" "^1.25" + "@opentelemetry/sdk-trace-node" "^1.25" + "@opentelemetry/semantic-conventions" "^1.25" + "@pulumi/query" "^0.3.0" + "@types/google-protobuf" "^3.15.5" + "@types/semver" "^7.5.6" + "@types/tmp" "^0.2.6" + execa "^5.1.0" + fdir "^6.1.1" + google-protobuf "^3.5.0" + got "^11.8.6" + ini "^2.0.0" + js-yaml "^3.14.0" + minimist "^1.2.6" + normalize-package-data "^6.0.0" + picomatch "^3.0.1" + pkg-dir "^7.0.0" + require-from-string "^2.0.1" + semver "^7.5.2" + source-map-support "^0.5.6" + tmp "^0.2.1" + upath "^1.1.0" + "@pulumi/query@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@pulumi/query/-/query-0.3.0.tgz#f496608e86a18c3dd31b6c533408e2441c29071d" diff --git a/provider/go.mod b/provider/go.mod index 5833ca159..0e104bf3e 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -6,8 +6,8 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/pkg/errors v0.9.1 github.com/pulumi/providertest v0.0.15 - github.com/pulumi/pulumi/pkg/v3 v3.135.0 - github.com/pulumi/pulumi/sdk/v3 v3.135.0 + github.com/pulumi/pulumi/pkg/v3 v3.136.1 + github.com/pulumi/pulumi/sdk/v3 v3.136.1 github.com/stretchr/testify v1.9.0 ) diff --git a/provider/go.sum b/provider/go.sum index 25e3ac2cb..bd550b664 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -358,10 +358,10 @@ github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+Sob github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY= github.com/pulumi/providertest v0.0.15 h1:nvpEHVvcAkiq3NguPUutB+si3sjU2PmFqkV8yw9QFhQ= github.com/pulumi/providertest v0.0.15/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= -github.com/pulumi/pulumi/pkg/v3 v3.135.0 h1:f4pBtLUf9+fa0+vVmLB4Mkdlh1KboXEt7h3pkF1seVs= -github.com/pulumi/pulumi/pkg/v3 v3.135.0/go.mod h1:6RkK4xeCtl54+PljZFwLASs6TADOE+IMofX0wj1SocY= -github.com/pulumi/pulumi/sdk/v3 v3.135.0 h1:oBP7QsmZv6uUf3eJ9j6av0nrZpipV9IguNu6rVpHlFU= -github.com/pulumi/pulumi/sdk/v3 v3.135.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +github.com/pulumi/pulumi/pkg/v3 v3.136.1 h1:zA8aJZ7qI0QgZkBKjjQaYHEcigK6pZfrbfG38imXzWo= +github.com/pulumi/pulumi/pkg/v3 v3.136.1/go.mod h1:Iz8QIs07AbEdrO52hEIEM5C4VBDUYFH2NdM9u2xxBxY= +github.com/pulumi/pulumi/sdk/v3 v3.136.1 h1:VJWTgdBrLvvzIkMbGq/epNEfT65P9gTvw14UF/I7hTI= +github.com/pulumi/pulumi/sdk/v3 v3.136.1/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index ac6ea0b90..634531342 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -15,7 +15,7 @@ "dependencies": { "@pulumi/aws": "^6.18.2", "@pulumi/kubernetes": "^4.1.1", - "@pulumi/pulumi": "^3.134.1", + "@pulumi/pulumi": "^3.136.0", "https-proxy-agent": "^5.0.1", "jest": "^29.7.0", "js-yaml": "^4.1.0", diff --git a/sdk/nodejs/yarn.lock b/sdk/nodejs/yarn.lock index d2de0013a..5f8684218 100644 --- a/sdk/nodejs/yarn.lock +++ b/sdk/nodejs/yarn.lock @@ -957,10 +957,10 @@ tmp "^0.2.1" upath "^1.1.0" -"@pulumi/pulumi@^3.134.1": - version "3.135.0" - resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.135.0.tgz#07d7dddd8e6b2a8c4eb951e2603c36e2a6750bd9" - integrity sha512-RYsv44UECC8MHtTEGWS6olVFmI9ad8iEySm9xmgoOk8Au6Lulf4phf1HiXEV8+vR9+3Lmtt4pYYdKrRvf4TfhQ== +"@pulumi/pulumi@^3.136.0": + version "3.136.1" + resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.136.1.tgz#1ef187cdb3f3b4abf119ae6088e76edb20947ed4" + integrity sha512-bO+AVYKyf4dFDVSbBRoCiwAVE0JhugwAEv5FmWit+VHE3f9eoy1qrw7t5DmGmAiL2cGCwTpvVEIf4y1N7360ZA== dependencies: "@grpc/grpc-js" "^1.10.1" "@logdna/tail-file" "^2.0.6" diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index c3fc3d8d4..530dd02e5 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "pulumi_eks" description = "Pulumi Amazon Web Services (AWS) EKS Components." - dependencies = ["parver>=0.2.1", "pulumi>=3.134.1,<4.0.0", "pulumi-aws>=6.0.0,<7.0.0", "pulumi-kubernetes>=4.0.0,<5.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""] + dependencies = ["parver>=0.2.1", "pulumi>=3.136.0,<4.0.0", "pulumi-aws>=6.0.0,<7.0.0", "pulumi-kubernetes>=4.0.0,<5.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""] keywords = ["pulumi", "aws", "eks"] readme = "README.md" requires-python = ">=3.8" From b01e3501e6380369fbc4980f2cebc8b19ed067f9 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Thu, 17 Oct 2024 11:55:33 +0200 Subject: [PATCH 2/2] Update AWS dependency to 6.56.0 --- nodejs/eks/package.json | 9 +++-- nodejs/eks/yarn.lock | 75 ++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/nodejs/eks/package.json b/nodejs/eks/package.json index ad3b0db86..0e3d77254 100644 --- a/nodejs/eks/package.json +++ b/nodejs/eks/package.json @@ -13,7 +13,9 @@ "format": "prettier --list-different --write .", "lint-check": "yarn run format-check && tslint -c ../tslint.json -p tsconfig.json", "lint": "yarn run format && tslint -c ../tslint.json -p tsconfig.json --fix", - "test": "jest" + "test": "jest", + "dedupe-deps": "yarn-deduplicate", + "check-duplicate-deps": "yarn-deduplicate --fail" }, "homepage": "https://pulumi.com", "repository": { @@ -22,7 +24,7 @@ }, "bugs": "https://github.com/pulumi/pulumi-eks/issues", "dependencies": { - "@pulumi/aws": "^6.18.2", + "@pulumi/aws": "^6.56.0", "@pulumi/kubernetes": "^4.1.1", "@pulumi/pulumi": "^3.136.1", "https-proxy-agent": "^5.0.1", @@ -47,7 +49,8 @@ "prettier": "^2.8.1", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", - "typescript": "^4.6.2" + "typescript": "^4.6.2", + "yarn-deduplicate": "^6.0.2" }, "pulumi": { "resource": true diff --git a/nodejs/eks/yarn.lock b/nodejs/eks/yarn.lock index 8cac817f5..403e48486 100644 --- a/nodejs/eks/yarn.lock +++ b/nodejs/eks/yarn.lock @@ -1656,12 +1656,12 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== -"@pulumi/aws@^6.18.2": - version "6.45.0" - resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.45.0.tgz#f3cf0fea34214906cf2e35f7ab57d6195b4d668a" - integrity sha512-EhRlYs0Ig53nHRNv3NSgb5TPpJuDmA+N0HCUkPhODUT9n1KTahQnoLbMc+hbvJKPngx6hgye7fagARPO3kWPVw== +"@pulumi/aws@^6.56.0": + version "6.56.0" + resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.56.0.tgz#bd6ab6c3326d7fbe29dcc077a9a0b5c2bbccd5db" + integrity sha512-7Huxe+hREqybvVM3wiA8j0aaqg0SZIiz8lHXsX/H45FWiBwMRcwLZoCqt76uVsxAu6EaCxc4LmmsYDcDgPEszA== dependencies: - "@pulumi/pulumi" "^3.0.0" + "@pulumi/pulumi" "^3.136.0" builtin-modules "3.0.0" mime "^2.0.0" resolve "^1.7.1" @@ -1679,43 +1679,7 @@ shell-quote "^1.6.1" tmp "^0.0.33" -"@pulumi/pulumi@^3.0.0", "@pulumi/pulumi@^3.25.0": - version "3.124.0" - resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.124.0.tgz#520e80c6b0bac41976360aca595e7d79a73633c9" - integrity sha512-5ytgK1RQYZD310aj0+RTauBpnB1RVO0j4Ql7tvpioklwRmOclVzTMyeaR2xd02Gpw9iyRwvoWHxgCV0owPdu+w== - dependencies: - "@grpc/grpc-js" "^1.10.1" - "@logdna/tail-file" "^2.0.6" - "@npmcli/arborist" "^7.3.1" - "@opentelemetry/api" "^1.9" - "@opentelemetry/exporter-zipkin" "^1.25" - "@opentelemetry/instrumentation" "^0.52" - "@opentelemetry/instrumentation-grpc" "^0.52" - "@opentelemetry/resources" "^1.25" - "@opentelemetry/sdk-trace-base" "^1.25" - "@opentelemetry/sdk-trace-node" "^1.25" - "@opentelemetry/semantic-conventions" "^1.25" - "@pulumi/query" "^0.3.0" - "@types/google-protobuf" "^3.15.5" - "@types/semver" "^7.5.6" - "@types/tmp" "^0.2.6" - execa "^5.1.0" - fdir "^6.1.1" - google-protobuf "^3.5.0" - got "^11.8.6" - ini "^2.0.0" - js-yaml "^3.14.0" - minimist "^1.2.6" - normalize-package-data "^6.0.0" - picomatch "^3.0.1" - pkg-dir "^7.0.0" - require-from-string "^2.0.1" - semver "^7.5.2" - source-map-support "^0.5.6" - tmp "^0.2.1" - upath "^1.1.0" - -"@pulumi/pulumi@^3.136.1": +"@pulumi/pulumi@^3.136.0", "@pulumi/pulumi@^3.136.1", "@pulumi/pulumi@^3.25.0": version "3.136.1" resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.136.1.tgz#1ef187cdb3f3b4abf119ae6088e76edb20947ed4" integrity sha512-bO+AVYKyf4dFDVSbBRoCiwAVE0JhugwAEv5FmWit+VHE3f9eoy1qrw7t5DmGmAiL2cGCwTpvVEIf4y1N7360ZA== @@ -2021,6 +1985,11 @@ dependencies: "@types/yargs-parser" "*" +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abbrev@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" @@ -2483,6 +2452,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.12.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -4690,7 +4664,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4: +semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -5065,6 +5039,11 @@ tslib@^1.13.0, tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.5.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.0.tgz#d124c86c3c05a40a91e6fdea4021bd31d377971b" + integrity sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA== + tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -5359,6 +5338,16 @@ yargs@^17.3.1, yargs@^17.7.2: y18n "^5.0.5" yargs-parser "^21.1.1" +yarn-deduplicate@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-6.0.2.tgz#63498d2d4c3a8567e992a994ce0ab51aa5681f2e" + integrity sha512-Efx4XEj82BgbRJe5gvQbZmEO7pU5DgHgxohYZp98/+GwPqdU90RXtzvHirb7hGlde0sQqk5G3J3Woyjai8hVqA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + commander "^10.0.1" + semver "^7.5.0" + tslib "^2.5.0" + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"