diff --git a/.pulumi.version b/.pulumi.version index 391e8c6..e4e8f53 100644 --- a/.pulumi.version +++ b/.pulumi.version @@ -1 +1 @@ -3.134.1 +3.136.1 diff --git a/examples/go/go.mod b/examples/go/go.mod index 22e9b9b..e228f64 100644 --- a/examples/go/go.mod +++ b/examples/go/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.9 require ( github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.0-20240425180359-26c144c916b7 - github.com/pulumi/pulumi/sdk/v3 v3.134.1 + github.com/pulumi/pulumi/sdk/v3 v3.136.1 ) require ( diff --git a/examples/go/go.sum b/examples/go/go.sum index 5fb6f77..91958fc 100644 --- a/examples/go/go.sum +++ b/examples/go/go.sum @@ -154,8 +154,8 @@ 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/pulumi-docker-build/sdk/go/dockerbuild v0.0.0-20240425180359-26c144c916b7 h1:elp7Ar01zvIJtRQv+megjeGSfpxxzPYyKBGfDDtWFBA= github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.0-20240425180359-26c144c916b7/go.mod h1:48lEA1mq2tRC4SfASAJmLYG1hRWM5sP5VPFeoZEM54U= -github.com/pulumi/pulumi/sdk/v3 v3.134.1 h1:v1zd0d+B9gpUhsdJ483YUMHwHXqDvXvZ+mh/A4HhPWg= -github.com/pulumi/pulumi/sdk/v3 v3.134.1/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +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.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= diff --git a/go.mod b/go.mod index 918ef72..085a888 100644 --- a/go.mod +++ b/go.mod @@ -17,15 +17,15 @@ require ( github.com/muesli/reflow v0.3.0 github.com/otiai10/copy v1.14.0 github.com/pulumi/providertest v0.0.13 - github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20240624150732-fa777213effd + github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20241007152751-9462eb25c7f9 github.com/pulumi/pulumi-go-provider v0.23.0 github.com/pulumi/pulumi-java/pkg v0.16.1 github.com/pulumi/pulumi-yaml v1.10.3 - github.com/pulumi/pulumi/pkg/v3 v3.134.1 - github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240910123829-a0ad0ad24344 - github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20240910123829-a0ad0ad24344 - github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20240910123829-a0ad0ad24344 - github.com/pulumi/pulumi/sdk/v3 v3.134.1 + github.com/pulumi/pulumi/pkg/v3 v3.136.1 + github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20241011192335-fd77fa0e32b8 + github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20241011192335-fd77fa0e32b8 + github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20241011192335-fd77fa0e32b8 + github.com/pulumi/pulumi/sdk/v3 v3.136.1 github.com/regclient/regclient v0.7.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.11.0 @@ -260,6 +260,7 @@ require ( github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect github.com/jjti/go-spancheck v0.6.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/julz/importas v0.1.0 // indirect diff --git a/go.sum b/go.sum index 7f8e91c..e198b8d 100644 --- a/go.sum +++ b/go.sum @@ -650,6 +650,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -938,24 +940,24 @@ github.com/pulumi/inflector v0.2.1 h1:bqyiish3tq//vLeLiEstSFE5K7RNjy/ce47ed4QATu github.com/pulumi/inflector v0.2.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY= github.com/pulumi/providertest v0.0.13 h1:9CAaoviOTuCVHDI15h3znXa5JsKYtXLYHIIdxOCzo3Y= github.com/pulumi/providertest v0.0.13/go.mod h1:REAoaN+hGOtdWJGirfWYqcSjCejlbGfzyVTUuemJTuE= -github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20240624150732-fa777213effd h1:Ifc7JJZF0WVt+snPsDaEdkCcQXht2x/Hcw7GPnK5gvs= -github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20240624150732-fa777213effd/go.mod h1:poRLYpZlEjDr09kC2f50srI97hjjmNay55FBMl6ZHug= +github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20241007152751-9462eb25c7f9 h1:584P5i+HCXPuOAdOHSfvcLYpbWDxXLBCz3nwHXe53AI= +github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet v0.0.0-20241007152751-9462eb25c7f9/go.mod h1:O1ztHKzNtM6CslOUk9kXoBdI4AYQWuga3kZSA7F8xjg= github.com/pulumi/pulumi-go-provider v0.23.0 h1:cJCORjoxnnU4/K2Hnxb8wG540N/DlvxwOkDM1CiyQo4= github.com/pulumi/pulumi-go-provider v0.23.0/go.mod h1:F8liLNHpntb2FkIl8GeVHuC1OWo4dDxIelz1/D8Obkw= github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns= github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM= github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4= github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y= -github.com/pulumi/pulumi/pkg/v3 v3.134.1 h1:iGKvaSHEoPCGBqDoIGQUXUm3qkrawfd513lL0I9vnNQ= -github.com/pulumi/pulumi/pkg/v3 v3.134.1/go.mod h1:1iCee1QIwXYvkIQJ/HnBjsPsmYJ/arBPWX6hAao/Pro= -github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240910123829-a0ad0ad24344 h1:ECrEunusZWugSrR3ryUHd95FBucGAisyKokFO3dsTEY= -github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240910123829-a0ad0ad24344/go.mod h1:asvIJPHl46oZeYhRL3JaY21ndoBxiegN/pAPZXM/500= -github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20240910123829-a0ad0ad24344 h1:VAvbg4d+NrAr3cFeyAw8vcKV4mY+iz74cHWZ1vGVb+w= -github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20240910123829-a0ad0ad24344/go.mod h1:39QWcuWEZ2NvRCsi5Gt3d5YmGcMMCOpIZhMW4ZbfPVE= -github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20240910123829-a0ad0ad24344 h1:WErS7oj/lPmoYDZ9aJGH2QriE3DyDrIpdfoYyclV2Bo= -github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20240910123829-a0ad0ad24344/go.mod h1:JDvmtZ36LbRZ9DSkPcWU0BQjYmdsPBfEPApOgOp7q0Q= -github.com/pulumi/pulumi/sdk/v3 v3.134.1 h1:v1zd0d+B9gpUhsdJ483YUMHwHXqDvXvZ+mh/A4HhPWg= -github.com/pulumi/pulumi/sdk/v3 v3.134.1/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/go/pulumi-language-go/v3 v3.0.0-20241011192335-fd77fa0e32b8 h1:a5jY3VUzGNX8NBS9GrDCWz1ETIOc1SK39nwN9uE6r1o= +github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20241011192335-fd77fa0e32b8/go.mod h1:+X22AqGvnzDCkZRx+DS7fl/qCZCTiqq+IgLNEAShHYI= +github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20241011192335-fd77fa0e32b8 h1:RrMSbkHf+mCWKCHWnnkgPQ4/B/cvHmz/f8Rzu3dQ2lY= +github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3 v3.0.0-20241011192335-fd77fa0e32b8/go.mod h1:tXgA0Z4noi9LRQ1uLXuDoclEk3iNuIgyVyskRD3ypw8= +github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20241011192335-fd77fa0e32b8 h1:ICrgL37gn1AEywASd1x19lC0ZFuUttAntva5FSHINZk= +github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3 v3.0.0-20241011192335-fd77fa0e32b8/go.mod h1:n2g9VL34OSu4/DYsy9S27v2+gERgARHXEolILGD3jB8= +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/quasilyte/go-ruleguard v0.4.2 h1:htXcXDK6/rO12kiTHKfHuqR4kr3Y4M0J0rOL6CH/BYs= github.com/quasilyte/go-ruleguard v0.4.2/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI= github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE= diff --git a/sdk/go/dockerbuild/go.mod b/sdk/go/dockerbuild/go.mod index 749b3a8..d8ab4b0 100644 --- a/sdk/go/dockerbuild/go.mod +++ b/sdk/go/dockerbuild/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.6 require ( github.com/blang/semver v3.5.1+incompatible - github.com/pulumi/pulumi/sdk/v3 v3.134.1 + github.com/pulumi/pulumi/sdk/v3 v3.136.1 ) require ( diff --git a/sdk/go/dockerbuild/go.sum b/sdk/go/dockerbuild/go.sum index fb7d453..af70734 100644 --- a/sdk/go/dockerbuild/go.sum +++ b/sdk/go/dockerbuild/go.sum @@ -154,8 +154,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= 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/pulumi/sdk/v3 v3.134.1 h1:v1zd0d+B9gpUhsdJ483YUMHwHXqDvXvZ+mh/A4HhPWg= -github.com/pulumi/pulumi/sdk/v3 v3.134.1/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +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.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index d0d6443..6bb7b8b 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -14,7 +14,7 @@ "build": "tsc" }, "dependencies": { - "@pulumi/pulumi": "^3.133.0" + "@pulumi/pulumi": "^3.136.0" }, "devDependencies": { "@types/node": "^14", diff --git a/sdk/python/pulumi_docker_build/_utilities.py b/sdk/python/pulumi_docker_build/_utilities.py index dcf4c01..67959f3 100644 --- a/sdk/python/pulumi_docker_build/_utilities.py +++ b/sdk/python/pulumi_docker_build/_utilities.py @@ -264,7 +264,7 @@ def call_plain( output = pulumi.runtime.call(tok, props, res, typ) # Ingoring deps silently. They are typically non-empty, r.f() calls include r as a dependency. - result, known, secret, _ = _sync_await(asyncio.ensure_future(_await_output(output))) + result, known, secret, _ = _sync_await(asyncio.create_task(_await_output(output))) problem = None if not known: diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index 81d153f..59fbd1d 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "pulumi_docker_build" description = "A Pulumi provider for building modern Docker images with buildx and BuildKit." - dependencies = ["parver>=0.2.1", "pulumi>=3.0.0,<4.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", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""] keywords = ["docker", "buildkit", "buildx", "kind/native"] readme = "README.md" requires-python = ">=3.8"