Skip to content

Commit

Permalink
Fix: Do not over-specify SDK versions (#1414)
Browse files Browse the repository at this point in the history 
Re: pulumi/ci-mgmt#1091

This additionally bumps the pu/pu version to 3.135.0.
  • Loading branch information
@flostadler
flostadler authored Oct 2, 2024
1 parent ea15764 commit 77fd6de
Show file tree
Hide file tree
Showing 19 changed files with 893 additions and 46 deletions.
2 changes: 0 additions & 2 deletions provider/cmd/pulumi-gen-eks/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,6 @@ func generateSchema(version semver.Version) schema.PackageSpec {
}),
"python": rawMessage(map[string]interface{}{
"requires": map[string]string{
"pulumi": ">=3.0.0,<4.0.0",
"pulumi-aws": ">=6.0.0,<7.0.0",
"pulumi-kubernetes": ">=4.0.0,<5.0.0",
},
Expand Down Expand Up @@ -2001,7 +2000,6 @@ func generateSchema(version semver.Version) schema.PackageSpec {
"dependencies": map[string]string{
"@pulumi/aws": "^6.18.2",
"@pulumi/kubernetes": "^4.1.1",
"@pulumi/pulumi": "^3.47.0",
"https-proxy-agent": "^5.0.1",
"jest": "^29.7.0",
"js-yaml": "^4.1.0",
Expand Down
2 changes: 0 additions & 2 deletions provider/cmd/pulumi-resource-eks/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"dependencies": {
"@pulumi/aws": "^6.18.2",
"@pulumi/kubernetes": "^4.1.1",
"@pulumi/pulumi": "^3.47.0",
"https-proxy-agent": "^5.0.1",
"jest": "^29.7.0",
"js-yaml": "^4.1.0",
Expand All @@ -61,7 +60,6 @@
},
"readme": "Pulumi Amazon Web Services (AWS) EKS Components.",
"requires": {
"pulumi": "\u003e=3.0.0,\u003c4.0.0",
"pulumi-aws": "\u003e=6.0.0,\u003c7.0.0",
"pulumi-kubernetes": "\u003e=4.0.0,\u003c5.0.0"
},
Expand Down
9 changes: 4 additions & 5 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ module github.com/pulumi/pulumi-eks/provider
go 1.21.0

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.129.0
github.com/pulumi/pulumi/sdk/v3 v3.129.0
github.com/pulumi/pulumi/pkg/v3 v3.135.0
github.com/pulumi/pulumi/sdk/v3 v3.135.0
github.com/stretchr/testify v1.9.0
)

Expand Down Expand Up @@ -49,7 +50,6 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/charmbracelet/bubbles v0.18.0 // indirect
github.com/charmbracelet/bubbletea v0.25.0 // indirect
Expand Down Expand Up @@ -131,7 +131,7 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.9.1 // indirect
github.com/pulumi/esc v0.10.0 // indirect
github.com/pulumi/inflector v0.1.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
Expand All @@ -146,7 +146,6 @@ require (
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
Expand Down
14 changes: 6 additions & 8 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,16 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435cARxCW6q9gc0S/Yxz7Mkd38pOb0=
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs=
github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c=
github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+SobA=
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.129.0 h1:n4Jd4ctlvw3eqyHglb/yJKDtRqjOvdkCBfG5T+orU30=
github.com/pulumi/pulumi/pkg/v3 v3.129.0/go.mod h1:W3c7JgO064kUH5IfyQMCgmsAr5iwr3PO6KEeIQiO0dY=
github.com/pulumi/pulumi/sdk/v3 v3.129.0 h1:uZpTTwWTx7Mk8UT9FgatzxzArim47vZ6hzNCKvgvX6A=
github.com/pulumi/pulumi/sdk/v3 v3.129.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
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/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=
Expand Down Expand Up @@ -418,8 +418,6 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68=
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7/go.mod h1:UxoP3EypF8JfGEjAII8jx1q8rQyDnX8qdTCs/UQBVIE=
github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@pulumi/aws": "^6.18.2",
"@pulumi/kubernetes": "^4.1.1",
"@pulumi/pulumi": "^3.47.0",
"@pulumi/pulumi": "^3.134.1",
"https-proxy-agent": "^5.0.1",
"jest": "^29.7.0",
"js-yaml": "^4.1.0",
Expand Down
38 changes: 37 additions & 1 deletion sdk/nodejs/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,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.130.0"
resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.130.0.tgz#526f5e248900af1a4cacf213ece38e506f92881f"
integrity sha512-WsvXRfEdCz+AcuzP41ABgN5Ye3qLt4v/EVZXUT7sMHU6G8uazaLtS92tpvNp+pgeRZf9kbotCEoABXKg+d+1oQ==
Expand Down Expand Up @@ -957,6 +957,42 @@
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==
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"
Expand Down
Loading

0 comments on commit 77fd6de

Please sign in to comment.