From fee3069da364ad3a4ac370f30264d80ff1aa0025 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 16 Aug 2024 08:55:50 -0600 Subject: [PATCH] Upgrade pulumi-terraform-bridge to v3.89.1 (#1200) This PR was generated via `$ upgrade-provider pulumi/pulumi-docker --kind=bridge --pr-reviewers=iwahbe`. --- - Updating Java Gen version from 0.12.0 to 0.15.0. - Upgrading pulumi-terraform-bridge from v3.88.0 to v3.89.1. --- .pulumi-java-gen.version | 2 +- examples/go.mod | 12 +- examples/go.sum | 24 +- .../cmd/pulumi-resource-docker/schema.json | 68 ++-- provider/go.mod | 20 +- provider/go.sum | 42 ++- provider/pkg/docs-gen/examples/image.md | 46 +-- sdk/dotnet/Container.cs | 56 +-- sdk/dotnet/GetNetwork.cs | 4 +- sdk/dotnet/GetPlugin.cs | 56 ++- sdk/dotnet/Inputs/NetworkIpamConfigArgs.cs | 6 +- sdk/dotnet/Inputs/NetworkIpamConfigGetArgs.cs | 6 +- .../ServiceTaskSpecContainerSpecArgs.cs | 6 +- .../ServiceTaskSpecContainerSpecGetArgs.cs | 6 +- sdk/dotnet/Network.cs | 28 +- .../Outputs/GetNetworkIpamConfigResult.cs | 4 +- sdk/dotnet/Outputs/NetworkIpamConfig.cs | 4 +- .../Outputs/ServiceTaskSpecContainerSpec.cs | 4 +- sdk/dotnet/RegistryImage.cs | 14 +- sdk/dotnet/RemoteImage.cs | 14 +- sdk/dotnet/Volume.cs | 14 +- sdk/go.mod | 2 +- sdk/go.sum | 4 +- sdk/go/docker/container.go | 56 +-- sdk/go/docker/getNetwork.go | 6 +- sdk/go/docker/getPlugin.go | 34 +- sdk/go/docker/network.go | 28 +- sdk/go/docker/pulumiTypes.go | 30 +- sdk/go/docker/registryImage.go | 14 +- sdk/go/docker/remoteImage.go | 14 +- sdk/go/docker/volume.go | 14 +- sdk/java/build.gradle | 4 +- .../java/com/pulumi/docker/Container.java | 48 +-- .../java/com/pulumi/docker/ContainerArgs.java | 33 +- .../com/pulumi/docker/DockerFunctions.java | 322 ++++++++++++++---- .../main/java/com/pulumi/docker/Image.java | 23 +- .../main/java/com/pulumi/docker/Network.java | 36 +- .../java/com/pulumi/docker/NetworkArgs.java | 17 +- .../main/java/com/pulumi/docker/Plugin.java | 23 +- .../main/java/com/pulumi/docker/Provider.java | 17 +- .../java/com/pulumi/docker/RegistryImage.java | 30 +- .../com/pulumi/docker/RegistryImageArgs.java | 9 +- .../java/com/pulumi/docker/RemoteImage.java | 30 +- .../com/pulumi/docker/RemoteImageArgs.java | 9 +- .../main/java/com/pulumi/docker/Secret.java | 23 +- .../main/java/com/pulumi/docker/Service.java | 23 +- .../java/com/pulumi/docker/ServiceConfig.java | 23 +- .../src/main/java/com/pulumi/docker/Tag.java | 23 +- .../java/com/pulumi/docker/Utilities.java | 14 +- .../main/java/com/pulumi/docker/Volume.java | 30 +- .../java/com/pulumi/docker/VolumeArgs.java | 9 +- .../pulumi/docker/enums/BuilderVersion.java | 2 +- .../pulumi/docker/inputs/ContainerState.java | 33 +- .../docker/inputs/NetworkIpamConfigArgs.java | 9 +- .../pulumi/docker/inputs/NetworkState.java | 17 +- .../docker/inputs/RegistryImageState.java | 9 +- .../docker/inputs/RemoteImageState.java | 9 +- .../ServiceTaskSpecContainerSpecArgs.java | 9 +- .../com/pulumi/docker/inputs/VolumeState.java | 9 +- .../docker/outputs/GetNetworkIpamConfig.java | 9 +- .../docker/outputs/GetNetworkResult.java | 9 +- .../docker/outputs/NetworkIpamConfig.java | 9 +- .../outputs/ServiceTaskSpecContainerSpec.java | 9 +- sdk/nodejs/container.ts | 24 +- sdk/nodejs/getNetwork.ts | 2 +- sdk/nodejs/getPlugin.ts | 40 ++- sdk/nodejs/network.ts | 12 +- sdk/nodejs/registryImage.ts | 6 +- sdk/nodejs/remoteImage.ts | 6 +- sdk/nodejs/types/input.ts | 4 +- sdk/nodejs/types/output.ts | 6 +- sdk/nodejs/volume.ts | 6 +- sdk/python/pulumi_docker/_inputs.py | 16 +- sdk/python/pulumi_docker/container.py | 226 ++++++------ sdk/python/pulumi_docker/get_network.py | 2 +- sdk/python/pulumi_docker/get_plugin.py | 28 +- sdk/python/pulumi_docker/image.py | 104 +++--- sdk/python/pulumi_docker/network.py | 76 ++--- sdk/python/pulumi_docker/outputs.py | 18 +- sdk/python/pulumi_docker/plugin.py | 10 +- sdk/python/pulumi_docker/provider.py | 4 +- sdk/python/pulumi_docker/registry_image.py | 28 +- sdk/python/pulumi_docker/remote_image.py | 62 ++-- sdk/python/pulumi_docker/secret.py | 10 +- sdk/python/pulumi_docker/service.py | 80 ++--- sdk/python/pulumi_docker/volume.py | 38 +-- 86 files changed, 1311 insertions(+), 1014 deletions(-) diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version index d33c3a21..7092c7c4 100644 --- a/.pulumi-java-gen.version +++ b/.pulumi-java-gen.version @@ -1 +1 @@ -0.12.0 \ No newline at end of file +0.15.0 \ No newline at end of file diff --git a/examples/go.mod b/examples/go.mod index d9a99aad..bc14e95b 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/docker/docker v27.0.3+incompatible - github.com/pulumi/pulumi/pkg/v3 v3.126.0 + github.com/pulumi/pulumi/pkg/v3 v3.129.0 github.com/stretchr/testify v1.9.0 ) @@ -134,7 +134,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect github.com/pulumi/esc v0.9.1 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.126.0 // indirect + github.com/pulumi/pulumi/sdk/v3 v3.129.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect @@ -164,14 +164,14 @@ require ( go.uber.org/atomic v1.10.0 // indirect gocloud.dev v0.37.0 // indirect gocloud.dev/secrets/hashivault v0.37.0 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.22.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 4774c9b4..ae4a0e0b 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -354,10 +354,10 @@ 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.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/pkg/v3 v3.126.0 h1:XaZU1ehjHN2I5ihkfwxK/UFMDiCDM9FSt2TBnbldAx4= -github.com/pulumi/pulumi/pkg/v3 v3.126.0/go.mod h1:1P4/oK9zceOJUm48QQl/TqjDN68lfsdnTR1FITTFddw= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +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/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= @@ -452,8 +452,8 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM= golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= @@ -489,8 +489,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= @@ -531,8 +531,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -542,8 +542,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/provider/cmd/pulumi-resource-docker/schema.json b/provider/cmd/pulumi-resource-docker/schema.json index 9caf7020..8cd28ebd 100644 --- a/provider/cmd/pulumi-resource-docker/schema.json +++ b/provider/cmd/pulumi-resource-docker/schema.json @@ -574,7 +574,7 @@ "auxAddress": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Auxiliary IPv4 or IPv6 addresses used by Network driver\n", "willReplaceOnChanges": true @@ -1302,7 +1302,7 @@ "sysctl": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Sysctls config (Linux only)\n", "willReplaceOnChanges": true @@ -1955,7 +1955,7 @@ "auxAddress": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Auxiliary IPv4 or IPv6 addresses used by Network driver\n" }, @@ -2221,7 +2221,7 @@ "logOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs to use as options for the logging driver.\n" }, @@ -2342,21 +2342,21 @@ "storageOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs for the storage driver options, e.g. `size`: `120G`\n" }, "sysctls": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of kernel parameters (sysctls) to set in the container.\n" }, "tmpfs": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options.\n" }, @@ -2580,7 +2580,7 @@ "logOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs to use as options for the logging driver.\n", "willReplaceOnChanges": true @@ -2710,7 +2710,7 @@ "storageOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs for the storage driver options, e.g. `size`: `120G`\n", "willReplaceOnChanges": true @@ -2718,7 +2718,7 @@ "sysctls": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of kernel parameters (sysctls) to set in the container.\n", "willReplaceOnChanges": true @@ -2726,7 +2726,7 @@ "tmpfs": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options.\n" }, @@ -2952,7 +2952,7 @@ "logOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs to use as options for the logging driver.\n", "willReplaceOnChanges": true @@ -3089,7 +3089,7 @@ "storageOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Key/value pairs for the storage driver options, e.g. `size`: `120G`\n", "willReplaceOnChanges": true @@ -3097,7 +3097,7 @@ "sysctls": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of kernel parameters (sysctls) to set in the container.\n", "willReplaceOnChanges": true @@ -3105,7 +3105,7 @@ "tmpfs": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options.\n" }, @@ -3166,7 +3166,7 @@ } }, "docker:index/image:Image": { - "description": "`Image` builds a Docker image and pushes it Docker and OCI compatible registries.\nThis resource enables running Docker builds as part of a Pulumi deployment.\n\nNote: We recommend you migrate your images to the more modern [Docker\nBuild](https://www.pulumi.com/registry/packages/docker-build/) provider to get\nthe best possible support, features, and performance.\n\nNote: This resource does not delete tags, locally or remotely, when destroyed.\n\n## Image name\n\nThe Image resource uses `imageName` to refer to a fully qualified Docker image name, by the format `repository:tag`.\nNote that this does not include any digest information and thus will not cause any updates when passed to dependencies,\neven when using `latest` tag. To trigger such updates, e.g. when referencing pushed images in container orchestration \nand management resources, please use the `repoDigest` Output instead, which is of the format \n`repository@\u003calgorithm\u003e:\u003chash\u003e` and unique per build/push. \nAs of Docker v4.4, `repoDigest` is now available for local Images.\n\n## Cross-platform builds\n\nThe Image resource supports cross-platform builds when the [Docker engine has cross-platform support enabled via emulators](https://docs.docker.com/build/building/multi-platform/#building-multi-platform-images).\nThe Image resource currently supports providing only a single operating system and architecture in the `platform` field, e.g.: `linux/amd64`.\nTo enable this support, you may need to install the emulators in the environment running your Pulumi program.\n\nIf you are using Linux, you may be using Docker Engine or Docker Desktop for Linux, depending on how you have installed Docker. The [FAQ for Docker Desktop for Linux](https://docs.docker.com/desktop/faqs/linuxfaqs/#context) describes the differences and how to select which Docker context is in use.\n\n* For local development using Docker Desktop, this is enabled by default.\n* For systems using Docker Engine, install the QEMU binaries and register them with using the docker image from [github.com/tonistiigi/binfmt](https://github.com/tonistiigi/binfmt):\n\n ```shell\n docker run --privileged --rm tonistiigi/binfmt --install all\n ```\n* In a GitHub Actions workflow, the [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) can be used instead by adding this step to your workflow file. Example workflow usage:\n\n ```yaml\n name: Pulumi\n on:\n push:\n branches:\n - master\n jobs:\n up:\n name: Preview\n runs-on: ubuntu-latest\n steps:\n # This is the step added:\n - name: Set up QEMU\n uses: docker/setup-qemu-action@v2\n # The ordinary pulumi/actions workflow:\n - uses: actions/checkout@v3\n - uses: pulumi/actions@v4\n with:\n command: preview\n stack-name: org-name/stack-name\n env:\n PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}\n ```\n\n\n{{% examples %}}\n## Example Usage\n{{% example %}}\n### A Docker image build\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst demoImage = new docker.Image(\"demo-image\", {\n build: {\n context: \".\",\n dockerfile: \"Dockerfile\",\n platform: \"linux/amd64\",\n },\n imageName: \"username/image:tag1\",\n skipPush: true,\n});\nexport const imageName = demoImage.imageName;\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\ndemo_image = docker.Image(\"demo-image\",\n build=docker.DockerBuildArgs(\n context=\".\",\n dockerfile=\"Dockerfile\",\n platform=\"linux/amd64\",\n ),\n image_name=\"username/image:tag1\",\n skip_push=True)\npulumi.export(\"imageName\", demo_image.image_name)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var demoImage = new Docker.Image(\"demo-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Context = \".\",\n Dockerfile = \"Dockerfile\",\n Platform = \"linux/amd64\",\n },\n ImageName = \"username/image:tag1\",\n SkipPush = true,\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = demoImage.ImageName,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tdemoImage, err := docker.NewImage(ctx, \"demo-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tDockerfile: pulumi.String(\"Dockerfile\"),\n\t\t\t\tPlatform: pulumi.String(\"linux/amd64\"),\n\t\t\t},\n\t\t\tImageName: pulumi.String(\"username/image:tag1\"),\n\t\t\tSkipPush: pulumi.Bool(true),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", demoImage.ImageName)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: A Docker image build\nname: image-yaml\noutputs:\n imageName: ${demo-image.imageName}\nresources:\n demo-image:\n options:\n version: v4.4.0\n properties:\n build:\n context: .\n dockerfile: Dockerfile\n platform: linux/amd64\n imageName: username/image:tag1\n skipPush: true\n type: docker:Image\nruntime: yaml\nvariables: {}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var demoImage = new Image(\"demoImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .context(\".\")\n .dockerfile(\"Dockerfile\")\n .platform(\"linux/amd64\")\n .build())\n .imageName(\"username/image:tag1\")\n .skipPush(true)\n .build());\n\n ctx.export(\"imageName\", demoImage.imageName());\n }\n}\n```\n{{% /example %}}\n{{% example %}}\n### A Docker image build and push\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst demoPushImage = new docker.Image(\"demo-push-image\", {\n build: {\n context: \".\",\n dockerfile: \"Dockerfile\",\n },\n imageName: \"docker.io/username/push-image:tag1\",\n});\nexport const imageName = demoPushImage.imageName;\nexport const repoDigest = demoPushImage.repoDigest;\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\ndemo_push_image = docker.Image(\"demo-push-image\",\n build=docker.DockerBuildArgs(\n context=\".\",\n dockerfile=\"Dockerfile\",\n ),\n image_name=\"docker.io/username/push-image:tag1\")\npulumi.export(\"imageName\", demo_push_image.image_name)\npulumi.export(\"repoDigest\", demo_push_image.repo_digest)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var demoPushImage = new Docker.Image(\"demo-push-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Context = \".\",\n Dockerfile = \"Dockerfile\",\n },\n ImageName = \"docker.io/username/push-image:tag1\",\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = demoPushImage.ImageName,\n [\"repoDigest\"] = demoPushImage.RepoDigest,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tdemoPushImage, err := docker.NewImage(ctx, \"demo-push-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tDockerfile: pulumi.String(\"Dockerfile\"),\n\t\t\t},\n\t\t\tImageName: pulumi.String(\"docker.io/username/push-image:tag1\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", demoPushImage.ImageName)\n\t\tctx.Export(\"repoDigest\", demoPushImage.RepoDigest)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: A Docker image build and push\nname: image-push-yaml\noutputs:\n imageName: ${demo-push-image.imageName}\n repoDigest: ${demo-push-image.repoDigest}\nresources:\n demo-push-image:\n options:\n version: v4.4.0\n properties:\n build:\n context: .\n dockerfile: Dockerfile\n imageName: docker.io/username/push-image:tag1\n type: docker:Image\nruntime: yaml\nvariables: {}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var demoPushImage = new Image(\"demoPushImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .context(\".\")\n .dockerfile(\"Dockerfile\")\n .build())\n .imageName(\"docker.io/username/push-image:tag1\")\n .build());\n\n ctx.export(\"imageName\", demoPushImage.imageName());\n ctx.export(\"repoDigest\", demoPushImage.repoDigest());\n }\n}\n```\n{{% /example %}}\n{{% example %}}\n### Docker image build using caching with AWS Elastic Container Registry\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as aws from \"@pulumi/aws\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ecrRepository = new aws.ecr.Repository(\"ecr-repository\", {name: \"docker-repository\"});\nconst authToken = aws.ecr.getAuthorizationTokenOutput({\n registryId: ecrRepository.registryId,\n});\nconst myAppImage = new docker.Image(\"my-app-image\", {\n build: {\n args: {\n BUILDKIT_INLINE_CACHE: \"1\",\n },\n cacheFrom: {\n images: [pulumi.interpolate`${ecrRepository.repositoryUrl}:latest`],\n },\n context: \"app/\",\n dockerfile: \"app/Dockerfile\",\n },\n imageName: pulumi.interpolate`${ecrRepository.repositoryUrl}:latest`,\n registry: {\n password: pulumi.secret(authToken.apply(authToken =\u003e authToken.password)),\n server: ecrRepository.repositoryUrl,\n username: authToken.apply(authToken =\u003e authToken.userName),\n },\n});\nexport const imageName = myAppImage.imageName;\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_docker as docker\n\necr_repository = aws.ecr.Repository(\"ecr-repository\", name=\"docker-repository\")\nauth_token = aws.ecr.get_authorization_token_output(registry_id=ecr_repository.registry_id)\nmy_app_image = docker.Image(\"my-app-image\",\n build=docker.DockerBuildArgs(\n args={\n \"BUILDKIT_INLINE_CACHE\": \"1\",\n },\n cache_from=docker.CacheFromArgs(\n images=[ecr_repository.repository_url.apply(lambda repository_url: f\"{repository_url}:latest\")],\n ),\n context=\"app/\",\n dockerfile=\"app/Dockerfile\",\n ),\n image_name=ecr_repository.repository_url.apply(lambda repository_url: f\"{repository_url}:latest\"),\n registry=docker.RegistryArgs(\n password=pulumi.Output.secret(auth_token.password),\n server=ecr_repository.repository_url,\n username=auth_token.user_name,\n ))\npulumi.export(\"imageName\", my_app_image.image_name)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ecrRepository = new Aws.Ecr.Repository(\"ecr-repository\", new()\n {\n Name = \"docker-repository\",\n });\n\n var authToken = Aws.Ecr.GetAuthorizationToken.Invoke(new()\n {\n RegistryId = ecrRepository.RegistryId,\n });\n\n var myAppImage = new Docker.Image(\"my-app-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Args = \n {\n { \"BUILDKIT_INLINE_CACHE\", \"1\" },\n },\n CacheFrom = new Docker.Inputs.CacheFromArgs\n {\n Images = new[]\n {\n ecrRepository.RepositoryUrl.Apply(repositoryUrl =\u003e $\"{repositoryUrl}:latest\"),\n },\n },\n Context = \"app/\",\n Dockerfile = \"app/Dockerfile\",\n },\n ImageName = ecrRepository.RepositoryUrl.Apply(repositoryUrl =\u003e $\"{repositoryUrl}:latest\"),\n Registry = new Docker.Inputs.RegistryArgs\n {\n Password = Output.CreateSecret(authToken.Apply(getAuthorizationTokenResult =\u003e getAuthorizationTokenResult.Password)),\n Server = ecrRepository.RepositoryUrl,\n Username = authToken.Apply(getAuthorizationTokenResult =\u003e getAuthorizationTokenResult.UserName),\n },\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = myAppImage.ImageName,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"fmt\"\n\n\t\"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecr\"\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tecrRepository, err := ecr.NewRepository(ctx, \"ecr-repository\", \u0026ecr.RepositoryArgs{\n\t\t\tName: pulumi.String(\"docker-repository\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tauthToken := ecr.GetAuthorizationTokenOutput(ctx, ecr.GetAuthorizationTokenOutputArgs{\n\t\t\tRegistryId: ecrRepository.RegistryId,\n\t\t}, nil)\n\t\tmyAppImage, err := docker.NewImage(ctx, \"my-app-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tArgs: pulumi.StringMap{\n\t\t\t\t\t\"BUILDKIT_INLINE_CACHE\": pulumi.String(\"1\"),\n\t\t\t\t},\n\t\t\t\tCacheFrom: \u0026docker.CacheFromArgs{\n\t\t\t\t\tImages: pulumi.StringArray{\n\t\t\t\t\t\tecrRepository.RepositoryUrl.ApplyT(func(repositoryUrl string) (string, error) {\n\t\t\t\t\t\t\treturn fmt.Sprintf(\"%v:latest\", repositoryUrl), nil\n\t\t\t\t\t\t}).(pulumi.StringOutput),\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tContext: pulumi.String(\"app/\"),\n\t\t\t\tDockerfile: pulumi.String(\"app/Dockerfile\"),\n\t\t\t},\n\t\t\tImageName: ecrRepository.RepositoryUrl.ApplyT(func(repositoryUrl string) (string, error) {\n\t\t\t\treturn fmt.Sprintf(\"%v:latest\", repositoryUrl), nil\n\t\t\t}).(pulumi.StringOutput),\n\t\t\tRegistry: \u0026docker.RegistryArgs{\n\t\t\t\tPassword: pulumi.ToSecret(authToken.ApplyT(func(authToken ecr.GetAuthorizationTokenResult) (*string, error) {\n\t\t\t\t\treturn \u0026authToken.Password, nil\n\t\t\t\t}).(pulumi.StringPtrOutput)).(pulumi.StringOutput),\n\t\t\t\tServer: ecrRepository.RepositoryUrl,\n\t\t\t\tUsername: authToken.ApplyT(func(authToken ecr.GetAuthorizationTokenResult) (*string, error) {\n\t\t\t\t\treturn \u0026authToken.UserName, nil\n\t\t\t\t}).(pulumi.StringPtrOutput),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", myAppImage.ImageName)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: Docker image build using caching with AWS Elastic Container Registry\nname: image-caching-yaml\noutputs:\n imageName: ${my-app-image.imageName}\nresources:\n ecr-repository:\n properties:\n name: docker-repository\n type: aws:ecr:Repository\n my-app-image:\n options:\n version: v4.1.2\n properties:\n build:\n args:\n BUILDKIT_INLINE_CACHE: \"1\"\n cacheFrom:\n images:\n - ${ecr-repository.repositoryUrl}:latest\n context: app/\n dockerfile: app/Dockerfile\n imageName: ${ecr-repository.repositoryUrl}:latest\n registry:\n password:\n fn::secret: ${authToken.password}\n server: ${ecr-repository.repositoryUrl}\n username: ${authToken.userName}\n type: docker:Image\nruntime: yaml\nvariables:\n authToken:\n fn::aws:ecr:getAuthorizationToken:\n registryId: ${ecr-repository.registryId}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.aws.ecr.Repository;\nimport com.pulumi.aws.ecr.RepositoryArgs;\nimport com.pulumi.aws.ecr.EcrFunctions;\nimport com.pulumi.aws.ecr.inputs.GetAuthorizationTokenArgs;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport com.pulumi.docker.inputs.CacheFromArgs;\nimport com.pulumi.docker.inputs.RegistryArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var ecrRepository = new Repository(\"ecrRepository\", RepositoryArgs.builder()\n .name(\"docker-repository\")\n .build());\n\n final var authToken = EcrFunctions.getAuthorizationToken(GetAuthorizationTokenArgs.builder()\n .registryId(ecrRepository.registryId())\n .build());\n\n var myAppImage = new Image(\"myAppImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .args(Map.of(\"BUILDKIT_INLINE_CACHE\", \"1\"))\n .cacheFrom(CacheFromArgs.builder()\n .images(ecrRepository.repositoryUrl().applyValue(repositoryUrl -\u003e String.format(\"%s:latest\", repositoryUrl)))\n .build())\n .context(\"app/\")\n .dockerfile(\"app/Dockerfile\")\n .build())\n .imageName(ecrRepository.repositoryUrl().applyValue(repositoryUrl -\u003e String.format(\"%s:latest\", repositoryUrl)))\n .registry(RegistryArgs.builder()\n .password(Output.ofSecret(authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult).applyValue(authToken -\u003e authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult.password()))))\n .server(ecrRepository.repositoryUrl())\n .username(authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult).applyValue(authToken -\u003e authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult.userName())))\n .build())\n .build());\n\n ctx.export(\"imageName\", myAppImage.imageName());\n }\n}\n```\n{{% /example %}}\n{{% /examples %}}", + "description": "`Image` builds a Docker image and pushes it Docker and OCI compatible registries.\nThis resource enables running Docker builds as part of a Pulumi deployment.\n\nNote: We recommend you migrate your images to the more modern [Docker\nBuild](https://www.pulumi.com/registry/packages/docker-build/) provider to get\nthe best possible support, features, and performance.\n\nNote: This resource does not delete tags, locally or remotely, when destroyed.\n\n## Image name\n\nThe Image resource uses `imageName` to refer to a fully qualified Docker image name, by the format `repository:tag`.\nNote that this does not include any digest information and thus will not cause any updates when passed to dependencies,\neven when using `latest` tag. To trigger such updates, e.g. when referencing pushed images in container orchestration \nand management resources, please use the `repoDigest` Output instead, which is of the format \n`repository@\u003calgorithm\u003e:\u003chash\u003e` and unique per build/push. \nAs of Docker v4.4, `repoDigest` is now available for local Images.\n\n## Cross-platform builds\n\nThe Image resource supports cross-platform builds when the [Docker engine has cross-platform support enabled via emulators](https://docs.docker.com/build/building/multi-platform/#building-multi-platform-images).\nThe Image resource currently supports providing only a single operating system and architecture in the `platform` field, e.g.: `linux/amd64`.\nTo enable this support, you may need to install the emulators in the environment running your Pulumi program.\n\nIf you are using Linux, you may be using Docker Engine or Docker Desktop for Linux, depending on how you have installed Docker. The [FAQ for Docker Desktop for Linux](https://docs.docker.com/desktop/faqs/linuxfaqs/#context) describes the differences and how to select which Docker context is in use.\n\n* For local development using Docker Desktop, this is enabled by default.\n* For systems using Docker Engine, install the QEMU binaries and register them with using the docker image from [github.com/tonistiigi/binfmt](https://github.com/tonistiigi/binfmt):\n\n ```shell\n docker run --privileged --rm tonistiigi/binfmt --install all\n ```\n* In a GitHub Actions workflow, the [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) can be used instead by adding this step to your workflow file. Example workflow usage:\n\n ```yaml\n name: Pulumi\n on:\n push:\n branches:\n - master\n jobs:\n up:\n name: Preview\n runs-on: ubuntu-latest\n steps:\n # This is the step added:\n - name: Set up QEMU\n uses: docker/setup-qemu-action@v2\n # The ordinary pulumi/actions workflow:\n - uses: actions/checkout@v3\n - uses: pulumi/actions@v4\n with:\n command: preview\n stack-name: org-name/stack-name\n env:\n PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}\n ```\n\n\n{{% examples %}}\n## Example Usage\n{{% example %}}\n### A Docker image build\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst demoImage = new docker.Image(\"demo-image\", {\n build: {\n context: \".\",\n dockerfile: \"Dockerfile\",\n platform: \"linux/amd64\",\n },\n imageName: \"username/image:tag1\",\n skipPush: true,\n});\nexport const imageName = demoImage.imageName;\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\ndemo_image = docker.Image(\"demo-image\",\n build={\n \"context\": \".\",\n \"dockerfile\": \"Dockerfile\",\n \"platform\": \"linux/amd64\",\n },\n image_name=\"username/image:tag1\",\n skip_push=True)\npulumi.export(\"imageName\", demo_image.image_name)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var demoImage = new Docker.Image(\"demo-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Context = \".\",\n Dockerfile = \"Dockerfile\",\n Platform = \"linux/amd64\",\n },\n ImageName = \"username/image:tag1\",\n SkipPush = true,\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = demoImage.ImageName,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tdemoImage, err := docker.NewImage(ctx, \"demo-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tDockerfile: pulumi.String(\"Dockerfile\"),\n\t\t\t\tPlatform: pulumi.String(\"linux/amd64\"),\n\t\t\t},\n\t\t\tImageName: pulumi.String(\"username/image:tag1\"),\n\t\t\tSkipPush: pulumi.Bool(true),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", demoImage.ImageName)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: A Docker image build\nname: image-yaml\noutputs:\n imageName: ${demo-image.imageName}\nresources:\n demo-image:\n options:\n version: v4.4.0\n properties:\n build:\n context: .\n dockerfile: Dockerfile\n platform: linux/amd64\n imageName: username/image:tag1\n skipPush: true\n type: docker:Image\nruntime: yaml\nvariables: {}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var demoImage = new Image(\"demoImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .context(\".\")\n .dockerfile(\"Dockerfile\")\n .platform(\"linux/amd64\")\n .build())\n .imageName(\"username/image:tag1\")\n .skipPush(true)\n .build());\n\n ctx.export(\"imageName\", demoImage.imageName());\n }\n}\n```\n{{% /example %}}\n{{% example %}}\n### A Docker image build and push\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst demoPushImage = new docker.Image(\"demo-push-image\", {\n build: {\n context: \".\",\n dockerfile: \"Dockerfile\",\n },\n imageName: \"docker.io/username/push-image:tag1\",\n});\nexport const imageName = demoPushImage.imageName;\nexport const repoDigest = demoPushImage.repoDigest;\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\ndemo_push_image = docker.Image(\"demo-push-image\",\n build={\n \"context\": \".\",\n \"dockerfile\": \"Dockerfile\",\n },\n image_name=\"docker.io/username/push-image:tag1\")\npulumi.export(\"imageName\", demo_push_image.image_name)\npulumi.export(\"repoDigest\", demo_push_image.repo_digest)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var demoPushImage = new Docker.Image(\"demo-push-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Context = \".\",\n Dockerfile = \"Dockerfile\",\n },\n ImageName = \"docker.io/username/push-image:tag1\",\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = demoPushImage.ImageName,\n [\"repoDigest\"] = demoPushImage.RepoDigest,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tdemoPushImage, err := docker.NewImage(ctx, \"demo-push-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tDockerfile: pulumi.String(\"Dockerfile\"),\n\t\t\t},\n\t\t\tImageName: pulumi.String(\"docker.io/username/push-image:tag1\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", demoPushImage.ImageName)\n\t\tctx.Export(\"repoDigest\", demoPushImage.RepoDigest)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: A Docker image build and push\nname: image-push-yaml\noutputs:\n imageName: ${demo-push-image.imageName}\n repoDigest: ${demo-push-image.repoDigest}\nresources:\n demo-push-image:\n options:\n version: v4.4.0\n properties:\n build:\n context: .\n dockerfile: Dockerfile\n imageName: docker.io/username/push-image:tag1\n type: docker:Image\nruntime: yaml\nvariables: {}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var demoPushImage = new Image(\"demoPushImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .context(\".\")\n .dockerfile(\"Dockerfile\")\n .build())\n .imageName(\"docker.io/username/push-image:tag1\")\n .build());\n\n ctx.export(\"imageName\", demoPushImage.imageName());\n ctx.export(\"repoDigest\", demoPushImage.repoDigest());\n }\n}\n```\n{{% /example %}}\n{{% example %}}\n### Docker image build using caching with AWS Elastic Container Registry\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as aws from \"@pulumi/aws\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ecrRepository = new aws.ecr.Repository(\"ecr-repository\", {name: \"docker-repository\"});\nconst authToken = aws.ecr.getAuthorizationTokenOutput({\n registryId: ecrRepository.registryId,\n});\nconst myAppImage = new docker.Image(\"my-app-image\", {\n build: {\n args: {\n BUILDKIT_INLINE_CACHE: \"1\",\n },\n cacheFrom: {\n images: [pulumi.interpolate`${ecrRepository.repositoryUrl}:latest`],\n },\n context: \"app/\",\n dockerfile: \"app/Dockerfile\",\n },\n imageName: pulumi.interpolate`${ecrRepository.repositoryUrl}:latest`,\n registry: {\n password: pulumi.secret(authToken.apply(authToken =\u003e authToken.password)),\n server: ecrRepository.repositoryUrl,\n username: authToken.apply(authToken =\u003e authToken.userName),\n },\n});\nexport const imageName = myAppImage.imageName;\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_docker as docker\n\necr_repository = aws.ecr.Repository(\"ecr-repository\", name=\"docker-repository\")\nauth_token = aws.ecr.get_authorization_token_output(registry_id=ecr_repository.registry_id)\nmy_app_image = docker.Image(\"my-app-image\",\n build={\n \"args\": {\n \"buildki_t__inlin_e__cache\": \"1\",\n },\n \"cache_from\": {\n \"images\": [ecr_repository.repository_url.apply(lambda repository_url: f\"{repository_url}:latest\")],\n },\n \"context\": \"app/\",\n \"dockerfile\": \"app/Dockerfile\",\n },\n image_name=ecr_repository.repository_url.apply(lambda repository_url: f\"{repository_url}:latest\"),\n registry={\n \"password\": pulumi.Output.secret(auth_token.password),\n \"server\": ecr_repository.repository_url,\n \"username\": auth_token.user_name,\n })\npulumi.export(\"imageName\", my_app_image.image_name)\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ecrRepository = new Aws.Ecr.Repository(\"ecr-repository\", new()\n {\n Name = \"docker-repository\",\n });\n\n var authToken = Aws.Ecr.GetAuthorizationToken.Invoke(new()\n {\n RegistryId = ecrRepository.RegistryId,\n });\n\n var myAppImage = new Docker.Image(\"my-app-image\", new()\n {\n Build = new Docker.Inputs.DockerBuildArgs\n {\n Args = \n {\n { \"BUILDKIT_INLINE_CACHE\", \"1\" },\n },\n CacheFrom = new Docker.Inputs.CacheFromArgs\n {\n Images = new[]\n {\n ecrRepository.RepositoryUrl.Apply(repositoryUrl =\u003e $\"{repositoryUrl}:latest\"),\n },\n },\n Context = \"app/\",\n Dockerfile = \"app/Dockerfile\",\n },\n ImageName = ecrRepository.RepositoryUrl.Apply(repositoryUrl =\u003e $\"{repositoryUrl}:latest\"),\n Registry = new Docker.Inputs.RegistryArgs\n {\n Password = Output.CreateSecret(authToken.Apply(getAuthorizationTokenResult =\u003e getAuthorizationTokenResult.Password)),\n Server = ecrRepository.RepositoryUrl,\n Username = authToken.Apply(getAuthorizationTokenResult =\u003e getAuthorizationTokenResult.UserName),\n },\n });\n\n return new Dictionary\u003cstring, object?\u003e\n {\n [\"imageName\"] = myAppImage.ImageName,\n };\n});\n\n```\n```go\npackage main\n\nimport (\n\t\"fmt\"\n\n\t\"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecr\"\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tecrRepository, err := ecr.NewRepository(ctx, \"ecr-repository\", \u0026ecr.RepositoryArgs{\n\t\t\tName: pulumi.String(\"docker-repository\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tauthToken := ecr.GetAuthorizationTokenOutput(ctx, ecr.GetAuthorizationTokenOutputArgs{\n\t\t\tRegistryId: ecrRepository.RegistryId,\n\t\t}, nil)\n\t\tmyAppImage, err := docker.NewImage(ctx, \"my-app-image\", \u0026docker.ImageArgs{\n\t\t\tBuild: \u0026docker.DockerBuildArgs{\n\t\t\t\tArgs: pulumi.StringMap{\n\t\t\t\t\t\"BUILDKIT_INLINE_CACHE\": pulumi.String(\"1\"),\n\t\t\t\t},\n\t\t\t\tCacheFrom: \u0026docker.CacheFromArgs{\n\t\t\t\t\tImages: pulumi.StringArray{\n\t\t\t\t\t\tecrRepository.RepositoryUrl.ApplyT(func(repositoryUrl string) (string, error) {\n\t\t\t\t\t\t\treturn fmt.Sprintf(\"%v:latest\", repositoryUrl), nil\n\t\t\t\t\t\t}).(pulumi.StringOutput),\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tContext: pulumi.String(\"app/\"),\n\t\t\t\tDockerfile: pulumi.String(\"app/Dockerfile\"),\n\t\t\t},\n\t\t\tImageName: ecrRepository.RepositoryUrl.ApplyT(func(repositoryUrl string) (string, error) {\n\t\t\t\treturn fmt.Sprintf(\"%v:latest\", repositoryUrl), nil\n\t\t\t}).(pulumi.StringOutput),\n\t\t\tRegistry: \u0026docker.RegistryArgs{\n\t\t\t\tPassword: pulumi.ToSecret(authToken.ApplyT(func(authToken ecr.GetAuthorizationTokenResult) (*string, error) {\n\t\t\t\t\treturn \u0026authToken.Password, nil\n\t\t\t\t}).(pulumi.StringPtrOutput)).(pulumi.StringOutput),\n\t\t\t\tServer: ecrRepository.RepositoryUrl,\n\t\t\t\tUsername: authToken.ApplyT(func(authToken ecr.GetAuthorizationTokenResult) (*string, error) {\n\t\t\t\t\treturn \u0026authToken.UserName, nil\n\t\t\t\t}).(pulumi.StringPtrOutput),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tctx.Export(\"imageName\", myAppImage.ImageName)\n\t\treturn nil\n\t})\n}\n```\n```yaml\nconfig: {}\ndescription: Docker image build using caching with AWS Elastic Container Registry\nname: image-caching-yaml\noutputs:\n imageName: ${my-app-image.imageName}\nresources:\n ecr-repository:\n properties:\n name: docker-repository\n type: aws:ecr:Repository\n my-app-image:\n options:\n version: v4.1.2\n properties:\n build:\n args:\n BUILDKIT_INLINE_CACHE: \"1\"\n cacheFrom:\n images:\n - ${ecr-repository.repositoryUrl}:latest\n context: app/\n dockerfile: app/Dockerfile\n imageName: ${ecr-repository.repositoryUrl}:latest\n registry:\n password:\n fn::secret: ${authToken.password}\n server: ${ecr-repository.repositoryUrl}\n username: ${authToken.userName}\n type: docker:Image\nruntime: yaml\nvariables:\n authToken:\n fn::aws:ecr:getAuthorizationToken:\n registryId: ${ecr-repository.registryId}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.aws.ecr.Repository;\nimport com.pulumi.aws.ecr.RepositoryArgs;\nimport com.pulumi.aws.ecr.EcrFunctions;\nimport com.pulumi.aws.ecr.inputs.GetAuthorizationTokenArgs;\nimport com.pulumi.docker.Image;\nimport com.pulumi.docker.ImageArgs;\nimport com.pulumi.docker.inputs.DockerBuildArgs;\nimport com.pulumi.docker.inputs.CacheFromArgs;\nimport com.pulumi.docker.inputs.RegistryArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var ecrRepository = new Repository(\"ecrRepository\", RepositoryArgs.builder()\n .name(\"docker-repository\")\n .build());\n\n final var authToken = EcrFunctions.getAuthorizationToken(GetAuthorizationTokenArgs.builder()\n .registryId(ecrRepository.registryId())\n .build());\n\n var myAppImage = new Image(\"myAppImage\", ImageArgs.builder()\n .build(DockerBuildArgs.builder()\n .args(Map.of(\"BUILDKIT_INLINE_CACHE\", \"1\"))\n .cacheFrom(CacheFromArgs.builder()\n .images(ecrRepository.repositoryUrl().applyValue(repositoryUrl -\u003e String.format(\"%s:latest\", repositoryUrl)))\n .build())\n .context(\"app/\")\n .dockerfile(\"app/Dockerfile\")\n .build())\n .imageName(ecrRepository.repositoryUrl().applyValue(repositoryUrl -\u003e String.format(\"%s:latest\", repositoryUrl)))\n .registry(RegistryArgs.builder()\n .password(Output.ofSecret(authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult).applyValue(authToken -\u003e authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult.password()))))\n .server(ecrRepository.repositoryUrl())\n .username(authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult).applyValue(authToken -\u003e authToken.applyValue(getAuthorizationTokenResult -\u003e getAuthorizationTokenResult.userName())))\n .build())\n .build());\n\n ctx.export(\"imageName\", myAppImage.imageName());\n }\n}\n```\n{{% /example %}}\n{{% /examples %}}", "properties": { "baseImageName": { "type": "string", @@ -3276,7 +3276,7 @@ "ipamOptions": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details.\n" }, @@ -3298,7 +3298,7 @@ "options": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details.\n" }, @@ -3357,7 +3357,7 @@ "ipamOptions": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details.\n", "willReplaceOnChanges": true @@ -3383,7 +3383,7 @@ "options": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details.\n", "willReplaceOnChanges": true @@ -3433,7 +3433,7 @@ "ipamOptions": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details.\n", "willReplaceOnChanges": true @@ -3459,7 +3459,7 @@ "options": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details.\n", "willReplaceOnChanges": true @@ -3651,7 +3651,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image\n" } @@ -3677,7 +3677,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image\n", "willReplaceOnChanges": true @@ -3706,7 +3706,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image\n", "willReplaceOnChanges": true @@ -3716,7 +3716,7 @@ } }, "docker:index/remoteImage:RemoteImage": { - "description": "\u003c!-- Bug: Type and Name are switched --\u003e\nPulls a Docker image to a given Docker host from a Docker Registry.\n This resource will *not* pull new layers of the image automatically unless used in conjunction with docker.RegistryImage data source to update the `pull_triggers` field.\n\n## Example Usage\n\n### Basic\n\nFinds and downloads the latest `ubuntu:precise` image but does not check\nfor further updates of the image\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ubuntu = new docker.RemoteImage(\"ubuntu\", {name: \"ubuntu:precise\"});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nubuntu = docker.RemoteImage(\"ubuntu\", name=\"ubuntu:precise\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ubuntu = new Docker.RemoteImage(\"ubuntu\", new()\n {\n Name = \"ubuntu:precise\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := docker.NewRemoteImage(ctx, \"ubuntu\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(\"ubuntu:precise\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var ubuntu = new RemoteImage(\"ubuntu\", RemoteImageArgs.builder()\n .name(\"ubuntu:precise\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n ubuntu:\n type: docker:RemoteImage\n properties:\n name: ubuntu:precise\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n### Dynamic updates\n\nTo be able to update an image dynamically when the `sha256` sum changes,\nyou need to use it in combination with `docker.RegistryImage` as follows:\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ubuntu = docker.getRegistryImage({\n name: \"ubuntu:precise\",\n});\nconst ubuntuRemoteImage = new docker.RemoteImage(\"ubuntu\", {\n name: ubuntu.then(ubuntu =\u003e ubuntu.name),\n pullTriggers: [ubuntu.then(ubuntu =\u003e ubuntu.sha256Digest)],\n});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nubuntu = docker.get_registry_image(name=\"ubuntu:precise\")\nubuntu_remote_image = docker.RemoteImage(\"ubuntu\",\n name=ubuntu.name,\n pull_triggers=[ubuntu.sha256_digest])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ubuntu = Docker.GetRegistryImage.Invoke(new()\n {\n Name = \"ubuntu:precise\",\n });\n\n var ubuntuRemoteImage = new Docker.RemoteImage(\"ubuntu\", new()\n {\n Name = ubuntu.Apply(getRegistryImageResult =\u003e getRegistryImageResult.Name),\n PullTriggers = new[]\n {\n ubuntu.Apply(getRegistryImageResult =\u003e getRegistryImageResult.Sha256Digest),\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tubuntu, err := docker.LookupRegistryImage(ctx, \u0026docker.LookupRegistryImageArgs{\n\t\t\tName: \"ubuntu:precise\",\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = docker.NewRemoteImage(ctx, \"ubuntu\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(ubuntu.Name),\n\t\t\tPullTriggers: pulumi.StringArray{\n\t\t\t\tpulumi.String(ubuntu.Sha256Digest),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.DockerFunctions;\nimport com.pulumi.docker.inputs.GetRegistryImageArgs;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n final var ubuntu = DockerFunctions.getRegistryImage(GetRegistryImageArgs.builder()\n .name(\"ubuntu:precise\")\n .build());\n\n var ubuntuRemoteImage = new RemoteImage(\"ubuntuRemoteImage\", RemoteImageArgs.builder()\n .name(ubuntu.applyValue(getRegistryImageResult -\u003e getRegistryImageResult.name()))\n .pullTriggers(ubuntu.applyValue(getRegistryImageResult -\u003e getRegistryImageResult.sha256Digest()))\n .build());\n\n }\n}\n```\n```yaml\nresources:\n ubuntuRemoteImage:\n type: docker:RemoteImage\n name: ubuntu\n properties:\n name: ${ubuntu.name}\n pullTriggers:\n - ${ubuntu.sha256Digest}\nvariables:\n ubuntu:\n fn::invoke:\n Function: docker:getRegistryImage\n Arguments:\n name: ubuntu:precise\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n### Build\n\nYou can also use the resource to build an image.\nIn this case the image \"zoo\" and \"zoo:develop\" are built.\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst zoo = new docker.RemoteImage(\"zoo\", {\n name: \"zoo\",\n build: {\n context: \".\",\n tags: [\"zoo:develop\"],\n buildArg: {\n foo: \"zoo\",\n },\n label: {\n author: \"zoo\",\n },\n },\n});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nzoo = docker.RemoteImage(\"zoo\",\n name=\"zoo\",\n build=docker.RemoteImageBuildArgs(\n context=\".\",\n tags=[\"zoo:develop\"],\n build_arg={\n \"foo\": \"zoo\",\n },\n label={\n \"author\": \"zoo\",\n },\n ))\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var zoo = new Docker.RemoteImage(\"zoo\", new()\n {\n Name = \"zoo\",\n Build = new Docker.Inputs.RemoteImageBuildArgs\n {\n Context = \".\",\n Tags = new[]\n {\n \"zoo:develop\",\n },\n BuildArg = \n {\n { \"foo\", \"zoo\" },\n },\n Label = \n {\n { \"author\", \"zoo\" },\n },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := docker.NewRemoteImage(ctx, \"zoo\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(\"zoo\"),\n\t\t\tBuild: \u0026docker.RemoteImageBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tTags: pulumi.StringArray{\n\t\t\t\t\tpulumi.String(\"zoo:develop\"),\n\t\t\t\t},\n\t\t\t\tBuildArg: pulumi.StringMap{\n\t\t\t\t\t\"foo\": pulumi.String(\"zoo\"),\n\t\t\t\t},\n\t\t\t\tLabel: pulumi.StringMap{\n\t\t\t\t\t\"author\": pulumi.String(\"zoo\"),\n\t\t\t\t},\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport com.pulumi.docker.inputs.RemoteImageBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var zoo = new RemoteImage(\"zoo\", RemoteImageArgs.builder()\n .name(\"zoo\")\n .build(RemoteImageBuildArgs.builder()\n .context(\".\")\n .tags(\"zoo:develop\")\n .buildArg(Map.of(\"foo\", \"zoo\"))\n .label(Map.of(\"author\", \"zoo\"))\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n zoo:\n type: docker:RemoteImage\n properties:\n name: zoo\n build:\n context: .\n tags:\n - zoo:develop\n buildArg:\n foo: zoo\n label:\n author: zoo\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\nYou can use the `triggers` argument to specify when the image should be rebuild. This is for example helpful when you want to rebuild the docker image whenever the source code changes.\n\n", + "description": "\u003c!-- Bug: Type and Name are switched --\u003e\nPulls a Docker image to a given Docker host from a Docker Registry.\n This resource will *not* pull new layers of the image automatically unless used in conjunction with docker.RegistryImage data source to update the `pull_triggers` field.\n\n## Example Usage\n\n### Basic\n\nFinds and downloads the latest `ubuntu:precise` image but does not check\nfor further updates of the image\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ubuntu = new docker.RemoteImage(\"ubuntu\", {name: \"ubuntu:precise\"});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nubuntu = docker.RemoteImage(\"ubuntu\", name=\"ubuntu:precise\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ubuntu = new Docker.RemoteImage(\"ubuntu\", new()\n {\n Name = \"ubuntu:precise\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := docker.NewRemoteImage(ctx, \"ubuntu\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(\"ubuntu:precise\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var ubuntu = new RemoteImage(\"ubuntu\", RemoteImageArgs.builder()\n .name(\"ubuntu:precise\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n ubuntu:\n type: docker:RemoteImage\n properties:\n name: ubuntu:precise\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n### Dynamic updates\n\nTo be able to update an image dynamically when the `sha256` sum changes,\nyou need to use it in combination with `docker.RegistryImage` as follows:\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst ubuntu = docker.getRegistryImage({\n name: \"ubuntu:precise\",\n});\nconst ubuntuRemoteImage = new docker.RemoteImage(\"ubuntu\", {\n name: ubuntu.then(ubuntu =\u003e ubuntu.name),\n pullTriggers: [ubuntu.then(ubuntu =\u003e ubuntu.sha256Digest)],\n});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nubuntu = docker.get_registry_image(name=\"ubuntu:precise\")\nubuntu_remote_image = docker.RemoteImage(\"ubuntu\",\n name=ubuntu.name,\n pull_triggers=[ubuntu.sha256_digest])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var ubuntu = Docker.GetRegistryImage.Invoke(new()\n {\n Name = \"ubuntu:precise\",\n });\n\n var ubuntuRemoteImage = new Docker.RemoteImage(\"ubuntu\", new()\n {\n Name = ubuntu.Apply(getRegistryImageResult =\u003e getRegistryImageResult.Name),\n PullTriggers = new[]\n {\n ubuntu.Apply(getRegistryImageResult =\u003e getRegistryImageResult.Sha256Digest),\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tubuntu, err := docker.LookupRegistryImage(ctx, \u0026docker.LookupRegistryImageArgs{\n\t\t\tName: \"ubuntu:precise\",\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = docker.NewRemoteImage(ctx, \"ubuntu\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(ubuntu.Name),\n\t\t\tPullTriggers: pulumi.StringArray{\n\t\t\t\tpulumi.String(ubuntu.Sha256Digest),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.DockerFunctions;\nimport com.pulumi.docker.inputs.GetRegistryImageArgs;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n final var ubuntu = DockerFunctions.getRegistryImage(GetRegistryImageArgs.builder()\n .name(\"ubuntu:precise\")\n .build());\n\n var ubuntuRemoteImage = new RemoteImage(\"ubuntuRemoteImage\", RemoteImageArgs.builder()\n .name(ubuntu.applyValue(getRegistryImageResult -\u003e getRegistryImageResult.name()))\n .pullTriggers(ubuntu.applyValue(getRegistryImageResult -\u003e getRegistryImageResult.sha256Digest()))\n .build());\n\n }\n}\n```\n```yaml\nresources:\n ubuntuRemoteImage:\n type: docker:RemoteImage\n name: ubuntu\n properties:\n name: ${ubuntu.name}\n pullTriggers:\n - ${ubuntu.sha256Digest}\nvariables:\n ubuntu:\n fn::invoke:\n Function: docker:getRegistryImage\n Arguments:\n name: ubuntu:precise\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n### Build\n\nYou can also use the resource to build an image.\nIn this case the image \"zoo\" and \"zoo:develop\" are built.\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\nconst zoo = new docker.RemoteImage(\"zoo\", {\n name: \"zoo\",\n build: {\n context: \".\",\n tags: [\"zoo:develop\"],\n buildArg: {\n foo: \"zoo\",\n },\n label: {\n author: \"zoo\",\n },\n },\n});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\nzoo = docker.RemoteImage(\"zoo\",\n name=\"zoo\",\n build={\n \"context\": \".\",\n \"tags\": [\"zoo:develop\"],\n \"build_arg\": {\n \"foo\": \"zoo\",\n },\n \"label\": {\n \"author\": \"zoo\",\n },\n })\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var zoo = new Docker.RemoteImage(\"zoo\", new()\n {\n Name = \"zoo\",\n Build = new Docker.Inputs.RemoteImageBuildArgs\n {\n Context = \".\",\n Tags = new[]\n {\n \"zoo:develop\",\n },\n BuildArg = \n {\n { \"foo\", \"zoo\" },\n },\n Label = \n {\n { \"author\", \"zoo\" },\n },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := docker.NewRemoteImage(ctx, \"zoo\", \u0026docker.RemoteImageArgs{\n\t\t\tName: pulumi.String(\"zoo\"),\n\t\t\tBuild: \u0026docker.RemoteImageBuildArgs{\n\t\t\t\tContext: pulumi.String(\".\"),\n\t\t\t\tTags: pulumi.StringArray{\n\t\t\t\t\tpulumi.String(\"zoo:develop\"),\n\t\t\t\t},\n\t\t\t\tBuildArg: pulumi.StringMap{\n\t\t\t\t\t\"foo\": pulumi.String(\"zoo\"),\n\t\t\t\t},\n\t\t\t\tLabel: pulumi.StringMap{\n\t\t\t\t\t\"author\": pulumi.String(\"zoo\"),\n\t\t\t\t},\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.RemoteImage;\nimport com.pulumi.docker.RemoteImageArgs;\nimport com.pulumi.docker.inputs.RemoteImageBuildArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var zoo = new RemoteImage(\"zoo\", RemoteImageArgs.builder()\n .name(\"zoo\")\n .build(RemoteImageBuildArgs.builder()\n .context(\".\")\n .tags(\"zoo:develop\")\n .buildArg(Map.of(\"foo\", \"zoo\"))\n .label(Map.of(\"author\", \"zoo\"))\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n zoo:\n type: docker:RemoteImage\n properties:\n name: zoo\n build:\n context: .\n tags:\n - zoo:develop\n buildArg:\n foo: zoo\n label:\n author: zoo\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\nYou can use the `triggers` argument to specify when the image should be rebuild. This is for example helpful when you want to rebuild the docker image whenever the source code changes.\n\n", "properties": { "build": { "$ref": "#/types/docker:index/RemoteImageBuild:RemoteImageBuild", @@ -3756,7 +3756,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change\n" } @@ -3800,7 +3800,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change\n", "willReplaceOnChanges": true @@ -3853,7 +3853,7 @@ "triggers": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change\n", "willReplaceOnChanges": true @@ -4198,7 +4198,7 @@ "driverOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Options specific to the driver.\n" }, @@ -4232,7 +4232,7 @@ "driverOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Options specific to the driver.\n", "willReplaceOnChanges": true @@ -4262,7 +4262,7 @@ "driverOpts": { "type": "object", "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Options specific to the driver.\n", "willReplaceOnChanges": true @@ -4439,7 +4439,7 @@ }, "options": { "additionalProperties": { - "$ref": "pulumi.json#/Any" + "type": "string" }, "description": "Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details.\n", "type": "object" @@ -4462,7 +4462,7 @@ } }, "docker:index/getPlugin:getPlugin": { - "description": "Reads the local Docker plugin. The plugin must be installed locally.\n\n## Example Usage\n\n### With alias\ndata \"docker.Plugin\" \"by_alias\" {\n alias = \"sample-volume-plugin:latest\"\n}\n\n### With ID\ndata \"docker.Plugin\" \"by_id\" {\n id = \"e9a9db917b3bfd6706b5d3a66d4bceb9f\"\n}\n```\n", + "description": "Reads the local Docker plugin. The plugin must be installed locally.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as docker from \"@pulumi/docker\";\n\n//## With alias\nconst byAlias = docker.getPlugin({\n alias: \"sample-volume-plugin:latest\",\n});\n//## With ID\nconst byId = docker.getPlugin({\n id: \"e9a9db917b3bfd6706b5d3a66d4bceb9f\",\n});\n```\n```python\nimport pulumi\nimport pulumi_docker as docker\n\n### With alias\nby_alias = docker.get_plugin(alias=\"sample-volume-plugin:latest\")\n### With ID\nby_id = docker.get_plugin(id=\"e9a9db917b3bfd6706b5d3a66d4bceb9f\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Docker = Pulumi.Docker;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n //## With alias\n var byAlias = Docker.GetPlugin.Invoke(new()\n {\n Alias = \"sample-volume-plugin:latest\",\n });\n\n //## With ID\n var byId = Docker.GetPlugin.Invoke(new()\n {\n Id = \"e9a9db917b3bfd6706b5d3a66d4bceb9f\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-docker/sdk/v4/go/docker\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t// ## With alias\n\t\t_, err := docker.LookupPlugin(ctx, \u0026docker.LookupPluginArgs{\n\t\t\tAlias: pulumi.StringRef(\"sample-volume-plugin:latest\"),\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t// ## With ID\n\t\t_, err = docker.LookupPlugin(ctx, \u0026docker.LookupPluginArgs{\n\t\t\tId: pulumi.StringRef(\"e9a9db917b3bfd6706b5d3a66d4bceb9f\"),\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.docker.DockerFunctions;\nimport com.pulumi.docker.inputs.GetPluginArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n //## With alias\n final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()\n .alias(\"sample-volume-plugin:latest\")\n .build());\n\n //## With ID\n final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()\n .id(\"e9a9db917b3bfd6706b5d3a66d4bceb9f\")\n .build());\n\n }\n}\n```\n```yaml\nvariables:\n ### With alias\n byAlias:\n fn::invoke:\n Function: docker:getPlugin\n Arguments:\n alias: sample-volume-plugin:latest\n ### With ID\n byId:\n fn::invoke:\n Function: docker:getPlugin\n Arguments:\n id: e9a9db917b3bfd6706b5d3a66d4bceb9f\n```\n\u003c!--End PulumiCodeChooser --\u003e\n", "inputs": { "description": "A collection of arguments for invoking getPlugin.\n", "properties": { diff --git a/provider/go.mod b/provider/go.mod index fc61c41a..e15ff1ad 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -13,9 +13,9 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/errors v0.9.1 - github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0 - github.com/pulumi/pulumi/pkg/v3 v3.126.0 - github.com/pulumi/pulumi/sdk/v3 v3.126.0 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.89.1 + github.com/pulumi/pulumi/pkg/v3 v3.129.0 + github.com/pulumi/pulumi/sdk/v3 v3.129.0 github.com/spf13/afero v1.9.5 github.com/stretchr/testify v1.9.0 github.com/terraform-providers/terraform-provider-docker v0.0.0 @@ -218,9 +218,9 @@ require ( github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect github.com/pulumi/esc v0.9.1 // indirect github.com/pulumi/inflector v0.1.1 // indirect - github.com/pulumi/pulumi-java/pkg v0.11.0 // indirect + github.com/pulumi/pulumi-java/pkg v0.14.0 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect - github.com/pulumi/pulumi-yaml v1.9.1 // indirect + github.com/pulumi/pulumi-yaml v1.9.2 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect @@ -238,6 +238,7 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/teekennedy/goldmark-markdown v0.3.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect @@ -252,6 +253,7 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/yuin/goldmark v1.7.4 // indirect github.com/zclconf/go-cty v1.14.2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect @@ -265,14 +267,14 @@ require ( go.uber.org/atomic v1.10.0 // indirect gocloud.dev v0.37.0 // indirect gocloud.dev/secrets/hashivault v0.37.0 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.22.0 // indirect diff --git a/provider/go.sum b/provider/go.sum index 49cd9eee..fb2e995f 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2044,18 +2044,18 @@ 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.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2pHgxQ8= github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= -github.com/pulumi/pulumi-java/pkg v0.11.0 h1:Jw9gBvyfmfOMq/EkYDm9+zGPxsDAA8jfeMpHmtZ+1oA= -github.com/pulumi/pulumi-java/pkg v0.11.0/go.mod h1:sXAk25P47AQVQL6ilAbFmRNgZykC7og/+87ihnqzFTc= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0 h1:0W2Y3Fk7VAWHpjD3FwzVnqWo7g1hD+96C0YDobMnvDU= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0/go.mod h1:QSDiqiCMMbfzrsp3oyRPWgSVE/dkVH5ujxoFappqjdo= +github.com/pulumi/pulumi-java/pkg v0.14.0 h1:CKL7lLF81Fq6VRhA5TNFsSMnHraTNCUzIhqCzYX8Wzk= +github.com/pulumi/pulumi-java/pkg v0.14.0/go.mod h1:VybuJMWJtJc9ZNbt1kcYH4TbpocMx9mEi7YWL2Co99c= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.89.1 h1:FLQknb6r3r/uaj1XLbouFF88eF1Fk0h4JOVS9kHKDRY= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.89.1/go.mod h1:JAxygKR/XGW6zIv6iOP6sHAYjZ7OCtqU7j6Od1lUk38= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY= -github.com/pulumi/pulumi-yaml v1.9.1 h1:JPeI80M23SPactxgnCFS1casZlSr7ZhAXwSx4H55QQ4= -github.com/pulumi/pulumi-yaml v1.9.1/go.mod h1:OH0R34yJxA5u6zjYBN4JXcWoEvfkRoOVWi6viu8buoA= -github.com/pulumi/pulumi/pkg/v3 v3.126.0 h1:XaZU1ehjHN2I5ihkfwxK/UFMDiCDM9FSt2TBnbldAx4= -github.com/pulumi/pulumi/pkg/v3 v3.126.0/go.mod h1:1P4/oK9zceOJUm48QQl/TqjDN68lfsdnTR1FITTFddw= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +github.com/pulumi/pulumi-yaml v1.9.2 h1:BCUuRPA1USmFXrExiHRU8yJ+OiphLYnroPxKRgGCJrs= +github.com/pulumi/pulumi-yaml v1.9.2/go.mod h1:sIh/Oa/NLRGTojevh8D2/cPDPvo2j9iXegVDQIKKfw4= +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/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= @@ -2064,6 +2064,8 @@ github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10 h1: github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rhysd/go-fakeio v1.0.0 h1:+TjiKCOs32dONY7DaoVz/VPOdvRkPfBkEyUDIpM8FQY= +github.com/rhysd/go-fakeio v1.0.0/go.mod h1:joYxF906trVwp2JLrE4jlN7A0z6wrz8O6o1UjarbFzE= 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= @@ -2151,6 +2153,8 @@ github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/teekennedy/goldmark-markdown v0.3.0 h1:ik9/biVGCwGWFg8dQ3KVm2pQ/wiiG0whYiUcz9xH0W8= +github.com/teekennedy/goldmark-markdown v0.3.0/go.mod h1:kMhDz8La77A9UHvJGsxejd0QUflN9sS+QXCqnhmxmNo= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= github.com/tonistiigi/fsutil v0.0.0-20230825212630-f09800878302 h1:ZT8ibgassurSISJ1Pj26NsM3vY2jxFZn63Nd/TpHmRw= @@ -2195,6 +2199,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg= +github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= @@ -2283,8 +2289,8 @@ golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2432,8 +2438,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2608,8 +2614,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2630,8 +2636,8 @@ golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/provider/pkg/docs-gen/examples/image.md b/provider/pkg/docs-gen/examples/image.md index 25607a0f..69c79c11 100755 --- a/provider/pkg/docs-gen/examples/image.md +++ b/provider/pkg/docs-gen/examples/image.md @@ -23,11 +23,11 @@ import pulumi import pulumi_docker as docker demo_image = docker.Image("demo-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - platform="linux/amd64", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + "platform": "linux/amd64", + }, image_name="username/image:tag1", skip_push=True) pulumi.export("imageName", demo_image.image_name) @@ -166,10 +166,10 @@ import pulumi import pulumi_docker as docker demo_push_image = docker.Image("demo-push-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + }, image_name="docker.io/username/push-image:tag1") pulumi.export("imageName", demo_push_image.image_name) pulumi.export("repoDigest", demo_push_image.repo_digest) @@ -322,22 +322,22 @@ import pulumi_docker as docker ecr_repository = aws.ecr.Repository("ecr-repository", name="docker-repository") auth_token = aws.ecr.get_authorization_token_output(registry_id=ecr_repository.registry_id) my_app_image = docker.Image("my-app-image", - build=docker.DockerBuildArgs( - args={ - "BUILDKIT_INLINE_CACHE": "1", + build={ + "args": { + "buildki_t__inlin_e__cache": "1", }, - cache_from=docker.CacheFromArgs( - images=[ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], - ), - context="app/", - dockerfile="app/Dockerfile", - ), + "cache_from": { + "images": [ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], + }, + "context": "app/", + "dockerfile": "app/Dockerfile", + }, image_name=ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest"), - registry=docker.RegistryArgs( - password=pulumi.Output.secret(auth_token.password), - server=ecr_repository.repository_url, - username=auth_token.user_name, - )) + registry={ + "password": pulumi.Output.secret(auth_token.password), + "server": ecr_repository.repository_url, + "username": auth_token.user_name, + }) pulumi.export("imageName", my_app_image.image_name) ``` ```csharp diff --git a/sdk/dotnet/Container.cs b/sdk/dotnet/Container.cs index bdf97588..18a04c47 100644 --- a/sdk/dotnet/Container.cs +++ b/sdk/dotnet/Container.cs @@ -256,7 +256,7 @@ public partial class Container : global::Pulumi.CustomResource /// Key/value pairs to use as options for the logging driver. /// [Output("logOpts")] - public Output?> LogOpts { get; private set; } = null!; + public Output?> LogOpts { get; private set; } = null!; /// /// Save the container logs (`attach` must be enabled). Defaults to `false`. @@ -409,19 +409,19 @@ public partial class Container : global::Pulumi.CustomResource /// Key/value pairs for the storage driver options, e.g. `size`: `120G` /// [Output("storageOpts")] - public Output?> StorageOpts { get; private set; } = null!; + public Output?> StorageOpts { get; private set; } = null!; /// /// A map of kernel parameters (sysctls) to set in the container. /// [Output("sysctls")] - public Output?> Sysctls { get; private set; } = null!; + public Output?> Sysctls { get; private set; } = null!; /// /// A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. /// [Output("tmpfs")] - public Output?> Tmpfs { get; private set; } = null!; + public Output?> Tmpfs { get; private set; } = null!; /// /// If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. @@ -734,14 +734,14 @@ public InputList Labels public Input? LogDriver { get; set; } [Input("logOpts")] - private InputMap? _logOpts; + private InputMap? _logOpts; /// /// Key/value pairs to use as options for the logging driver. /// - public InputMap LogOpts + public InputMap LogOpts { - get => _logOpts ?? (_logOpts = new InputMap()); + get => _logOpts ?? (_logOpts = new InputMap()); set => _logOpts = value; } @@ -911,38 +911,38 @@ public InputList SecurityOpts public Input? StopTimeout { get; set; } [Input("storageOpts")] - private InputMap? _storageOpts; + private InputMap? _storageOpts; /// /// Key/value pairs for the storage driver options, e.g. `size`: `120G` /// - public InputMap StorageOpts + public InputMap StorageOpts { - get => _storageOpts ?? (_storageOpts = new InputMap()); + get => _storageOpts ?? (_storageOpts = new InputMap()); set => _storageOpts = value; } [Input("sysctls")] - private InputMap? _sysctls; + private InputMap? _sysctls; /// /// A map of kernel parameters (sysctls) to set in the container. /// - public InputMap Sysctls + public InputMap Sysctls { - get => _sysctls ?? (_sysctls = new InputMap()); + get => _sysctls ?? (_sysctls = new InputMap()); set => _sysctls = value; } [Input("tmpfs")] - private InputMap? _tmpfs; + private InputMap? _tmpfs; /// /// A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. /// - public InputMap Tmpfs + public InputMap Tmpfs { - get => _tmpfs ?? (_tmpfs = new InputMap()); + get => _tmpfs ?? (_tmpfs = new InputMap()); set => _tmpfs = value; } @@ -1255,14 +1255,14 @@ public InputList Labels public Input? LogDriver { get; set; } [Input("logOpts")] - private InputMap? _logOpts; + private InputMap? _logOpts; /// /// Key/value pairs to use as options for the logging driver. /// - public InputMap LogOpts + public InputMap LogOpts { - get => _logOpts ?? (_logOpts = new InputMap()); + get => _logOpts ?? (_logOpts = new InputMap()); set => _logOpts = value; } @@ -1444,38 +1444,38 @@ public InputList SecurityOpts public Input? StopTimeout { get; set; } [Input("storageOpts")] - private InputMap? _storageOpts; + private InputMap? _storageOpts; /// /// Key/value pairs for the storage driver options, e.g. `size`: `120G` /// - public InputMap StorageOpts + public InputMap StorageOpts { - get => _storageOpts ?? (_storageOpts = new InputMap()); + get => _storageOpts ?? (_storageOpts = new InputMap()); set => _storageOpts = value; } [Input("sysctls")] - private InputMap? _sysctls; + private InputMap? _sysctls; /// /// A map of kernel parameters (sysctls) to set in the container. /// - public InputMap Sysctls + public InputMap Sysctls { - get => _sysctls ?? (_sysctls = new InputMap()); + get => _sysctls ?? (_sysctls = new InputMap()); set => _sysctls = value; } [Input("tmpfs")] - private InputMap? _tmpfs; + private InputMap? _tmpfs; /// /// A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. /// - public InputMap Tmpfs + public InputMap Tmpfs { - get => _tmpfs ?? (_tmpfs = new InputMap()); + get => _tmpfs ?? (_tmpfs = new InputMap()); set => _tmpfs = value; } diff --git a/sdk/dotnet/GetNetwork.cs b/sdk/dotnet/GetNetwork.cs index 50da4e82..3c78809f 100644 --- a/sdk/dotnet/GetNetwork.cs +++ b/sdk/dotnet/GetNetwork.cs @@ -116,7 +116,7 @@ public sealed class GetNetworkResult /// /// Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. /// - public readonly ImmutableDictionary Options; + public readonly ImmutableDictionary Options; /// /// Scope of the network. One of `swarm`, `global`, or `local`. /// @@ -134,7 +134,7 @@ private GetNetworkResult( string name, - ImmutableDictionary options, + ImmutableDictionary options, string scope) { diff --git a/sdk/dotnet/GetPlugin.cs b/sdk/dotnet/GetPlugin.cs index 0086a344..a00d08e2 100644 --- a/sdk/dotnet/GetPlugin.cs +++ b/sdk/dotnet/GetPlugin.cs @@ -16,15 +16,27 @@ public static class GetPlugin /// /// ## Example Usage /// - /// ### With alias - /// data "docker.Plugin" "by_alias" { - /// alias = "sample-volume-plugin:latest" - /// } + /// ```csharp + /// using System.Collections.Generic; + /// using System.Linq; + /// using Pulumi; + /// using Docker = Pulumi.Docker; /// - /// ### With ID - /// data "docker.Plugin" "by_id" { - /// id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - /// } + /// return await Deployment.RunAsync(() => + /// { + /// //## With alias + /// var byAlias = Docker.GetPlugin.Invoke(new() + /// { + /// Alias = "sample-volume-plugin:latest", + /// }); + /// + /// //## With ID + /// var byId = Docker.GetPlugin.Invoke(new() + /// { + /// Id = "e9a9db917b3bfd6706b5d3a66d4bceb9f", + /// }); + /// + /// }); /// ``` /// public static Task InvokeAsync(GetPluginArgs? args = null, InvokeOptions? options = null) @@ -35,15 +47,27 @@ public static Task InvokeAsync(GetPluginArgs? args = null, Invo /// /// ## Example Usage /// - /// ### With alias - /// data "docker.Plugin" "by_alias" { - /// alias = "sample-volume-plugin:latest" - /// } + /// ```csharp + /// using System.Collections.Generic; + /// using System.Linq; + /// using Pulumi; + /// using Docker = Pulumi.Docker; + /// + /// return await Deployment.RunAsync(() => + /// { + /// //## With alias + /// var byAlias = Docker.GetPlugin.Invoke(new() + /// { + /// Alias = "sample-volume-plugin:latest", + /// }); + /// + /// //## With ID + /// var byId = Docker.GetPlugin.Invoke(new() + /// { + /// Id = "e9a9db917b3bfd6706b5d3a66d4bceb9f", + /// }); /// - /// ### With ID - /// data "docker.Plugin" "by_id" { - /// id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - /// } + /// }); /// ``` /// public static Output Invoke(GetPluginInvokeArgs? args = null, InvokeOptions? options = null) diff --git a/sdk/dotnet/Inputs/NetworkIpamConfigArgs.cs b/sdk/dotnet/Inputs/NetworkIpamConfigArgs.cs index e41121de..9cde0dde 100644 --- a/sdk/dotnet/Inputs/NetworkIpamConfigArgs.cs +++ b/sdk/dotnet/Inputs/NetworkIpamConfigArgs.cs @@ -13,14 +13,14 @@ namespace Pulumi.Docker.Inputs public sealed class NetworkIpamConfigArgs : global::Pulumi.ResourceArgs { [Input("auxAddress")] - private InputMap? _auxAddress; + private InputMap? _auxAddress; /// /// Auxiliary IPv4 or IPv6 addresses used by Network driver /// - public InputMap AuxAddress + public InputMap AuxAddress { - get => _auxAddress ?? (_auxAddress = new InputMap()); + get => _auxAddress ?? (_auxAddress = new InputMap()); set => _auxAddress = value; } diff --git a/sdk/dotnet/Inputs/NetworkIpamConfigGetArgs.cs b/sdk/dotnet/Inputs/NetworkIpamConfigGetArgs.cs index c22bd994..82124349 100644 --- a/sdk/dotnet/Inputs/NetworkIpamConfigGetArgs.cs +++ b/sdk/dotnet/Inputs/NetworkIpamConfigGetArgs.cs @@ -13,14 +13,14 @@ namespace Pulumi.Docker.Inputs public sealed class NetworkIpamConfigGetArgs : global::Pulumi.ResourceArgs { [Input("auxAddress")] - private InputMap? _auxAddress; + private InputMap? _auxAddress; /// /// Auxiliary IPv4 or IPv6 addresses used by Network driver /// - public InputMap AuxAddress + public InputMap AuxAddress { - get => _auxAddress ?? (_auxAddress = new InputMap()); + get => _auxAddress ?? (_auxAddress = new InputMap()); set => _auxAddress = value; } diff --git a/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecArgs.cs b/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecArgs.cs index 444f7ac4..1be198b6 100644 --- a/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecArgs.cs +++ b/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecArgs.cs @@ -181,14 +181,14 @@ public InputList Secrets public Input? StopSignal { get; set; } [Input("sysctl")] - private InputMap? _sysctl; + private InputMap? _sysctl; /// /// Sysctls config (Linux only) /// - public InputMap Sysctl + public InputMap Sysctl { - get => _sysctl ?? (_sysctl = new InputMap()); + get => _sysctl ?? (_sysctl = new InputMap()); set => _sysctl = value; } diff --git a/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecGetArgs.cs b/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecGetArgs.cs index 14ba398b..dd6f3abe 100644 --- a/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecGetArgs.cs +++ b/sdk/dotnet/Inputs/ServiceTaskSpecContainerSpecGetArgs.cs @@ -181,14 +181,14 @@ public InputList Secrets public Input? StopSignal { get; set; } [Input("sysctl")] - private InputMap? _sysctl; + private InputMap? _sysctl; /// /// Sysctls config (Linux only) /// - public InputMap Sysctl + public InputMap Sysctl { - get => _sysctl ?? (_sysctl = new InputMap()); + get => _sysctl ?? (_sysctl = new InputMap()); set => _sysctl = value; } diff --git a/sdk/dotnet/Network.cs b/sdk/dotnet/Network.cs index f2c1cb8b..b329dfd2 100644 --- a/sdk/dotnet/Network.cs +++ b/sdk/dotnet/Network.cs @@ -112,7 +112,7 @@ public partial class Network : global::Pulumi.CustomResource /// Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. /// [Output("ipamOptions")] - public Output?> IpamOptions { get; private set; } = null!; + public Output?> IpamOptions { get; private set; } = null!; /// /// Enable IPv6 networking. Defaults to `false`. @@ -136,7 +136,7 @@ public partial class Network : global::Pulumi.CustomResource /// Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. /// [Output("options")] - public Output> Options { get; private set; } = null!; + public Output> Options { get; private set; } = null!; /// /// Scope of the network. One of `swarm`, `global`, or `local`. @@ -239,14 +239,14 @@ public InputList IpamConfigs public Input? IpamDriver { get; set; } [Input("ipamOptions")] - private InputMap? _ipamOptions; + private InputMap? _ipamOptions; /// /// Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. /// - public InputMap IpamOptions + public InputMap IpamOptions { - get => _ipamOptions ?? (_ipamOptions = new InputMap()); + get => _ipamOptions ?? (_ipamOptions = new InputMap()); set => _ipamOptions = value; } @@ -275,14 +275,14 @@ public InputList Labels public Input? Name { get; set; } [Input("options")] - private InputMap? _options; + private InputMap? _options; /// /// Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. /// - public InputMap Options + public InputMap Options { - get => _options ?? (_options = new InputMap()); + get => _options ?? (_options = new InputMap()); set => _options = value; } @@ -343,14 +343,14 @@ public InputList IpamConfigs public Input? IpamDriver { get; set; } [Input("ipamOptions")] - private InputMap? _ipamOptions; + private InputMap? _ipamOptions; /// /// Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. /// - public InputMap IpamOptions + public InputMap IpamOptions { - get => _ipamOptions ?? (_ipamOptions = new InputMap()); + get => _ipamOptions ?? (_ipamOptions = new InputMap()); set => _ipamOptions = value; } @@ -379,14 +379,14 @@ public InputList Labels public Input? Name { get; set; } [Input("options")] - private InputMap? _options; + private InputMap? _options; /// /// Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. /// - public InputMap Options + public InputMap Options { - get => _options ?? (_options = new InputMap()); + get => _options ?? (_options = new InputMap()); set => _options = value; } diff --git a/sdk/dotnet/Outputs/GetNetworkIpamConfigResult.cs b/sdk/dotnet/Outputs/GetNetworkIpamConfigResult.cs index 4271e156..8fa7b2bd 100644 --- a/sdk/dotnet/Outputs/GetNetworkIpamConfigResult.cs +++ b/sdk/dotnet/Outputs/GetNetworkIpamConfigResult.cs @@ -16,7 +16,7 @@ public sealed class GetNetworkIpamConfigResult /// /// Auxiliary IPv4 or IPv6 addresses used by Network driver /// - public readonly ImmutableDictionary? AuxAddress; + public readonly ImmutableDictionary? AuxAddress; /// /// The IP address of the gateway /// @@ -32,7 +32,7 @@ public sealed class GetNetworkIpamConfigResult [OutputConstructor] private GetNetworkIpamConfigResult( - ImmutableDictionary? auxAddress, + ImmutableDictionary? auxAddress, string? gateway, diff --git a/sdk/dotnet/Outputs/NetworkIpamConfig.cs b/sdk/dotnet/Outputs/NetworkIpamConfig.cs index c7483ac8..f85db88f 100644 --- a/sdk/dotnet/Outputs/NetworkIpamConfig.cs +++ b/sdk/dotnet/Outputs/NetworkIpamConfig.cs @@ -16,7 +16,7 @@ public sealed class NetworkIpamConfig /// /// Auxiliary IPv4 or IPv6 addresses used by Network driver /// - public readonly ImmutableDictionary? AuxAddress; + public readonly ImmutableDictionary? AuxAddress; /// /// The IP address of the gateway /// @@ -32,7 +32,7 @@ public sealed class NetworkIpamConfig [OutputConstructor] private NetworkIpamConfig( - ImmutableDictionary? auxAddress, + ImmutableDictionary? auxAddress, string? gateway, diff --git a/sdk/dotnet/Outputs/ServiceTaskSpecContainerSpec.cs b/sdk/dotnet/Outputs/ServiceTaskSpecContainerSpec.cs index 7c864383..e552871a 100644 --- a/sdk/dotnet/Outputs/ServiceTaskSpecContainerSpec.cs +++ b/sdk/dotnet/Outputs/ServiceTaskSpecContainerSpec.cs @@ -92,7 +92,7 @@ public sealed class ServiceTaskSpecContainerSpec /// /// Sysctls config (Linux only) /// - public readonly ImmutableDictionary? Sysctl; + public readonly ImmutableDictionary? Sysctl; /// /// The user inside the container /// @@ -138,7 +138,7 @@ private ServiceTaskSpecContainerSpec( string? stopSignal, - ImmutableDictionary? sysctl, + ImmutableDictionary? sysctl, string? user) { diff --git a/sdk/dotnet/RegistryImage.cs b/sdk/dotnet/RegistryImage.cs index 974f61f8..e2574f51 100644 --- a/sdk/dotnet/RegistryImage.cs +++ b/sdk/dotnet/RegistryImage.cs @@ -44,7 +44,7 @@ public partial class RegistryImage : global::Pulumi.CustomResource /// A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image /// [Output("triggers")] - public Output?> Triggers { get; private set; } = null!; + public Output?> Triggers { get; private set; } = null!; /// @@ -111,14 +111,14 @@ public sealed class RegistryImageArgs : global::Pulumi.ResourceArgs public Input? Name { get; set; } [Input("triggers")] - private InputMap? _triggers; + private InputMap? _triggers; /// /// A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image /// - public InputMap Triggers + public InputMap Triggers { - get => _triggers ?? (_triggers = new InputMap()); + get => _triggers ?? (_triggers = new InputMap()); set => _triggers = value; } @@ -155,14 +155,14 @@ public sealed class RegistryImageState : global::Pulumi.ResourceArgs public Input? Sha256Digest { get; set; } [Input("triggers")] - private InputMap? _triggers; + private InputMap? _triggers; /// /// A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image /// - public InputMap Triggers + public InputMap Triggers { - get => _triggers ?? (_triggers = new InputMap()); + get => _triggers ?? (_triggers = new InputMap()); set => _triggers = value; } diff --git a/sdk/dotnet/RemoteImage.cs b/sdk/dotnet/RemoteImage.cs index 01b7b388..e2a384e4 100644 --- a/sdk/dotnet/RemoteImage.cs +++ b/sdk/dotnet/RemoteImage.cs @@ -161,7 +161,7 @@ public partial class RemoteImage : global::Pulumi.CustomResource /// A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change /// [Output("triggers")] - public Output?> Triggers { get; private set; } = null!; + public Output?> Triggers { get; private set; } = null!; /// @@ -252,14 +252,14 @@ public InputList PullTriggers } [Input("triggers")] - private InputMap? _triggers; + private InputMap? _triggers; /// /// A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change /// - public InputMap Triggers + public InputMap Triggers { - get => _triggers ?? (_triggers = new InputMap()); + get => _triggers ?? (_triggers = new InputMap()); set => _triggers = value; } @@ -326,14 +326,14 @@ public InputList PullTriggers public Input? RepoDigest { get; set; } [Input("triggers")] - private InputMap? _triggers; + private InputMap? _triggers; /// /// A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change /// - public InputMap Triggers + public InputMap Triggers { - get => _triggers ?? (_triggers = new InputMap()); + get => _triggers ?? (_triggers = new InputMap()); set => _triggers = value; } diff --git a/sdk/dotnet/Volume.cs b/sdk/dotnet/Volume.cs index 7252d139..5b7321ba 100644 --- a/sdk/dotnet/Volume.cs +++ b/sdk/dotnet/Volume.cs @@ -76,7 +76,7 @@ public partial class Volume : global::Pulumi.CustomResource /// Options specific to the driver. /// [Output("driverOpts")] - public Output?> DriverOpts { get; private set; } = null!; + public Output?> DriverOpts { get; private set; } = null!; /// /// User-defined key/value metadata @@ -149,14 +149,14 @@ public sealed class VolumeArgs : global::Pulumi.ResourceArgs public Input? Driver { get; set; } [Input("driverOpts")] - private InputMap? _driverOpts; + private InputMap? _driverOpts; /// /// Options specific to the driver. /// - public InputMap DriverOpts + public InputMap DriverOpts { - get => _driverOpts ?? (_driverOpts = new InputMap()); + get => _driverOpts ?? (_driverOpts = new InputMap()); set => _driverOpts = value; } @@ -193,14 +193,14 @@ public sealed class VolumeState : global::Pulumi.ResourceArgs public Input? Driver { get; set; } [Input("driverOpts")] - private InputMap? _driverOpts; + private InputMap? _driverOpts; /// /// Options specific to the driver. /// - public InputMap DriverOpts + public InputMap DriverOpts { - get => _driverOpts ?? (_driverOpts = new InputMap()); + get => _driverOpts ?? (_driverOpts = new InputMap()); set => _driverOpts = value; } diff --git a/sdk/go.mod b/sdk/go.mod index 41a0d959..da5da7d2 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/blang/semver v3.5.1+incompatible - github.com/pulumi/pulumi/sdk/v3 v3.126.0 + github.com/pulumi/pulumi/sdk/v3 v3.129.0 ) require ( diff --git a/sdk/go.sum b/sdk/go.sum index 5bc6d127..75fdacc2 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -153,8 +153,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.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +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/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/sdk/go/docker/container.go b/sdk/go/docker/container.go index 73f3c335..a819bb4e 100644 --- a/sdk/go/docker/container.go +++ b/sdk/go/docker/container.go @@ -151,7 +151,7 @@ type Container struct { // The logging driver to use for the container. LogDriver pulumi.StringOutput `pulumi:"logDriver"` // Key/value pairs to use as options for the logging driver. - LogOpts pulumi.MapOutput `pulumi:"logOpts"` + LogOpts pulumi.StringMapOutput `pulumi:"logOpts"` // Save the container logs (`attach` must be enabled). Defaults to `false`. Logs pulumi.BoolPtrOutput `pulumi:"logs"` // The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. @@ -202,11 +202,11 @@ type Container struct { // Timeout (in seconds) to stop a container. StopTimeout pulumi.IntOutput `pulumi:"stopTimeout"` // Key/value pairs for the storage driver options, e.g. `size`: `120G` - StorageOpts pulumi.MapOutput `pulumi:"storageOpts"` + StorageOpts pulumi.StringMapOutput `pulumi:"storageOpts"` // A map of kernel parameters (sysctls) to set in the container. - Sysctls pulumi.MapOutput `pulumi:"sysctls"` + Sysctls pulumi.StringMapOutput `pulumi:"sysctls"` // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. - Tmpfs pulumi.MapOutput `pulumi:"tmpfs"` + Tmpfs pulumi.StringMapOutput `pulumi:"tmpfs"` // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. Tty pulumi.BoolPtrOutput `pulumi:"tty"` // Ulimit options to add. @@ -317,7 +317,7 @@ type containerState struct { // The logging driver to use for the container. LogDriver *string `pulumi:"logDriver"` // Key/value pairs to use as options for the logging driver. - LogOpts map[string]interface{} `pulumi:"logOpts"` + LogOpts map[string]string `pulumi:"logOpts"` // Save the container logs (`attach` must be enabled). Defaults to `false`. Logs *bool `pulumi:"logs"` // The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. @@ -368,11 +368,11 @@ type containerState struct { // Timeout (in seconds) to stop a container. StopTimeout *int `pulumi:"stopTimeout"` // Key/value pairs for the storage driver options, e.g. `size`: `120G` - StorageOpts map[string]interface{} `pulumi:"storageOpts"` + StorageOpts map[string]string `pulumi:"storageOpts"` // A map of kernel parameters (sysctls) to set in the container. - Sysctls map[string]interface{} `pulumi:"sysctls"` + Sysctls map[string]string `pulumi:"sysctls"` // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. - Tmpfs map[string]interface{} `pulumi:"tmpfs"` + Tmpfs map[string]string `pulumi:"tmpfs"` // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. Tty *bool `pulumi:"tty"` // Ulimit options to add. @@ -451,7 +451,7 @@ type ContainerState struct { // The logging driver to use for the container. LogDriver pulumi.StringPtrInput // Key/value pairs to use as options for the logging driver. - LogOpts pulumi.MapInput + LogOpts pulumi.StringMapInput // Save the container logs (`attach` must be enabled). Defaults to `false`. Logs pulumi.BoolPtrInput // The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. @@ -502,11 +502,11 @@ type ContainerState struct { // Timeout (in seconds) to stop a container. StopTimeout pulumi.IntPtrInput // Key/value pairs for the storage driver options, e.g. `size`: `120G` - StorageOpts pulumi.MapInput + StorageOpts pulumi.StringMapInput // A map of kernel parameters (sysctls) to set in the container. - Sysctls pulumi.MapInput + Sysctls pulumi.StringMapInput // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. - Tmpfs pulumi.MapInput + Tmpfs pulumi.StringMapInput // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. Tty pulumi.BoolPtrInput // Ulimit options to add. @@ -583,7 +583,7 @@ type containerArgs struct { // The logging driver to use for the container. LogDriver *string `pulumi:"logDriver"` // Key/value pairs to use as options for the logging driver. - LogOpts map[string]interface{} `pulumi:"logOpts"` + LogOpts map[string]string `pulumi:"logOpts"` // Save the container logs (`attach` must be enabled). Defaults to `false`. Logs *bool `pulumi:"logs"` // The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. @@ -632,11 +632,11 @@ type containerArgs struct { // Timeout (in seconds) to stop a container. StopTimeout *int `pulumi:"stopTimeout"` // Key/value pairs for the storage driver options, e.g. `size`: `120G` - StorageOpts map[string]interface{} `pulumi:"storageOpts"` + StorageOpts map[string]string `pulumi:"storageOpts"` // A map of kernel parameters (sysctls) to set in the container. - Sysctls map[string]interface{} `pulumi:"sysctls"` + Sysctls map[string]string `pulumi:"sysctls"` // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. - Tmpfs map[string]interface{} `pulumi:"tmpfs"` + Tmpfs map[string]string `pulumi:"tmpfs"` // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. Tty *bool `pulumi:"tty"` // Ulimit options to add. @@ -710,7 +710,7 @@ type ContainerArgs struct { // The logging driver to use for the container. LogDriver pulumi.StringPtrInput // Key/value pairs to use as options for the logging driver. - LogOpts pulumi.MapInput + LogOpts pulumi.StringMapInput // Save the container logs (`attach` must be enabled). Defaults to `false`. Logs pulumi.BoolPtrInput // The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. @@ -759,11 +759,11 @@ type ContainerArgs struct { // Timeout (in seconds) to stop a container. StopTimeout pulumi.IntPtrInput // Key/value pairs for the storage driver options, e.g. `size`: `120G` - StorageOpts pulumi.MapInput + StorageOpts pulumi.StringMapInput // A map of kernel parameters (sysctls) to set in the container. - Sysctls pulumi.MapInput + Sysctls pulumi.StringMapInput // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. - Tmpfs pulumi.MapInput + Tmpfs pulumi.StringMapInput // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. Tty pulumi.BoolPtrInput // Ulimit options to add. @@ -1012,8 +1012,8 @@ func (o ContainerOutput) LogDriver() pulumi.StringOutput { } // Key/value pairs to use as options for the logging driver. -func (o ContainerOutput) LogOpts() pulumi.MapOutput { - return o.ApplyT(func(v *Container) pulumi.MapOutput { return v.LogOpts }).(pulumi.MapOutput) +func (o ContainerOutput) LogOpts() pulumi.StringMapOutput { + return o.ApplyT(func(v *Container) pulumi.StringMapOutput { return v.LogOpts }).(pulumi.StringMapOutput) } // Save the container logs (`attach` must be enabled). Defaults to `false`. @@ -1141,18 +1141,18 @@ func (o ContainerOutput) StopTimeout() pulumi.IntOutput { } // Key/value pairs for the storage driver options, e.g. `size`: `120G` -func (o ContainerOutput) StorageOpts() pulumi.MapOutput { - return o.ApplyT(func(v *Container) pulumi.MapOutput { return v.StorageOpts }).(pulumi.MapOutput) +func (o ContainerOutput) StorageOpts() pulumi.StringMapOutput { + return o.ApplyT(func(v *Container) pulumi.StringMapOutput { return v.StorageOpts }).(pulumi.StringMapOutput) } // A map of kernel parameters (sysctls) to set in the container. -func (o ContainerOutput) Sysctls() pulumi.MapOutput { - return o.ApplyT(func(v *Container) pulumi.MapOutput { return v.Sysctls }).(pulumi.MapOutput) +func (o ContainerOutput) Sysctls() pulumi.StringMapOutput { + return o.ApplyT(func(v *Container) pulumi.StringMapOutput { return v.Sysctls }).(pulumi.StringMapOutput) } // A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. -func (o ContainerOutput) Tmpfs() pulumi.MapOutput { - return o.ApplyT(func(v *Container) pulumi.MapOutput { return v.Tmpfs }).(pulumi.MapOutput) +func (o ContainerOutput) Tmpfs() pulumi.StringMapOutput { + return o.ApplyT(func(v *Container) pulumi.StringMapOutput { return v.Tmpfs }).(pulumi.StringMapOutput) } // If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. diff --git a/sdk/go/docker/getNetwork.go b/sdk/go/docker/getNetwork.go index c4ae2eac..9c0d25fb 100644 --- a/sdk/go/docker/getNetwork.go +++ b/sdk/go/docker/getNetwork.go @@ -67,7 +67,7 @@ type LookupNetworkResult struct { // The name of the Docker network. Name string `pulumi:"name"` // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options map[string]interface{} `pulumi:"options"` + Options map[string]string `pulumi:"options"` // Scope of the network. One of `swarm`, `global`, or `local`. Scope string `pulumi:"scope"` } @@ -136,8 +136,8 @@ func (o LookupNetworkResultOutput) Name() pulumi.StringOutput { } // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. -func (o LookupNetworkResultOutput) Options() pulumi.MapOutput { - return o.ApplyT(func(v LookupNetworkResult) map[string]interface{} { return v.Options }).(pulumi.MapOutput) +func (o LookupNetworkResultOutput) Options() pulumi.StringMapOutput { + return o.ApplyT(func(v LookupNetworkResult) map[string]string { return v.Options }).(pulumi.StringMapOutput) } // Scope of the network. One of `swarm`, `global`, or `local`. diff --git a/sdk/go/docker/getPlugin.go b/sdk/go/docker/getPlugin.go index 2f24503a..abccbbf5 100644 --- a/sdk/go/docker/getPlugin.go +++ b/sdk/go/docker/getPlugin.go @@ -15,17 +15,37 @@ import ( // // ## Example Usage // -// ### With alias +// ```go +// package main // -// data "Plugin" "byAlias" { -// alias = "sample-volume-plugin:latest" -// } +// import ( +// +// "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" +// "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // -// ### With ID +// ) // -// data "Plugin" "byId" { -// id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" +// func main() { +// pulumi.Run(func(ctx *pulumi.Context) error { +// // ## With alias +// _, err := docker.LookupPlugin(ctx, &docker.LookupPluginArgs{ +// Alias: pulumi.StringRef("sample-volume-plugin:latest"), +// }, nil) +// if err != nil { +// return err +// } +// // ## With ID +// _, err = docker.LookupPlugin(ctx, &docker.LookupPluginArgs{ +// Id: pulumi.StringRef("e9a9db917b3bfd6706b5d3a66d4bceb9f"), +// }, nil) +// if err != nil { +// return err +// } +// return nil +// }) // } +// +// ``` func LookupPlugin(ctx *pulumi.Context, args *LookupPluginArgs, opts ...pulumi.InvokeOption) (*LookupPluginResult, error) { opts = internal.PkgInvokeDefaultOpts(opts) var rv LookupPluginResult diff --git a/sdk/go/docker/network.go b/sdk/go/docker/network.go index e6abfd00..d3a1600c 100644 --- a/sdk/go/docker/network.go +++ b/sdk/go/docker/network.go @@ -89,7 +89,7 @@ type Network struct { // Driver used by the custom IP scheme of the network. Defaults to `default` IpamDriver pulumi.StringPtrOutput `pulumi:"ipamDriver"` // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. - IpamOptions pulumi.MapOutput `pulumi:"ipamOptions"` + IpamOptions pulumi.StringMapOutput `pulumi:"ipamOptions"` // Enable IPv6 networking. Defaults to `false`. Ipv6 pulumi.BoolPtrOutput `pulumi:"ipv6"` // User-defined key/value metadata @@ -97,7 +97,7 @@ type Network struct { // The name of the Docker network. Name pulumi.StringOutput `pulumi:"name"` // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options pulumi.MapOutput `pulumi:"options"` + Options pulumi.StringMapOutput `pulumi:"options"` // Scope of the network. One of `swarm`, `global`, or `local`. Scope pulumi.StringOutput `pulumi:"scope"` } @@ -147,7 +147,7 @@ type networkState struct { // Driver used by the custom IP scheme of the network. Defaults to `default` IpamDriver *string `pulumi:"ipamDriver"` // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. - IpamOptions map[string]interface{} `pulumi:"ipamOptions"` + IpamOptions map[string]string `pulumi:"ipamOptions"` // Enable IPv6 networking. Defaults to `false`. Ipv6 *bool `pulumi:"ipv6"` // User-defined key/value metadata @@ -155,7 +155,7 @@ type networkState struct { // The name of the Docker network. Name *string `pulumi:"name"` // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options map[string]interface{} `pulumi:"options"` + Options map[string]string `pulumi:"options"` // Scope of the network. One of `swarm`, `global`, or `local`. Scope *string `pulumi:"scope"` } @@ -176,7 +176,7 @@ type NetworkState struct { // Driver used by the custom IP scheme of the network. Defaults to `default` IpamDriver pulumi.StringPtrInput // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. - IpamOptions pulumi.MapInput + IpamOptions pulumi.StringMapInput // Enable IPv6 networking. Defaults to `false`. Ipv6 pulumi.BoolPtrInput // User-defined key/value metadata @@ -184,7 +184,7 @@ type NetworkState struct { // The name of the Docker network. Name pulumi.StringPtrInput // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options pulumi.MapInput + Options pulumi.StringMapInput // Scope of the network. One of `swarm`, `global`, or `local`. Scope pulumi.StringPtrInput } @@ -209,7 +209,7 @@ type networkArgs struct { // Driver used by the custom IP scheme of the network. Defaults to `default` IpamDriver *string `pulumi:"ipamDriver"` // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. - IpamOptions map[string]interface{} `pulumi:"ipamOptions"` + IpamOptions map[string]string `pulumi:"ipamOptions"` // Enable IPv6 networking. Defaults to `false`. Ipv6 *bool `pulumi:"ipv6"` // User-defined key/value metadata @@ -217,7 +217,7 @@ type networkArgs struct { // The name of the Docker network. Name *string `pulumi:"name"` // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options map[string]interface{} `pulumi:"options"` + Options map[string]string `pulumi:"options"` } // The set of arguments for constructing a Network resource. @@ -237,7 +237,7 @@ type NetworkArgs struct { // Driver used by the custom IP scheme of the network. Defaults to `default` IpamDriver pulumi.StringPtrInput // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. - IpamOptions pulumi.MapInput + IpamOptions pulumi.StringMapInput // Enable IPv6 networking. Defaults to `false`. Ipv6 pulumi.BoolPtrInput // User-defined key/value metadata @@ -245,7 +245,7 @@ type NetworkArgs struct { // The name of the Docker network. Name pulumi.StringPtrInput // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. - Options pulumi.MapInput + Options pulumi.StringMapInput } func (NetworkArgs) ElementType() reflect.Type { @@ -371,8 +371,8 @@ func (o NetworkOutput) IpamDriver() pulumi.StringPtrOutput { } // Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. -func (o NetworkOutput) IpamOptions() pulumi.MapOutput { - return o.ApplyT(func(v *Network) pulumi.MapOutput { return v.IpamOptions }).(pulumi.MapOutput) +func (o NetworkOutput) IpamOptions() pulumi.StringMapOutput { + return o.ApplyT(func(v *Network) pulumi.StringMapOutput { return v.IpamOptions }).(pulumi.StringMapOutput) } // Enable IPv6 networking. Defaults to `false`. @@ -391,8 +391,8 @@ func (o NetworkOutput) Name() pulumi.StringOutput { } // Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. -func (o NetworkOutput) Options() pulumi.MapOutput { - return o.ApplyT(func(v *Network) pulumi.MapOutput { return v.Options }).(pulumi.MapOutput) +func (o NetworkOutput) Options() pulumi.StringMapOutput { + return o.ApplyT(func(v *Network) pulumi.StringMapOutput { return v.Options }).(pulumi.StringMapOutput) } // Scope of the network. One of `swarm`, `global`, or `local`. diff --git a/sdk/go/docker/pulumiTypes.go b/sdk/go/docker/pulumiTypes.go index e352256c..a8279b26 100644 --- a/sdk/go/docker/pulumiTypes.go +++ b/sdk/go/docker/pulumiTypes.go @@ -2253,7 +2253,7 @@ func (o ContainerVolumeArrayOutput) Index(i pulumi.IntInput) ContainerVolumeOutp type NetworkIpamConfig struct { // Auxiliary IPv4 or IPv6 addresses used by Network driver - AuxAddress map[string]interface{} `pulumi:"auxAddress"` + AuxAddress map[string]string `pulumi:"auxAddress"` // The IP address of the gateway Gateway *string `pulumi:"gateway"` // The ip range in CIDR form @@ -2275,7 +2275,7 @@ type NetworkIpamConfigInput interface { type NetworkIpamConfigArgs struct { // Auxiliary IPv4 or IPv6 addresses used by Network driver - AuxAddress pulumi.MapInput `pulumi:"auxAddress"` + AuxAddress pulumi.StringMapInput `pulumi:"auxAddress"` // The IP address of the gateway Gateway pulumi.StringPtrInput `pulumi:"gateway"` // The ip range in CIDR form @@ -2336,8 +2336,8 @@ func (o NetworkIpamConfigOutput) ToNetworkIpamConfigOutputWithContext(ctx contex } // Auxiliary IPv4 or IPv6 addresses used by Network driver -func (o NetworkIpamConfigOutput) AuxAddress() pulumi.MapOutput { - return o.ApplyT(func(v NetworkIpamConfig) map[string]interface{} { return v.AuxAddress }).(pulumi.MapOutput) +func (o NetworkIpamConfigOutput) AuxAddress() pulumi.StringMapOutput { + return o.ApplyT(func(v NetworkIpamConfig) map[string]string { return v.AuxAddress }).(pulumi.StringMapOutput) } // The IP address of the gateway @@ -5451,7 +5451,7 @@ type ServiceTaskSpecContainerSpec struct { // Signal to stop the container StopSignal *string `pulumi:"stopSignal"` // Sysctls config (Linux only) - Sysctl map[string]interface{} `pulumi:"sysctl"` + Sysctl map[string]string `pulumi:"sysctl"` // The user inside the container User *string `pulumi:"user"` } @@ -5507,7 +5507,7 @@ type ServiceTaskSpecContainerSpecArgs struct { // Signal to stop the container StopSignal pulumi.StringPtrInput `pulumi:"stopSignal"` // Sysctls config (Linux only) - Sysctl pulumi.MapInput `pulumi:"sysctl"` + Sysctl pulumi.StringMapInput `pulumi:"sysctl"` // The user inside the container User pulumi.StringPtrInput `pulumi:"user"` } @@ -5685,8 +5685,8 @@ func (o ServiceTaskSpecContainerSpecOutput) StopSignal() pulumi.StringPtrOutput } // Sysctls config (Linux only) -func (o ServiceTaskSpecContainerSpecOutput) Sysctl() pulumi.MapOutput { - return o.ApplyT(func(v ServiceTaskSpecContainerSpec) map[string]interface{} { return v.Sysctl }).(pulumi.MapOutput) +func (o ServiceTaskSpecContainerSpecOutput) Sysctl() pulumi.StringMapOutput { + return o.ApplyT(func(v ServiceTaskSpecContainerSpec) map[string]string { return v.Sysctl }).(pulumi.StringMapOutput) } // The user inside the container @@ -5909,13 +5909,13 @@ func (o ServiceTaskSpecContainerSpecPtrOutput) StopSignal() pulumi.StringPtrOutp } // Sysctls config (Linux only) -func (o ServiceTaskSpecContainerSpecPtrOutput) Sysctl() pulumi.MapOutput { - return o.ApplyT(func(v *ServiceTaskSpecContainerSpec) map[string]interface{} { +func (o ServiceTaskSpecContainerSpecPtrOutput) Sysctl() pulumi.StringMapOutput { + return o.ApplyT(func(v *ServiceTaskSpecContainerSpec) map[string]string { if v == nil { return nil } return v.Sysctl - }).(pulumi.MapOutput) + }).(pulumi.StringMapOutput) } // The user inside the container @@ -10275,7 +10275,7 @@ func (o DockerBuildPtrOutput) Target() pulumi.StringPtrOutput { type GetNetworkIpamConfig struct { // Auxiliary IPv4 or IPv6 addresses used by Network driver - AuxAddress map[string]interface{} `pulumi:"auxAddress"` + AuxAddress map[string]string `pulumi:"auxAddress"` // The IP address of the gateway Gateway *string `pulumi:"gateway"` // The ip range in CIDR form @@ -10297,7 +10297,7 @@ type GetNetworkIpamConfigInput interface { type GetNetworkIpamConfigArgs struct { // Auxiliary IPv4 or IPv6 addresses used by Network driver - AuxAddress pulumi.MapInput `pulumi:"auxAddress"` + AuxAddress pulumi.StringMapInput `pulumi:"auxAddress"` // The IP address of the gateway Gateway pulumi.StringPtrInput `pulumi:"gateway"` // The ip range in CIDR form @@ -10358,8 +10358,8 @@ func (o GetNetworkIpamConfigOutput) ToGetNetworkIpamConfigOutputWithContext(ctx } // Auxiliary IPv4 or IPv6 addresses used by Network driver -func (o GetNetworkIpamConfigOutput) AuxAddress() pulumi.MapOutput { - return o.ApplyT(func(v GetNetworkIpamConfig) map[string]interface{} { return v.AuxAddress }).(pulumi.MapOutput) +func (o GetNetworkIpamConfigOutput) AuxAddress() pulumi.StringMapOutput { + return o.ApplyT(func(v GetNetworkIpamConfig) map[string]string { return v.AuxAddress }).(pulumi.StringMapOutput) } // The IP address of the gateway diff --git a/sdk/go/docker/registryImage.go b/sdk/go/docker/registryImage.go index a59c1a62..129a8346 100644 --- a/sdk/go/docker/registryImage.go +++ b/sdk/go/docker/registryImage.go @@ -25,7 +25,7 @@ type RegistryImage struct { // The sha256 digest of the image. Sha256Digest pulumi.StringOutput `pulumi:"sha256Digest"` // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image - Triggers pulumi.MapOutput `pulumi:"triggers"` + Triggers pulumi.StringMapOutput `pulumi:"triggers"` } // NewRegistryImage registers a new resource with the given unique name, arguments, and options. @@ -67,7 +67,7 @@ type registryImageState struct { // The sha256 digest of the image. Sha256Digest *string `pulumi:"sha256Digest"` // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image - Triggers map[string]interface{} `pulumi:"triggers"` + Triggers map[string]string `pulumi:"triggers"` } type RegistryImageState struct { @@ -80,7 +80,7 @@ type RegistryImageState struct { // The sha256 digest of the image. Sha256Digest pulumi.StringPtrInput // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image - Triggers pulumi.MapInput + Triggers pulumi.StringMapInput } func (RegistryImageState) ElementType() reflect.Type { @@ -95,7 +95,7 @@ type registryImageArgs struct { // The name of the Docker image. Name *string `pulumi:"name"` // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image - Triggers map[string]interface{} `pulumi:"triggers"` + Triggers map[string]string `pulumi:"triggers"` } // The set of arguments for constructing a RegistryImage resource. @@ -107,7 +107,7 @@ type RegistryImageArgs struct { // The name of the Docker image. Name pulumi.StringPtrInput // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image - Triggers pulumi.MapInput + Triggers pulumi.StringMapInput } func (RegistryImageArgs) ElementType() reflect.Type { @@ -218,8 +218,8 @@ func (o RegistryImageOutput) Sha256Digest() pulumi.StringOutput { } // A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image -func (o RegistryImageOutput) Triggers() pulumi.MapOutput { - return o.ApplyT(func(v *RegistryImage) pulumi.MapOutput { return v.Triggers }).(pulumi.MapOutput) +func (o RegistryImageOutput) Triggers() pulumi.StringMapOutput { + return o.ApplyT(func(v *RegistryImage) pulumi.StringMapOutput { return v.Triggers }).(pulumi.StringMapOutput) } type RegistryImageArrayOutput struct{ *pulumi.OutputState } diff --git a/sdk/go/docker/remoteImage.go b/sdk/go/docker/remoteImage.go index 545c739e..80ed884a 100644 --- a/sdk/go/docker/remoteImage.go +++ b/sdk/go/docker/remoteImage.go @@ -148,7 +148,7 @@ type RemoteImage struct { // The image sha256 digest in the form of `repo[:tag]@sha256:`. RepoDigest pulumi.StringOutput `pulumi:"repoDigest"` // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change - Triggers pulumi.MapOutput `pulumi:"triggers"` + Triggers pulumi.StringMapOutput `pulumi:"triggers"` } // NewRemoteImage registers a new resource with the given unique name, arguments, and options. @@ -201,7 +201,7 @@ type remoteImageState struct { // The image sha256 digest in the form of `repo[:tag]@sha256:`. RepoDigest *string `pulumi:"repoDigest"` // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change - Triggers map[string]interface{} `pulumi:"triggers"` + Triggers map[string]string `pulumi:"triggers"` } type RemoteImageState struct { @@ -222,7 +222,7 @@ type RemoteImageState struct { // The image sha256 digest in the form of `repo[:tag]@sha256:`. RepoDigest pulumi.StringPtrInput // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change - Triggers pulumi.MapInput + Triggers pulumi.StringMapInput } func (RemoteImageState) ElementType() reflect.Type { @@ -243,7 +243,7 @@ type remoteImageArgs struct { // List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. PullTriggers []string `pulumi:"pullTriggers"` // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change - Triggers map[string]interface{} `pulumi:"triggers"` + Triggers map[string]string `pulumi:"triggers"` } // The set of arguments for constructing a RemoteImage resource. @@ -261,7 +261,7 @@ type RemoteImageArgs struct { // List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. PullTriggers pulumi.StringArrayInput // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change - Triggers pulumi.MapInput + Triggers pulumi.StringMapInput } func (RemoteImageArgs) ElementType() reflect.Type { @@ -392,8 +392,8 @@ func (o RemoteImageOutput) RepoDigest() pulumi.StringOutput { } // A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change -func (o RemoteImageOutput) Triggers() pulumi.MapOutput { - return o.ApplyT(func(v *RemoteImage) pulumi.MapOutput { return v.Triggers }).(pulumi.MapOutput) +func (o RemoteImageOutput) Triggers() pulumi.StringMapOutput { + return o.ApplyT(func(v *RemoteImage) pulumi.StringMapOutput { return v.Triggers }).(pulumi.StringMapOutput) } type RemoteImageArrayOutput struct{ *pulumi.OutputState } diff --git a/sdk/go/docker/volume.go b/sdk/go/docker/volume.go index a2aeaeae..3252a0da 100644 --- a/sdk/go/docker/volume.go +++ b/sdk/go/docker/volume.go @@ -77,7 +77,7 @@ type Volume struct { // Driver type for the volume. Defaults to `local`. Driver pulumi.StringOutput `pulumi:"driver"` // Options specific to the driver. - DriverOpts pulumi.MapOutput `pulumi:"driverOpts"` + DriverOpts pulumi.StringMapOutput `pulumi:"driverOpts"` // User-defined key/value metadata Labels VolumeLabelArrayOutput `pulumi:"labels"` // The mountpoint of the volume. @@ -119,7 +119,7 @@ type volumeState struct { // Driver type for the volume. Defaults to `local`. Driver *string `pulumi:"driver"` // Options specific to the driver. - DriverOpts map[string]interface{} `pulumi:"driverOpts"` + DriverOpts map[string]string `pulumi:"driverOpts"` // User-defined key/value metadata Labels []VolumeLabel `pulumi:"labels"` // The mountpoint of the volume. @@ -132,7 +132,7 @@ type VolumeState struct { // Driver type for the volume. Defaults to `local`. Driver pulumi.StringPtrInput // Options specific to the driver. - DriverOpts pulumi.MapInput + DriverOpts pulumi.StringMapInput // User-defined key/value metadata Labels VolumeLabelArrayInput // The mountpoint of the volume. @@ -149,7 +149,7 @@ type volumeArgs struct { // Driver type for the volume. Defaults to `local`. Driver *string `pulumi:"driver"` // Options specific to the driver. - DriverOpts map[string]interface{} `pulumi:"driverOpts"` + DriverOpts map[string]string `pulumi:"driverOpts"` // User-defined key/value metadata Labels []VolumeLabel `pulumi:"labels"` // The name of the Docker volume (will be generated if not provided). @@ -161,7 +161,7 @@ type VolumeArgs struct { // Driver type for the volume. Defaults to `local`. Driver pulumi.StringPtrInput // Options specific to the driver. - DriverOpts pulumi.MapInput + DriverOpts pulumi.StringMapInput // User-defined key/value metadata Labels VolumeLabelArrayInput // The name of the Docker volume (will be generated if not provided). @@ -261,8 +261,8 @@ func (o VolumeOutput) Driver() pulumi.StringOutput { } // Options specific to the driver. -func (o VolumeOutput) DriverOpts() pulumi.MapOutput { - return o.ApplyT(func(v *Volume) pulumi.MapOutput { return v.DriverOpts }).(pulumi.MapOutput) +func (o VolumeOutput) DriverOpts() pulumi.StringMapOutput { + return o.ApplyT(func(v *Volume) pulumi.StringMapOutput { return v.DriverOpts }).(pulumi.StringMapOutput) } // User-defined key/value metadata diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 2f499207..7b25559b 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -44,7 +44,7 @@ repositories { dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson:2.8.9") - implementation("com.pulumi:pulumi:0.12.0") + implementation("com.pulumi:pulumi:0.15.0") } task sourcesJar(type: Jar) { @@ -150,4 +150,4 @@ if (signingKey) { useInMemoryPgpKeys(signingKey, signingPassword) sign publishing.publications.mainPublication } -} \ No newline at end of file +} diff --git a/sdk/java/src/main/java/com/pulumi/docker/Container.java b/sdk/java/src/main/java/com/pulumi/docker/Container.java index 5e0fdd3a..3e4c342c 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Container.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Container.java @@ -24,7 +24,6 @@ import com.pulumi.docker.outputs.ContainerVolume; import java.lang.Boolean; import java.lang.Integer; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -520,14 +519,14 @@ public Output logDriver() { * Key/value pairs to use as options for the logging driver. * */ - @Export(name="logOpts", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> logOpts; + @Export(name="logOpts", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> logOpts; /** * @return Key/value pairs to use as options for the logging driver. * */ - public Output>> logOpts() { + public Output>> logOpts() { return Codegen.optional(this.logOpts); } /** @@ -876,42 +875,42 @@ public Output stopTimeout() { * Key/value pairs for the storage driver options, e.g. `size`: `120G` * */ - @Export(name="storageOpts", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> storageOpts; + @Export(name="storageOpts", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> storageOpts; /** * @return Key/value pairs for the storage driver options, e.g. `size`: `120G` * */ - public Output>> storageOpts() { + public Output>> storageOpts() { return Codegen.optional(this.storageOpts); } /** * A map of kernel parameters (sysctls) to set in the container. * */ - @Export(name="sysctls", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> sysctls; + @Export(name="sysctls", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> sysctls; /** * @return A map of kernel parameters (sysctls) to set in the container. * */ - public Output>> sysctls() { + public Output>> sysctls() { return Codegen.optional(this.sysctls); } /** * A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. * */ - @Export(name="tmpfs", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> tmpfs; + @Export(name="tmpfs", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> tmpfs; /** * @return A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. * */ - public Output>> tmpfs() { + public Output>> tmpfs() { return Codegen.optional(this.tmpfs); } /** @@ -1045,7 +1044,7 @@ public Output> workingDir() { * * @param name The _unique_ name of the resulting resource. */ - public Container(String name) { + public Container(java.lang.String name) { this(name, ContainerArgs.Empty); } /** @@ -1053,7 +1052,7 @@ public Container(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Container(String name, ContainerArgs args) { + public Container(java.lang.String name, ContainerArgs args) { this(name, args, null); } /** @@ -1062,15 +1061,22 @@ public Container(String name, ContainerArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Container(String name, ContainerArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/container:Container", name, args == null ? ContainerArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Container(java.lang.String name, ContainerArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/container:Container", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Container(String name, Output id, @Nullable ContainerState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/container:Container", name, state, makeResourceOptions(options, id)); + private Container(java.lang.String name, Output id, @Nullable ContainerState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/container:Container", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ContainerArgs makeArgs(ContainerArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ContainerArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -1086,7 +1092,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Container get(String name, Output id, @Nullable ContainerState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Container get(java.lang.String name, Output id, @Nullable ContainerState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Container(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/ContainerArgs.java b/sdk/java/src/main/java/com/pulumi/docker/ContainerArgs.java index d45e6844..b5866394 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/ContainerArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/ContainerArgs.java @@ -19,7 +19,6 @@ import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; import java.lang.Integer; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -412,13 +411,13 @@ public Optional> logDriver() { * */ @Import(name="logOpts") - private @Nullable Output> logOpts; + private @Nullable Output> logOpts; /** * @return Key/value pairs to use as options for the logging driver. * */ - public Optional>> logOpts() { + public Optional>> logOpts() { return Optional.ofNullable(this.logOpts); } @@ -779,13 +778,13 @@ public Optional> stopTimeout() { * */ @Import(name="storageOpts") - private @Nullable Output> storageOpts; + private @Nullable Output> storageOpts; /** * @return Key/value pairs for the storage driver options, e.g. `size`: `120G` * */ - public Optional>> storageOpts() { + public Optional>> storageOpts() { return Optional.ofNullable(this.storageOpts); } @@ -794,13 +793,13 @@ public Optional>> storageOpts() { * */ @Import(name="sysctls") - private @Nullable Output> sysctls; + private @Nullable Output> sysctls; /** * @return A map of kernel parameters (sysctls) to set in the container. * */ - public Optional>> sysctls() { + public Optional>> sysctls() { return Optional.ofNullable(this.sysctls); } @@ -809,13 +808,13 @@ public Optional>> sysctls() { * */ @Import(name="tmpfs") - private @Nullable Output> tmpfs; + private @Nullable Output> tmpfs; /** * @return A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. * */ - public Optional>> tmpfs() { + public Optional>> tmpfs() { return Optional.ofNullable(this.tmpfs); } @@ -1670,7 +1669,7 @@ public Builder logDriver(String logDriver) { * @return builder * */ - public Builder logOpts(@Nullable Output> logOpts) { + public Builder logOpts(@Nullable Output> logOpts) { $.logOpts = logOpts; return this; } @@ -1681,7 +1680,7 @@ public Builder logOpts(@Nullable Output> logOpts) { * @return builder * */ - public Builder logOpts(Map logOpts) { + public Builder logOpts(Map logOpts) { return logOpts(Output.of(logOpts)); } @@ -2223,7 +2222,7 @@ public Builder stopTimeout(Integer stopTimeout) { * @return builder * */ - public Builder storageOpts(@Nullable Output> storageOpts) { + public Builder storageOpts(@Nullable Output> storageOpts) { $.storageOpts = storageOpts; return this; } @@ -2234,7 +2233,7 @@ public Builder storageOpts(@Nullable Output> storageOpts) { * @return builder * */ - public Builder storageOpts(Map storageOpts) { + public Builder storageOpts(Map storageOpts) { return storageOpts(Output.of(storageOpts)); } @@ -2244,7 +2243,7 @@ public Builder storageOpts(Map storageOpts) { * @return builder * */ - public Builder sysctls(@Nullable Output> sysctls) { + public Builder sysctls(@Nullable Output> sysctls) { $.sysctls = sysctls; return this; } @@ -2255,7 +2254,7 @@ public Builder sysctls(@Nullable Output> sysctls) { * @return builder * */ - public Builder sysctls(Map sysctls) { + public Builder sysctls(Map sysctls) { return sysctls(Output.of(sysctls)); } @@ -2265,7 +2264,7 @@ public Builder sysctls(Map sysctls) { * @return builder * */ - public Builder tmpfs(@Nullable Output> tmpfs) { + public Builder tmpfs(@Nullable Output> tmpfs) { $.tmpfs = tmpfs; return this; } @@ -2276,7 +2275,7 @@ public Builder tmpfs(@Nullable Output> tmpfs) { * @return builder * */ - public Builder tmpfs(Map tmpfs) { + public Builder tmpfs(Map tmpfs) { return tmpfs(Output.of(tmpfs)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/DockerFunctions.java b/sdk/java/src/main/java/com/pulumi/docker/DockerFunctions.java index 4b7174c3..0be016cf 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/DockerFunctions.java +++ b/sdk/java/src/main/java/com/pulumi/docker/DockerFunctions.java @@ -227,15 +227,44 @@ public static CompletableFuture getNetworkPlain(GetNetworkPlai * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
+     * 
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
+     * 
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     *     }
+     * }
      * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static Output getPlugin() { @@ -246,15 +275,44 @@ public static Output getPlugin() { * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
+     * 
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
+     * 
+     *     }
+     * }
      * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static CompletableFuture getPluginPlain() { @@ -265,15 +323,44 @@ public static CompletableFuture getPluginPlain() { * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
+     * 
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
+     * 
+     *     }
      * }
+     * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static Output getPlugin(GetPluginArgs args) { @@ -284,15 +371,44 @@ public static Output getPlugin(GetPluginArgs args) { * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
+     * 
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
+     * 
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     *     }
      * }
+     * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static CompletableFuture getPluginPlain(GetPluginPlainArgs args) { @@ -303,15 +419,44 @@ public static CompletableFuture getPluginPlain(GetPluginPlainAr * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
+     * 
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
+     * 
+     *     }
      * }
+     * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static Output getPlugin(GetPluginArgs args, InvokeOptions options) { @@ -322,15 +467,44 @@ public static Output getPlugin(GetPluginArgs args, InvokeOption * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "by_alias" { - * alias = "sample-volume-plugin:latest" - * } + * <!--Start PulumiCodeChooser --> + * 
+     * {@code
+     * package generated_program;
+     * 
+     * import com.pulumi.Context;
+     * import com.pulumi.Pulumi;
+     * import com.pulumi.core.Output;
+     * import com.pulumi.docker.DockerFunctions;
+     * import com.pulumi.docker.inputs.GetPluginArgs;
+     * import java.util.List;
+     * import java.util.ArrayList;
+     * import java.util.Map;
+     * import java.io.File;
+     * import java.nio.file.Files;
+     * import java.nio.file.Paths;
      * 
-     * ### With ID
-     * data "docker.Plugin" "by_id" {
-     *   id = "e9a9db917b3bfd6706b5d3a66d4bceb9f"
+     * public class App {
+     *     public static void main(String[] args) {
+     *         Pulumi.run(App::stack);
+     *     }
+     * 
+     *     public static void stack(Context ctx) {
+     *         //## With alias
+     *         final var byAlias = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .alias("sample-volume-plugin:latest")
+     *             .build());
+     * 
+     *         //## With ID
+     *         final var byId = DockerFunctions.getPlugin(GetPluginArgs.builder()
+     *             .id("e9a9db917b3bfd6706b5d3a66d4bceb9f")
+     *             .build());
+     * 
+     *     }
+     * }
      * }
+     *
+ * <!--End PulumiCodeChooser --> * */ public static CompletableFuture getPluginPlain(GetPluginPlainArgs args, InvokeOptions options) { @@ -554,12 +728,12 @@ public static CompletableFuture getRegistryImagePlain(Ge * import java.nio.file.Files; * import java.nio.file.Paths; * - * public class App { - * public static void main(String[] args) { + * public class App }{{@code + * public static void main(String[] args) }{{@code * Pulumi.run(App::stack); - * } + * }}{@code * - * public static void stack(Context ctx) { + * public static void stack(Context ctx) }{{@code * // uses the 'latest' tag * final var latest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() * .name("nginx") @@ -572,16 +746,16 @@ public static CompletableFuture getRegistryImagePlain(Ge * * // use the image digest * final var digest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * * // uses the tag and the image digest * final var tagAndDigest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx:1.19.1{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx:1.19.1}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * - * } - * } + * }}{@code + * }}{@code * } * * <!--End PulumiCodeChooser --> @@ -612,12 +786,12 @@ public static Output getRemoteImage(GetRemoteImageArgs arg * import java.nio.file.Files; * import java.nio.file.Paths; * - * public class App { - * public static void main(String[] args) { + * public class App }{{@code + * public static void main(String[] args) }{{@code * Pulumi.run(App::stack); - * } + * }}{@code * - * public static void stack(Context ctx) { + * public static void stack(Context ctx) }{{@code * // uses the 'latest' tag * final var latest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() * .name("nginx") @@ -630,16 +804,16 @@ public static Output getRemoteImage(GetRemoteImageArgs arg * * // use the image digest * final var digest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * * // uses the tag and the image digest * final var tagAndDigest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx:1.19.1{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx:1.19.1}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * - * } - * } + * }}{@code + * }}{@code * } * * <!--End PulumiCodeChooser --> @@ -670,12 +844,12 @@ public static CompletableFuture getRemoteImagePlain(GetRem * import java.nio.file.Files; * import java.nio.file.Paths; * - * public class App { - * public static void main(String[] args) { + * public class App }{{@code + * public static void main(String[] args) }{{@code * Pulumi.run(App::stack); - * } + * }}{@code * - * public static void stack(Context ctx) { + * public static void stack(Context ctx) }{{@code * // uses the 'latest' tag * final var latest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() * .name("nginx") @@ -688,16 +862,16 @@ public static CompletableFuture getRemoteImagePlain(GetRem * * // use the image digest * final var digest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * * // uses the tag and the image digest * final var tagAndDigest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx:1.19.1{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx:1.19.1}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * - * } - * } + * }}{@code + * }}{@code * } * * <!--End PulumiCodeChooser --> @@ -728,12 +902,12 @@ public static Output getRemoteImage(GetRemoteImageArgs arg * import java.nio.file.Files; * import java.nio.file.Paths; * - * public class App { - * public static void main(String[] args) { + * public class App }{{@code + * public static void main(String[] args) }{{@code * Pulumi.run(App::stack); - * } + * }}{@code * - * public static void stack(Context ctx) { + * public static void stack(Context ctx) }{{@code * // uses the 'latest' tag * final var latest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() * .name("nginx") @@ -746,16 +920,16 @@ public static Output getRemoteImage(GetRemoteImageArgs arg * * // use the image digest * final var digest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * * // uses the tag and the image digest * final var tagAndDigest = DockerFunctions.getRemoteImage(GetRemoteImageArgs.builder() - * .name("nginx:1.19.1{@literal @}sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") + * .name("nginx:1.19.1}{@literal @}{@code sha256:36b74457bccb56fbf8b05f79c85569501b721d4db813b684391d63e02287c0b2") * .build()); * - * } - * } + * }}{@code + * }}{@code * } * * <!--End PulumiCodeChooser --> diff --git a/sdk/java/src/main/java/com/pulumi/docker/Image.java b/sdk/java/src/main/java/com/pulumi/docker/Image.java index 76001722..f31e4fb0 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Image.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Image.java @@ -303,7 +303,7 @@ public Output repoDigest() { * * @param name The _unique_ name of the resulting resource. */ - public Image(String name) { + public Image(java.lang.String name) { this(name, ImageArgs.Empty); } /** @@ -311,7 +311,7 @@ public Image(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Image(String name, ImageArgs args) { + public Image(java.lang.String name, ImageArgs args) { this(name, args, null); } /** @@ -320,15 +320,22 @@ public Image(String name, ImageArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Image(String name, ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/image:Image", name, args == null ? ImageArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Image(java.lang.String name, ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/image:Image", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Image(String name, Output id, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/image:Image", name, null, makeResourceOptions(options, id)); + private Image(java.lang.String name, Output id, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/image:Image", name, null, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ImageArgs makeArgs(ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ImageArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .aliases(List.of( @@ -346,7 +353,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param id The _unique_ provider ID of the resource to lookup. * @param options Optional settings to control the behavior of the CustomResource. */ - public static Image get(String name, Output id, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Image get(java.lang.String name, Output id, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Image(name, id, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Network.java b/sdk/java/src/main/java/com/pulumi/docker/Network.java index c31a674a..0fcbdcc5 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Network.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Network.java @@ -13,7 +13,6 @@ import com.pulumi.docker.outputs.NetworkIpamConfig; import com.pulumi.docker.outputs.NetworkLabel; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -196,14 +195,14 @@ public Output> ipamDriver() { * Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. * */ - @Export(name="ipamOptions", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> ipamOptions; + @Export(name="ipamOptions", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> ipamOptions; /** * @return Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. * */ - public Output>> ipamOptions() { + public Output>> ipamOptions() { return Codegen.optional(this.ipamOptions); } /** @@ -252,14 +251,14 @@ public Output name() { * Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - @Export(name="options", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> options; + @Export(name="options", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> options; /** * @return Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - public Output> options() { + public Output> options() { return this.options; } /** @@ -281,7 +280,7 @@ public Output scope() { * * @param name The _unique_ name of the resulting resource. */ - public Network(String name) { + public Network(java.lang.String name) { this(name, NetworkArgs.Empty); } /** @@ -289,7 +288,7 @@ public Network(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Network(String name, @Nullable NetworkArgs args) { + public Network(java.lang.String name, @Nullable NetworkArgs args) { this(name, args, null); } /** @@ -298,15 +297,22 @@ public Network(String name, @Nullable NetworkArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Network(String name, @Nullable NetworkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/network:Network", name, args == null ? NetworkArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Network(java.lang.String name, @Nullable NetworkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/network:Network", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Network(String name, Output id, @Nullable NetworkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/network:Network", name, state, makeResourceOptions(options, id)); + private Network(java.lang.String name, Output id, @Nullable NetworkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/network:Network", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static NetworkArgs makeArgs(@Nullable NetworkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? NetworkArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -322,7 +328,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Network get(String name, Output id, @Nullable NetworkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Network get(java.lang.String name, Output id, @Nullable NetworkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Network(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/NetworkArgs.java b/sdk/java/src/main/java/com/pulumi/docker/NetworkArgs.java index e34ebcce..822bedff 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/NetworkArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/NetworkArgs.java @@ -8,7 +8,6 @@ import com.pulumi.docker.inputs.NetworkIpamConfigArgs; import com.pulumi.docker.inputs.NetworkLabelArgs; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -131,13 +130,13 @@ public Optional> ipamDriver() { * */ @Import(name="ipamOptions") - private @Nullable Output> ipamOptions; + private @Nullable Output> ipamOptions; /** * @return Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. * */ - public Optional>> ipamOptions() { + public Optional>> ipamOptions() { return Optional.ofNullable(this.ipamOptions); } @@ -191,13 +190,13 @@ public Optional> name() { * */ @Import(name="options") - private @Nullable Output> options; + private @Nullable Output> options; /** * @return Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - public Optional>> options() { + public Optional>> options() { return Optional.ofNullable(this.options); } @@ -399,7 +398,7 @@ public Builder ipamDriver(String ipamDriver) { * @return builder * */ - public Builder ipamOptions(@Nullable Output> ipamOptions) { + public Builder ipamOptions(@Nullable Output> ipamOptions) { $.ipamOptions = ipamOptions; return this; } @@ -410,7 +409,7 @@ public Builder ipamOptions(@Nullable Output> ipamOptions) { * @return builder * */ - public Builder ipamOptions(Map ipamOptions) { + public Builder ipamOptions(Map ipamOptions) { return ipamOptions(Output.of(ipamOptions)); } @@ -493,7 +492,7 @@ public Builder name(String name) { * @return builder * */ - public Builder options(@Nullable Output> options) { + public Builder options(@Nullable Output> options) { $.options = options; return this; } @@ -504,7 +503,7 @@ public Builder options(@Nullable Output> options) { * @return builder * */ - public Builder options(Map options) { + public Builder options(Map options) { return options(Output.of(options)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Plugin.java b/sdk/java/src/main/java/com/pulumi/docker/Plugin.java index d6870693..148b832e 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Plugin.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Plugin.java @@ -178,7 +178,7 @@ public Output pluginReference() { * * @param name The _unique_ name of the resulting resource. */ - public Plugin(String name) { + public Plugin(java.lang.String name) { this(name, PluginArgs.Empty); } /** @@ -186,7 +186,7 @@ public Plugin(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Plugin(String name, @Nullable PluginArgs args) { + public Plugin(java.lang.String name, @Nullable PluginArgs args) { this(name, args, null); } /** @@ -195,15 +195,22 @@ public Plugin(String name, @Nullable PluginArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Plugin(String name, @Nullable PluginArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/plugin:Plugin", name, args == null ? PluginArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Plugin(java.lang.String name, @Nullable PluginArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/plugin:Plugin", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Plugin(String name, Output id, @Nullable PluginState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/plugin:Plugin", name, state, makeResourceOptions(options, id)); + private Plugin(java.lang.String name, Output id, @Nullable PluginState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/plugin:Plugin", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static PluginArgs makeArgs(@Nullable PluginArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? PluginArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -219,7 +226,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Plugin get(String name, Output id, @Nullable PluginState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Plugin get(java.lang.String name, Output id, @Nullable PluginState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Plugin(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Provider.java b/sdk/java/src/main/java/com/pulumi/docker/Provider.java index 9be94686..05cea51a 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Provider.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Provider.java @@ -97,7 +97,7 @@ public Output> keyMaterial() { * * @param name The _unique_ name of the resulting resource. */ - public Provider(String name) { + public Provider(java.lang.String name) { this(name, ProviderArgs.Empty); } /** @@ -105,7 +105,7 @@ public Provider(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Provider(String name, @Nullable ProviderArgs args) { + public Provider(java.lang.String name, @Nullable ProviderArgs args) { this(name, args, null); } /** @@ -114,11 +114,18 @@ public Provider(String name, @Nullable ProviderArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Provider(String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker", name, args == null ? ProviderArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); diff --git a/sdk/java/src/main/java/com/pulumi/docker/RegistryImage.java b/sdk/java/src/main/java/com/pulumi/docker/RegistryImage.java index 0b507034..a1d95e61 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/RegistryImage.java +++ b/sdk/java/src/main/java/com/pulumi/docker/RegistryImage.java @@ -11,7 +11,6 @@ import com.pulumi.docker.Utilities; import com.pulumi.docker.inputs.RegistryImageState; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Optional; @@ -84,14 +83,14 @@ public Output sha256Digest() { * A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image * */ - @Export(name="triggers", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> triggers; + @Export(name="triggers", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image * */ - public Output>> triggers() { + public Output>> triggers() { return Codegen.optional(this.triggers); } @@ -99,7 +98,7 @@ public Output>> triggers() { * * @param name The _unique_ name of the resulting resource. */ - public RegistryImage(String name) { + public RegistryImage(java.lang.String name) { this(name, RegistryImageArgs.Empty); } /** @@ -107,7 +106,7 @@ public RegistryImage(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public RegistryImage(String name, @Nullable RegistryImageArgs args) { + public RegistryImage(java.lang.String name, @Nullable RegistryImageArgs args) { this(name, args, null); } /** @@ -116,15 +115,22 @@ public RegistryImage(String name, @Nullable RegistryImageArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public RegistryImage(String name, @Nullable RegistryImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/registryImage:RegistryImage", name, args == null ? RegistryImageArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public RegistryImage(java.lang.String name, @Nullable RegistryImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/registryImage:RegistryImage", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private RegistryImage(String name, Output id, @Nullable RegistryImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/registryImage:RegistryImage", name, state, makeResourceOptions(options, id)); + private RegistryImage(java.lang.String name, Output id, @Nullable RegistryImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/registryImage:RegistryImage", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static RegistryImageArgs makeArgs(@Nullable RegistryImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? RegistryImageArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -140,7 +146,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static RegistryImage get(String name, Output id, @Nullable RegistryImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static RegistryImage get(java.lang.String name, Output id, @Nullable RegistryImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new RegistryImage(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/RegistryImageArgs.java b/sdk/java/src/main/java/com/pulumi/docker/RegistryImageArgs.java index f7f49917..8585d8af 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/RegistryImageArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/RegistryImageArgs.java @@ -6,7 +6,6 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Objects; @@ -68,13 +67,13 @@ public Optional> name() { * */ @Import(name="triggers") - private @Nullable Output> triggers; + private @Nullable Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image * */ - public Optional>> triggers() { + public Optional>> triggers() { return Optional.ofNullable(this.triggers); } @@ -174,7 +173,7 @@ public Builder name(String name) { * @return builder * */ - public Builder triggers(@Nullable Output> triggers) { + public Builder triggers(@Nullable Output> triggers) { $.triggers = triggers; return this; } @@ -185,7 +184,7 @@ public Builder triggers(@Nullable Output> triggers) { * @return builder * */ - public Builder triggers(Map triggers) { + public Builder triggers(Map triggers) { return triggers(Output.of(triggers)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/RemoteImage.java b/sdk/java/src/main/java/com/pulumi/docker/RemoteImage.java index 1c49a16b..c5683d03 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/RemoteImage.java +++ b/sdk/java/src/main/java/com/pulumi/docker/RemoteImage.java @@ -12,7 +12,6 @@ import com.pulumi.docker.inputs.RemoteImageState; import com.pulumi.docker.outputs.RemoteImageBuild; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -275,14 +274,14 @@ public Output repoDigest() { * A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change * */ - @Export(name="triggers", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> triggers; + @Export(name="triggers", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change * */ - public Output>> triggers() { + public Output>> triggers() { return Codegen.optional(this.triggers); } @@ -290,7 +289,7 @@ public Output>> triggers() { * * @param name The _unique_ name of the resulting resource. */ - public RemoteImage(String name) { + public RemoteImage(java.lang.String name) { this(name, RemoteImageArgs.Empty); } /** @@ -298,7 +297,7 @@ public RemoteImage(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public RemoteImage(String name, RemoteImageArgs args) { + public RemoteImage(java.lang.String name, RemoteImageArgs args) { this(name, args, null); } /** @@ -307,15 +306,22 @@ public RemoteImage(String name, RemoteImageArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public RemoteImage(String name, RemoteImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/remoteImage:RemoteImage", name, args == null ? RemoteImageArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public RemoteImage(java.lang.String name, RemoteImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/remoteImage:RemoteImage", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private RemoteImage(String name, Output id, @Nullable RemoteImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/remoteImage:RemoteImage", name, state, makeResourceOptions(options, id)); + private RemoteImage(java.lang.String name, Output id, @Nullable RemoteImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/remoteImage:RemoteImage", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static RemoteImageArgs makeArgs(RemoteImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? RemoteImageArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -331,7 +337,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static RemoteImage get(String name, Output id, @Nullable RemoteImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static RemoteImage get(java.lang.String name, Output id, @Nullable RemoteImageState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new RemoteImage(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/RemoteImageArgs.java b/sdk/java/src/main/java/com/pulumi/docker/RemoteImageArgs.java index edbbee1b..c3ffa425 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/RemoteImageArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/RemoteImageArgs.java @@ -8,7 +8,6 @@ import com.pulumi.docker.inputs.RemoteImageBuildArgs; import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -116,13 +115,13 @@ public Optional>> pullTriggers() { * */ @Import(name="triggers") - private @Nullable Output> triggers; + private @Nullable Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change * */ - public Optional>> triggers() { + public Optional>> triggers() { return Optional.ofNullable(this.triggers); } @@ -298,7 +297,7 @@ public Builder pullTriggers(String... pullTriggers) { * @return builder * */ - public Builder triggers(@Nullable Output> triggers) { + public Builder triggers(@Nullable Output> triggers) { $.triggers = triggers; return this; } @@ -309,7 +308,7 @@ public Builder triggers(@Nullable Output> triggers) { * @return builder * */ - public Builder triggers(Map triggers) { + public Builder triggers(Map triggers) { return triggers(Output.of(triggers)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Secret.java b/sdk/java/src/main/java/com/pulumi/docker/Secret.java index 2a3ffb17..6d45609b 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Secret.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Secret.java @@ -73,7 +73,7 @@ public Output name() { * * @param name The _unique_ name of the resulting resource. */ - public Secret(String name) { + public Secret(java.lang.String name) { this(name, SecretArgs.Empty); } /** @@ -81,7 +81,7 @@ public Secret(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Secret(String name, SecretArgs args) { + public Secret(java.lang.String name, SecretArgs args) { this(name, args, null); } /** @@ -90,15 +90,22 @@ public Secret(String name, SecretArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Secret(String name, SecretArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/secret:Secret", name, args == null ? SecretArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Secret(java.lang.String name, SecretArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/secret:Secret", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Secret(String name, Output id, @Nullable SecretState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/secret:Secret", name, state, makeResourceOptions(options, id)); + private Secret(java.lang.String name, Output id, @Nullable SecretState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/secret:Secret", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static SecretArgs makeArgs(SecretArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? SecretArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .additionalSecretOutputs(List.of( @@ -117,7 +124,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Secret get(String name, Output id, @Nullable SecretState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Secret get(java.lang.String name, Output id, @Nullable SecretState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Secret(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Service.java b/sdk/java/src/main/java/com/pulumi/docker/Service.java index a27a1dfb..512ef3c0 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Service.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Service.java @@ -217,7 +217,7 @@ public Output> updateConfig() { * * @param name The _unique_ name of the resulting resource. */ - public Service(String name) { + public Service(java.lang.String name) { this(name, ServiceArgs.Empty); } /** @@ -225,7 +225,7 @@ public Service(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Service(String name, ServiceArgs args) { + public Service(java.lang.String name, ServiceArgs args) { this(name, args, null); } /** @@ -234,15 +234,22 @@ public Service(String name, ServiceArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Service(String name, ServiceArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/service:Service", name, args == null ? ServiceArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Service(java.lang.String name, ServiceArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/service:Service", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Service(String name, Output id, @Nullable ServiceState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/service:Service", name, state, makeResourceOptions(options, id)); + private Service(java.lang.String name, Output id, @Nullable ServiceState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/service:Service", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ServiceArgs makeArgs(ServiceArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ServiceArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -258,7 +265,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Service get(String name, Output id, @Nullable ServiceState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Service get(java.lang.String name, Output id, @Nullable ServiceState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Service(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/ServiceConfig.java b/sdk/java/src/main/java/com/pulumi/docker/ServiceConfig.java index 76d7ef8e..c6c2f777 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/ServiceConfig.java +++ b/sdk/java/src/main/java/com/pulumi/docker/ServiceConfig.java @@ -84,7 +84,7 @@ public Output name() { * * @param name The _unique_ name of the resulting resource. */ - public ServiceConfig(String name) { + public ServiceConfig(java.lang.String name) { this(name, ServiceConfigArgs.Empty); } /** @@ -92,7 +92,7 @@ public ServiceConfig(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public ServiceConfig(String name, ServiceConfigArgs args) { + public ServiceConfig(java.lang.String name, ServiceConfigArgs args) { this(name, args, null); } /** @@ -101,15 +101,22 @@ public ServiceConfig(String name, ServiceConfigArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public ServiceConfig(String name, ServiceConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/serviceConfig:ServiceConfig", name, args == null ? ServiceConfigArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public ServiceConfig(java.lang.String name, ServiceConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/serviceConfig:ServiceConfig", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private ServiceConfig(String name, Output id, @Nullable ServiceConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/serviceConfig:ServiceConfig", name, state, makeResourceOptions(options, id)); + private ServiceConfig(java.lang.String name, Output id, @Nullable ServiceConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/serviceConfig:ServiceConfig", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ServiceConfigArgs makeArgs(ServiceConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ServiceConfigArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -125,7 +132,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static ServiceConfig get(String name, Output id, @Nullable ServiceConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static ServiceConfig get(java.lang.String name, Output id, @Nullable ServiceConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new ServiceConfig(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Tag.java b/sdk/java/src/main/java/com/pulumi/docker/Tag.java index 8a20e3c1..b3e23fac 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Tag.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Tag.java @@ -66,7 +66,7 @@ public Output targetImage() { * * @param name The _unique_ name of the resulting resource. */ - public Tag(String name) { + public Tag(java.lang.String name) { this(name, TagArgs.Empty); } /** @@ -74,7 +74,7 @@ public Tag(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Tag(String name, TagArgs args) { + public Tag(java.lang.String name, TagArgs args) { this(name, args, null); } /** @@ -83,15 +83,22 @@ public Tag(String name, TagArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Tag(String name, TagArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/tag:Tag", name, args == null ? TagArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Tag(java.lang.String name, TagArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/tag:Tag", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Tag(String name, Output id, @Nullable TagState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/tag:Tag", name, state, makeResourceOptions(options, id)); + private Tag(java.lang.String name, Output id, @Nullable TagState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/tag:Tag", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static TagArgs makeArgs(TagArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? TagArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -107,7 +114,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Tag get(String name, Output id, @Nullable TagState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Tag get(java.lang.String name, Output id, @Nullable TagState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Tag(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/Utilities.java b/sdk/java/src/main/java/com/pulumi/docker/Utilities.java index 45e6ca87..95dcb2ff 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Utilities.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Utilities.java @@ -17,7 +17,7 @@ public class Utilities { - public static Optional getEnv(String... names) { + public static Optional getEnv(java.lang.String... names) { for (var n : names) { var value = Environment.getEnvironmentVariable(n); if (value.isValue()) { @@ -27,7 +27,7 @@ public static Optional getEnv(String... names) { return Optional.empty(); } - public static Optional getEnvBoolean(String... names) { + public static Optional getEnvBoolean(java.lang.String... names) { for (var n : names) { var value = Environment.getBooleanEnvironmentVariable(n); if (value.isValue()) { @@ -37,7 +37,7 @@ public static Optional getEnvBoolean(String... names) { return Optional.empty(); } - public static Optional getEnvInteger(String... names) { + public static Optional getEnvInteger(java.lang.String... names) { for (var n : names) { var value = Environment.getIntegerEnvironmentVariable(n); if (value.isValue()) { @@ -47,7 +47,7 @@ public static Optional getEnvInteger(String... names) { return Optional.empty(); } - public static Optional getEnvDouble(String... names) { + public static Optional getEnvDouble(java.lang.String... names) { for (var n : names) { var value = Environment.getDoubleEnvironmentVariable(n); if (value.isValue()) { @@ -68,8 +68,8 @@ public static InvokeOptions withVersion(@Nullable InvokeOptions options) { ); } - private static final String version; - public static String getVersion() { + private static final java.lang.String version; + public static java.lang.String getVersion() { return version; } @@ -78,7 +78,7 @@ public static String getVersion() { var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); if (versionFile == null) { throw new IllegalStateException( - String.format("expected resource '%s' on Classpath, not found", resourceName) + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) ); } version = new BufferedReader(new InputStreamReader(versionFile)) diff --git a/sdk/java/src/main/java/com/pulumi/docker/Volume.java b/sdk/java/src/main/java/com/pulumi/docker/Volume.java index 1da98147..ad905634 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/Volume.java +++ b/sdk/java/src/main/java/com/pulumi/docker/Volume.java @@ -11,7 +11,6 @@ import com.pulumi.docker.VolumeArgs; import com.pulumi.docker.inputs.VolumeState; import com.pulumi.docker.outputs.VolumeLabel; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -110,14 +109,14 @@ public Output driver() { * Options specific to the driver. * */ - @Export(name="driverOpts", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") - private Output> driverOpts; + @Export(name="driverOpts", refs={Map.class,String.class}, tree="[0,1,1]") + private Output> driverOpts; /** * @return Options specific to the driver. * */ - public Output>> driverOpts() { + public Output>> driverOpts() { return Codegen.optional(this.driverOpts); } /** @@ -167,7 +166,7 @@ public Output name() { * * @param name The _unique_ name of the resulting resource. */ - public Volume(String name) { + public Volume(java.lang.String name) { this(name, VolumeArgs.Empty); } /** @@ -175,7 +174,7 @@ public Volume(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Volume(String name, @Nullable VolumeArgs args) { + public Volume(java.lang.String name, @Nullable VolumeArgs args) { this(name, args, null); } /** @@ -184,15 +183,22 @@ public Volume(String name, @Nullable VolumeArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Volume(String name, @Nullable VolumeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/volume:Volume", name, args == null ? VolumeArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Volume(java.lang.String name, @Nullable VolumeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/volume:Volume", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Volume(String name, Output id, @Nullable VolumeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("docker:index/volume:Volume", name, state, makeResourceOptions(options, id)); + private Volume(java.lang.String name, Output id, @Nullable VolumeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("docker:index/volume:Volume", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static VolumeArgs makeArgs(@Nullable VolumeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? VolumeArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -208,7 +214,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Volume get(String name, Output id, @Nullable VolumeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Volume get(java.lang.String name, Output id, @Nullable VolumeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Volume(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/docker/VolumeArgs.java b/sdk/java/src/main/java/com/pulumi/docker/VolumeArgs.java index 8037b4dd..4bfb7184 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/VolumeArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/VolumeArgs.java @@ -6,7 +6,6 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import com.pulumi.docker.inputs.VolumeLabelArgs; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -39,13 +38,13 @@ public Optional> driver() { * */ @Import(name="driverOpts") - private @Nullable Output> driverOpts; + private @Nullable Output> driverOpts; /** * @return Options specific to the driver. * */ - public Optional>> driverOpts() { + public Optional>> driverOpts() { return Optional.ofNullable(this.driverOpts); } @@ -133,7 +132,7 @@ public Builder driver(String driver) { * @return builder * */ - public Builder driverOpts(@Nullable Output> driverOpts) { + public Builder driverOpts(@Nullable Output> driverOpts) { $.driverOpts = driverOpts; return this; } @@ -144,7 +143,7 @@ public Builder driverOpts(@Nullable Output> driverOpts) { * @return builder * */ - public Builder driverOpts(Map driverOpts) { + public Builder driverOpts(Map driverOpts) { return driverOpts(Output.of(driverOpts)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/enums/BuilderVersion.java b/sdk/java/src/main/java/com/pulumi/docker/enums/BuilderVersion.java index 28c87585..35a171aa 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/enums/BuilderVersion.java +++ b/sdk/java/src/main/java/com/pulumi/docker/enums/BuilderVersion.java @@ -37,7 +37,7 @@ public String getValue() { } @Override - public String toString() { + public java.lang.String toString() { return new StringJoiner(", ", "BuilderVersion[", "]") .add("value='" + this.value + "'") .toString(); diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/ContainerState.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/ContainerState.java index 04149a69..4512ef0b 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/ContainerState.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/ContainerState.java @@ -19,7 +19,6 @@ import com.pulumi.docker.inputs.ContainerVolumeArgs; import java.lang.Boolean; import java.lang.Integer; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -457,13 +456,13 @@ public Optional> logDriver() { * */ @Import(name="logOpts") - private @Nullable Output> logOpts; + private @Nullable Output> logOpts; /** * @return Key/value pairs to use as options for the logging driver. * */ - public Optional>> logOpts() { + public Optional>> logOpts() { return Optional.ofNullable(this.logOpts); } @@ -839,13 +838,13 @@ public Optional> stopTimeout() { * */ @Import(name="storageOpts") - private @Nullable Output> storageOpts; + private @Nullable Output> storageOpts; /** * @return Key/value pairs for the storage driver options, e.g. `size`: `120G` * */ - public Optional>> storageOpts() { + public Optional>> storageOpts() { return Optional.ofNullable(this.storageOpts); } @@ -854,13 +853,13 @@ public Optional>> storageOpts() { * */ @Import(name="sysctls") - private @Nullable Output> sysctls; + private @Nullable Output> sysctls; /** * @return A map of kernel parameters (sysctls) to set in the container. * */ - public Optional>> sysctls() { + public Optional>> sysctls() { return Optional.ofNullable(this.sysctls); } @@ -869,13 +868,13 @@ public Optional>> sysctls() { * */ @Import(name="tmpfs") - private @Nullable Output> tmpfs; + private @Nullable Output> tmpfs; /** * @return A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. * */ - public Optional>> tmpfs() { + public Optional>> tmpfs() { return Optional.ofNullable(this.tmpfs); } @@ -1797,7 +1796,7 @@ public Builder logDriver(String logDriver) { * @return builder * */ - public Builder logOpts(@Nullable Output> logOpts) { + public Builder logOpts(@Nullable Output> logOpts) { $.logOpts = logOpts; return this; } @@ -1808,7 +1807,7 @@ public Builder logOpts(@Nullable Output> logOpts) { * @return builder * */ - public Builder logOpts(Map logOpts) { + public Builder logOpts(Map logOpts) { return logOpts(Output.of(logOpts)); } @@ -2381,7 +2380,7 @@ public Builder stopTimeout(Integer stopTimeout) { * @return builder * */ - public Builder storageOpts(@Nullable Output> storageOpts) { + public Builder storageOpts(@Nullable Output> storageOpts) { $.storageOpts = storageOpts; return this; } @@ -2392,7 +2391,7 @@ public Builder storageOpts(@Nullable Output> storageOpts) { * @return builder * */ - public Builder storageOpts(Map storageOpts) { + public Builder storageOpts(Map storageOpts) { return storageOpts(Output.of(storageOpts)); } @@ -2402,7 +2401,7 @@ public Builder storageOpts(Map storageOpts) { * @return builder * */ - public Builder sysctls(@Nullable Output> sysctls) { + public Builder sysctls(@Nullable Output> sysctls) { $.sysctls = sysctls; return this; } @@ -2413,7 +2412,7 @@ public Builder sysctls(@Nullable Output> sysctls) { * @return builder * */ - public Builder sysctls(Map sysctls) { + public Builder sysctls(Map sysctls) { return sysctls(Output.of(sysctls)); } @@ -2423,7 +2422,7 @@ public Builder sysctls(Map sysctls) { * @return builder * */ - public Builder tmpfs(@Nullable Output> tmpfs) { + public Builder tmpfs(@Nullable Output> tmpfs) { $.tmpfs = tmpfs; return this; } @@ -2434,7 +2433,7 @@ public Builder tmpfs(@Nullable Output> tmpfs) { * @return builder * */ - public Builder tmpfs(Map tmpfs) { + public Builder tmpfs(Map tmpfs) { return tmpfs(Output.of(tmpfs)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkIpamConfigArgs.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkIpamConfigArgs.java index cb18969d..a4a91827 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkIpamConfigArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkIpamConfigArgs.java @@ -5,7 +5,6 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Objects; @@ -22,13 +21,13 @@ public final class NetworkIpamConfigArgs extends com.pulumi.resources.ResourceAr * */ @Import(name="auxAddress") - private @Nullable Output> auxAddress; + private @Nullable Output> auxAddress; /** * @return Auxiliary IPv4 or IPv6 addresses used by Network driver * */ - public Optional>> auxAddress() { + public Optional>> auxAddress() { return Optional.ofNullable(this.auxAddress); } @@ -110,7 +109,7 @@ public Builder(NetworkIpamConfigArgs defaults) { * @return builder * */ - public Builder auxAddress(@Nullable Output> auxAddress) { + public Builder auxAddress(@Nullable Output> auxAddress) { $.auxAddress = auxAddress; return this; } @@ -121,7 +120,7 @@ public Builder auxAddress(@Nullable Output> auxAddress) { * @return builder * */ - public Builder auxAddress(Map auxAddress) { + public Builder auxAddress(Map auxAddress) { return auxAddress(Output.of(auxAddress)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkState.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkState.java index fad27622..41590c1a 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkState.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/NetworkState.java @@ -8,7 +8,6 @@ import com.pulumi.docker.inputs.NetworkIpamConfigArgs; import com.pulumi.docker.inputs.NetworkLabelArgs; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -131,13 +130,13 @@ public Optional> ipamDriver() { * */ @Import(name="ipamOptions") - private @Nullable Output> ipamOptions; + private @Nullable Output> ipamOptions; /** * @return Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. * */ - public Optional>> ipamOptions() { + public Optional>> ipamOptions() { return Optional.ofNullable(this.ipamOptions); } @@ -191,13 +190,13 @@ public Optional> name() { * */ @Import(name="options") - private @Nullable Output> options; + private @Nullable Output> options; /** * @return Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - public Optional>> options() { + public Optional>> options() { return Optional.ofNullable(this.options); } @@ -415,7 +414,7 @@ public Builder ipamDriver(String ipamDriver) { * @return builder * */ - public Builder ipamOptions(@Nullable Output> ipamOptions) { + public Builder ipamOptions(@Nullable Output> ipamOptions) { $.ipamOptions = ipamOptions; return this; } @@ -426,7 +425,7 @@ public Builder ipamOptions(@Nullable Output> ipamOptions) { * @return builder * */ - public Builder ipamOptions(Map ipamOptions) { + public Builder ipamOptions(Map ipamOptions) { return ipamOptions(Output.of(ipamOptions)); } @@ -509,7 +508,7 @@ public Builder name(String name) { * @return builder * */ - public Builder options(@Nullable Output> options) { + public Builder options(@Nullable Output> options) { $.options = options; return this; } @@ -520,7 +519,7 @@ public Builder options(@Nullable Output> options) { * @return builder * */ - public Builder options(Map options) { + public Builder options(Map options) { return options(Output.of(options)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/RegistryImageState.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/RegistryImageState.java index 621b6e05..ae165104 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/RegistryImageState.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/RegistryImageState.java @@ -6,7 +6,6 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Objects; @@ -83,13 +82,13 @@ public Optional> sha256Digest() { * */ @Import(name="triggers") - private @Nullable Output> triggers; + private @Nullable Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image * */ - public Optional>> triggers() { + public Optional>> triggers() { return Optional.ofNullable(this.triggers); } @@ -211,7 +210,7 @@ public Builder sha256Digest(String sha256Digest) { * @return builder * */ - public Builder triggers(@Nullable Output> triggers) { + public Builder triggers(@Nullable Output> triggers) { $.triggers = triggers; return this; } @@ -222,7 +221,7 @@ public Builder triggers(@Nullable Output> triggers) { * @return builder * */ - public Builder triggers(Map triggers) { + public Builder triggers(Map triggers) { return triggers(Output.of(triggers)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/RemoteImageState.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/RemoteImageState.java index 78edebeb..214e8ee9 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/RemoteImageState.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/RemoteImageState.java @@ -7,7 +7,6 @@ import com.pulumi.core.annotations.Import; import com.pulumi.docker.inputs.RemoteImageBuildArgs; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -145,13 +144,13 @@ public Optional> repoDigest() { * */ @Import(name="triggers") - private @Nullable Output> triggers; + private @Nullable Output> triggers; /** * @return A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change * */ - public Optional>> triggers() { + public Optional>> triggers() { return Optional.ofNullable(this.triggers); } @@ -371,7 +370,7 @@ public Builder repoDigest(String repoDigest) { * @return builder * */ - public Builder triggers(@Nullable Output> triggers) { + public Builder triggers(@Nullable Output> triggers) { $.triggers = triggers; return this; } @@ -382,7 +381,7 @@ public Builder triggers(@Nullable Output> triggers) { * @return builder * */ - public Builder triggers(Map triggers) { + public Builder triggers(Map triggers) { return triggers(Output.of(triggers)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/ServiceTaskSpecContainerSpecArgs.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/ServiceTaskSpecContainerSpecArgs.java index a4ee128c..50b35a30 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/ServiceTaskSpecContainerSpecArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/ServiceTaskSpecContainerSpecArgs.java @@ -15,7 +15,6 @@ import com.pulumi.docker.inputs.ServiceTaskSpecContainerSpecSecretArgs; import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -318,13 +317,13 @@ public Optional> stopSignal() { * */ @Import(name="sysctl") - private @Nullable Output> sysctl; + private @Nullable Output> sysctl; /** * @return Sysctls config (Linux only) * */ - public Optional>> sysctl() { + public Optional>> sysctl() { return Optional.ofNullable(this.sysctl); } @@ -872,7 +871,7 @@ public Builder stopSignal(String stopSignal) { * @return builder * */ - public Builder sysctl(@Nullable Output> sysctl) { + public Builder sysctl(@Nullable Output> sysctl) { $.sysctl = sysctl; return this; } @@ -883,7 +882,7 @@ public Builder sysctl(@Nullable Output> sysctl) { * @return builder * */ - public Builder sysctl(Map sysctl) { + public Builder sysctl(Map sysctl) { return sysctl(Output.of(sysctl)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/inputs/VolumeState.java b/sdk/java/src/main/java/com/pulumi/docker/inputs/VolumeState.java index fb435f1d..ddc91466 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/inputs/VolumeState.java +++ b/sdk/java/src/main/java/com/pulumi/docker/inputs/VolumeState.java @@ -6,7 +6,6 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import com.pulumi.docker.inputs.VolumeLabelArgs; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -39,13 +38,13 @@ public Optional> driver() { * */ @Import(name="driverOpts") - private @Nullable Output> driverOpts; + private @Nullable Output> driverOpts; /** * @return Options specific to the driver. * */ - public Optional>> driverOpts() { + public Optional>> driverOpts() { return Optional.ofNullable(this.driverOpts); } @@ -149,7 +148,7 @@ public Builder driver(String driver) { * @return builder * */ - public Builder driverOpts(@Nullable Output> driverOpts) { + public Builder driverOpts(@Nullable Output> driverOpts) { $.driverOpts = driverOpts; return this; } @@ -160,7 +159,7 @@ public Builder driverOpts(@Nullable Output> driverOpts) { * @return builder * */ - public Builder driverOpts(Map driverOpts) { + public Builder driverOpts(Map driverOpts) { return driverOpts(Output.of(driverOpts)); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkIpamConfig.java b/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkIpamConfig.java index 3b92add0..a0c2619d 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkIpamConfig.java +++ b/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkIpamConfig.java @@ -4,7 +4,6 @@ package com.pulumi.docker.outputs; import com.pulumi.core.annotations.CustomType; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Objects; @@ -17,7 +16,7 @@ public final class GetNetworkIpamConfig { * @return Auxiliary IPv4 or IPv6 addresses used by Network driver * */ - private @Nullable Map auxAddress; + private @Nullable Map auxAddress; /** * @return The IP address of the gateway * @@ -39,7 +38,7 @@ private GetNetworkIpamConfig() {} * @return Auxiliary IPv4 or IPv6 addresses used by Network driver * */ - public Map auxAddress() { + public Map auxAddress() { return this.auxAddress == null ? Map.of() : this.auxAddress; } /** @@ -73,7 +72,7 @@ public static Builder builder(GetNetworkIpamConfig defaults) { } @CustomType.Builder public static final class Builder { - private @Nullable Map auxAddress; + private @Nullable Map auxAddress; private @Nullable String gateway; private @Nullable String ipRange; private @Nullable String subnet; @@ -87,7 +86,7 @@ public Builder(GetNetworkIpamConfig defaults) { } @CustomType.Setter - public Builder auxAddress(@Nullable Map auxAddress) { + public Builder auxAddress(@Nullable Map auxAddress) { this.auxAddress = auxAddress; return this; diff --git a/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkResult.java b/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkResult.java index 17bf136b..2a68b199 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkResult.java +++ b/sdk/java/src/main/java/com/pulumi/docker/outputs/GetNetworkResult.java @@ -7,7 +7,6 @@ import com.pulumi.docker.outputs.GetNetworkIpamConfig; import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -44,7 +43,7 @@ public final class GetNetworkResult { * @return Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - private Map options; + private Map options; /** * @return Scope of the network. One of `swarm`, `global`, or `local`. * @@ -91,7 +90,7 @@ public String name() { * @return Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. * */ - public Map options() { + public Map options() { return this.options; } /** @@ -116,7 +115,7 @@ public static final class Builder { private Boolean internal; private List ipamConfigs; private String name; - private Map options; + private Map options; private String scope; public Builder() {} public Builder(GetNetworkResult defaults) { @@ -174,7 +173,7 @@ public Builder name(String name) { return this; } @CustomType.Setter - public Builder options(Map options) { + public Builder options(Map options) { if (options == null) { throw new MissingRequiredPropertyException("GetNetworkResult", "options"); } diff --git a/sdk/java/src/main/java/com/pulumi/docker/outputs/NetworkIpamConfig.java b/sdk/java/src/main/java/com/pulumi/docker/outputs/NetworkIpamConfig.java index 8e40c502..491b52b6 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/outputs/NetworkIpamConfig.java +++ b/sdk/java/src/main/java/com/pulumi/docker/outputs/NetworkIpamConfig.java @@ -4,7 +4,6 @@ package com.pulumi.docker.outputs; import com.pulumi.core.annotations.CustomType; -import java.lang.Object; import java.lang.String; import java.util.Map; import java.util.Objects; @@ -17,7 +16,7 @@ public final class NetworkIpamConfig { * @return Auxiliary IPv4 or IPv6 addresses used by Network driver * */ - private @Nullable Map auxAddress; + private @Nullable Map auxAddress; /** * @return The IP address of the gateway * @@ -39,7 +38,7 @@ private NetworkIpamConfig() {} * @return Auxiliary IPv4 or IPv6 addresses used by Network driver * */ - public Map auxAddress() { + public Map auxAddress() { return this.auxAddress == null ? Map.of() : this.auxAddress; } /** @@ -73,7 +72,7 @@ public static Builder builder(NetworkIpamConfig defaults) { } @CustomType.Builder public static final class Builder { - private @Nullable Map auxAddress; + private @Nullable Map auxAddress; private @Nullable String gateway; private @Nullable String ipRange; private @Nullable String subnet; @@ -87,7 +86,7 @@ public Builder(NetworkIpamConfig defaults) { } @CustomType.Setter - public Builder auxAddress(@Nullable Map auxAddress) { + public Builder auxAddress(@Nullable Map auxAddress) { this.auxAddress = auxAddress; return this; diff --git a/sdk/java/src/main/java/com/pulumi/docker/outputs/ServiceTaskSpecContainerSpec.java b/sdk/java/src/main/java/com/pulumi/docker/outputs/ServiceTaskSpecContainerSpec.java index 0748589b..03a4e40a 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/outputs/ServiceTaskSpecContainerSpec.java +++ b/sdk/java/src/main/java/com/pulumi/docker/outputs/ServiceTaskSpecContainerSpec.java @@ -14,7 +14,6 @@ import com.pulumi.docker.outputs.ServiceTaskSpecContainerSpecSecret; import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; -import java.lang.Object; import java.lang.String; import java.util.List; import java.util.Map; @@ -123,7 +122,7 @@ public final class ServiceTaskSpecContainerSpec { * @return Sysctls config (Linux only) * */ - private @Nullable Map sysctl; + private @Nullable Map sysctl; /** * @return The user inside the container * @@ -268,7 +267,7 @@ public Optional stopSignal() { * @return Sysctls config (Linux only) * */ - public Map sysctl() { + public Map sysctl() { return this.sysctl == null ? Map.of() : this.sysctl; } /** @@ -307,7 +306,7 @@ public static final class Builder { private @Nullable List secrets; private @Nullable String stopGracePeriod; private @Nullable String stopSignal; - private @Nullable Map sysctl; + private @Nullable Map sysctl; private @Nullable String user; public Builder() {} public Builder(ServiceTaskSpecContainerSpec defaults) { @@ -476,7 +475,7 @@ public Builder stopSignal(@Nullable String stopSignal) { return this; } @CustomType.Setter - public Builder sysctl(@Nullable Map sysctl) { + public Builder sysctl(@Nullable Map sysctl) { this.sysctl = sysctl; return this; diff --git a/sdk/nodejs/container.ts b/sdk/nodejs/container.ts index 208048a5..8958e560 100644 --- a/sdk/nodejs/container.ts +++ b/sdk/nodejs/container.ts @@ -211,7 +211,7 @@ export class Container extends pulumi.CustomResource { /** * Key/value pairs to use as options for the logging driver. */ - public readonly logOpts!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly logOpts!: pulumi.Output<{[key: string]: string} | undefined>; /** * Save the container logs (`attach` must be enabled). Defaults to `false`. */ @@ -312,15 +312,15 @@ export class Container extends pulumi.CustomResource { /** * Key/value pairs for the storage driver options, e.g. `size`: `120G` */ - public readonly storageOpts!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly storageOpts!: pulumi.Output<{[key: string]: string} | undefined>; /** * A map of kernel parameters (sysctls) to set in the container. */ - public readonly sysctls!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly sysctls!: pulumi.Output<{[key: string]: string} | undefined>; /** * A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. */ - public readonly tmpfs!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly tmpfs!: pulumi.Output<{[key: string]: string} | undefined>; /** * If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. */ @@ -633,7 +633,7 @@ export interface ContainerState { /** * Key/value pairs to use as options for the logging driver. */ - logOpts?: pulumi.Input<{[key: string]: any}>; + logOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * Save the container logs (`attach` must be enabled). Defaults to `false`. */ @@ -734,15 +734,15 @@ export interface ContainerState { /** * Key/value pairs for the storage driver options, e.g. `size`: `120G` */ - storageOpts?: pulumi.Input<{[key: string]: any}>; + storageOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * A map of kernel parameters (sysctls) to set in the container. */ - sysctls?: pulumi.Input<{[key: string]: any}>; + sysctls?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. */ - tmpfs?: pulumi.Input<{[key: string]: any}>; + tmpfs?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. */ @@ -888,7 +888,7 @@ export interface ContainerArgs { /** * Key/value pairs to use as options for the logging driver. */ - logOpts?: pulumi.Input<{[key: string]: any}>; + logOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * Save the container logs (`attach` must be enabled). Defaults to `false`. */ @@ -985,15 +985,15 @@ export interface ContainerArgs { /** * Key/value pairs for the storage driver options, e.g. `size`: `120G` */ - storageOpts?: pulumi.Input<{[key: string]: any}>; + storageOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * A map of kernel parameters (sysctls) to set in the container. */ - sysctls?: pulumi.Input<{[key: string]: any}>; + sysctls?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. */ - tmpfs?: pulumi.Input<{[key: string]: any}>; + tmpfs?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. */ diff --git a/sdk/nodejs/getNetwork.ts b/sdk/nodejs/getNetwork.ts index 29663ee7..f69ac508 100644 --- a/sdk/nodejs/getNetwork.ts +++ b/sdk/nodejs/getNetwork.ts @@ -66,7 +66,7 @@ export interface GetNetworkResult { /** * Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. */ - readonly options: {[key: string]: any}; + readonly options: {[key: string]: string}; /** * Scope of the network. One of `swarm`, `global`, or `local`. */ diff --git a/sdk/nodejs/getPlugin.ts b/sdk/nodejs/getPlugin.ts index c81d82ca..ac99663d 100644 --- a/sdk/nodejs/getPlugin.ts +++ b/sdk/nodejs/getPlugin.ts @@ -9,15 +9,19 @@ import * as utilities from "./utilities"; * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "byAlias" { - * alias = "sample-volume-plugin:latest" - * } + * ```typescript + * import * as pulumi from "@pulumi/pulumi"; + * import * as docker from "@pulumi/docker"; * - * ### With ID - * data "docker.Plugin" "byId" { - * id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - * } + * //## With alias + * const byAlias = docker.getPlugin({ + * alias: "sample-volume-plugin:latest", + * }); + * //## With ID + * const byId = docker.getPlugin({ + * id: "e9a9db917b3bfd6706b5d3a66d4bceb9f", + * }); + * ``` */ export function getPlugin(args?: GetPluginArgs, opts?: pulumi.InvokeOptions): Promise { args = args || {}; @@ -81,15 +85,19 @@ export interface GetPluginResult { * * ## Example Usage * - * ### With alias - * data "docker.Plugin" "byAlias" { - * alias = "sample-volume-plugin:latest" - * } + * ```typescript + * import * as pulumi from "@pulumi/pulumi"; + * import * as docker from "@pulumi/docker"; * - * ### With ID - * data "docker.Plugin" "byId" { - * id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - * } + * //## With alias + * const byAlias = docker.getPlugin({ + * alias: "sample-volume-plugin:latest", + * }); + * //## With ID + * const byId = docker.getPlugin({ + * id: "e9a9db917b3bfd6706b5d3a66d4bceb9f", + * }); + * ``` */ export function getPluginOutput(args?: GetPluginOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => getPlugin(a, opts)) diff --git a/sdk/nodejs/network.ts b/sdk/nodejs/network.ts index 55531f5f..5fa0e15d 100644 --- a/sdk/nodejs/network.ts +++ b/sdk/nodejs/network.ts @@ -111,7 +111,7 @@ export class Network extends pulumi.CustomResource { /** * Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. */ - public readonly ipamOptions!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly ipamOptions!: pulumi.Output<{[key: string]: string} | undefined>; /** * Enable IPv6 networking. Defaults to `false`. */ @@ -127,7 +127,7 @@ export class Network extends pulumi.CustomResource { /** * Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. */ - public readonly options!: pulumi.Output<{[key: string]: any}>; + public readonly options!: pulumi.Output<{[key: string]: string}>; /** * Scope of the network. One of `swarm`, `global`, or `local`. */ @@ -215,7 +215,7 @@ export interface NetworkState { /** * Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. */ - ipamOptions?: pulumi.Input<{[key: string]: any}>; + ipamOptions?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * Enable IPv6 networking. Defaults to `false`. */ @@ -231,7 +231,7 @@ export interface NetworkState { /** * Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. */ - options?: pulumi.Input<{[key: string]: any}>; + options?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * Scope of the network. One of `swarm`, `global`, or `local`. */ @@ -273,7 +273,7 @@ export interface NetworkArgs { /** * Provide explicit options to the IPAM driver. Valid options vary with `ipamDriver` and refer to that driver's documentation for more details. */ - ipamOptions?: pulumi.Input<{[key: string]: any}>; + ipamOptions?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * Enable IPv6 networking. Defaults to `false`. */ @@ -289,5 +289,5 @@ export interface NetworkArgs { /** * Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. */ - options?: pulumi.Input<{[key: string]: any}>; + options?: pulumi.Input<{[key: string]: pulumi.Input}>; } diff --git a/sdk/nodejs/registryImage.ts b/sdk/nodejs/registryImage.ts index 14dc5470..a7e98b48 100644 --- a/sdk/nodejs/registryImage.ts +++ b/sdk/nodejs/registryImage.ts @@ -55,7 +55,7 @@ export class RegistryImage extends pulumi.CustomResource { /** * A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image */ - public readonly triggers!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly triggers!: pulumi.Output<{[key: string]: string} | undefined>; /** * Create a RegistryImage resource with the given unique name, arguments, and options. @@ -111,7 +111,7 @@ export interface RegistryImageState { /** * A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image */ - triggers?: pulumi.Input<{[key: string]: any}>; + triggers?: pulumi.Input<{[key: string]: pulumi.Input}>; } /** @@ -133,5 +133,5 @@ export interface RegistryImageArgs { /** * A map of arbitrary strings that, when changed, will force the `docker.RegistryImage` resource to be replaced. This can be used to repush a local image */ - triggers?: pulumi.Input<{[key: string]: any}>; + triggers?: pulumi.Input<{[key: string]: pulumi.Input}>; } diff --git a/sdk/nodejs/remoteImage.ts b/sdk/nodejs/remoteImage.ts index 54f7273f..459bc3d4 100644 --- a/sdk/nodejs/remoteImage.ts +++ b/sdk/nodejs/remoteImage.ts @@ -133,7 +133,7 @@ export class RemoteImage extends pulumi.CustomResource { /** * A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change */ - public readonly triggers!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly triggers!: pulumi.Output<{[key: string]: string} | undefined>; /** * Create a RemoteImage resource with the given unique name, arguments, and options. @@ -216,7 +216,7 @@ export interface RemoteImageState { /** * A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change */ - triggers?: pulumi.Input<{[key: string]: any}>; + triggers?: pulumi.Input<{[key: string]: pulumi.Input}>; } /** @@ -250,5 +250,5 @@ export interface RemoteImageArgs { /** * A map of arbitrary strings that, when changed, will force the `docker.RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change */ - triggers?: pulumi.Input<{[key: string]: any}>; + triggers?: pulumi.Input<{[key: string]: pulumi.Input}>; } diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts index 09e23d05..c2859e4e 100644 --- a/sdk/nodejs/types/input.ts +++ b/sdk/nodejs/types/input.ts @@ -350,7 +350,7 @@ export interface NetworkIpamConfig { /** * Auxiliary IPv4 or IPv6 addresses used by Network driver */ - auxAddress?: pulumi.Input<{[key: string]: any}>; + auxAddress?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * The IP address of the gateway */ @@ -864,7 +864,7 @@ export interface ServiceTaskSpecContainerSpec { /** * Sysctls config (Linux only) */ - sysctl?: pulumi.Input<{[key: string]: any}>; + sysctl?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * The user inside the container */ diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index 8c4b83ce..7e29b87b 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -298,7 +298,7 @@ export interface GetNetworkIpamConfig { /** * Auxiliary IPv4 or IPv6 addresses used by Network driver */ - auxAddress?: {[key: string]: any}; + auxAddress?: {[key: string]: string}; /** * The IP address of the gateway */ @@ -317,7 +317,7 @@ export interface NetworkIpamConfig { /** * Auxiliary IPv4 or IPv6 addresses used by Network driver */ - auxAddress?: {[key: string]: any}; + auxAddress?: {[key: string]: string}; /** * The IP address of the gateway */ @@ -789,7 +789,7 @@ export interface ServiceTaskSpecContainerSpec { /** * Sysctls config (Linux only) */ - sysctl?: {[key: string]: any}; + sysctl?: {[key: string]: string}; /** * The user inside the container */ diff --git a/sdk/nodejs/volume.ts b/sdk/nodejs/volume.ts index ab4ceca0..c19f86ec 100644 --- a/sdk/nodejs/volume.ts +++ b/sdk/nodejs/volume.ts @@ -87,7 +87,7 @@ export class Volume extends pulumi.CustomResource { /** * Options specific to the driver. */ - public readonly driverOpts!: pulumi.Output<{[key: string]: any} | undefined>; + public readonly driverOpts!: pulumi.Output<{[key: string]: string} | undefined>; /** * User-defined key/value metadata */ @@ -143,7 +143,7 @@ export interface VolumeState { /** * Options specific to the driver. */ - driverOpts?: pulumi.Input<{[key: string]: any}>; + driverOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * User-defined key/value metadata */ @@ -169,7 +169,7 @@ export interface VolumeArgs { /** * Options specific to the driver. */ - driverOpts?: pulumi.Input<{[key: string]: any}>; + driverOpts?: pulumi.Input<{[key: string]: pulumi.Input}>; /** * User-defined key/value metadata */ diff --git a/sdk/python/pulumi_docker/_inputs.py b/sdk/python/pulumi_docker/_inputs.py index c39a7b6d..1f875a8b 100644 --- a/sdk/python/pulumi_docker/_inputs.py +++ b/sdk/python/pulumi_docker/_inputs.py @@ -1134,12 +1134,12 @@ def volume_name(self, value: Optional[pulumi.Input[str]]): @pulumi.input_type class NetworkIpamConfigArgs: def __init__(__self__, *, - aux_address: Optional[pulumi.Input[Mapping[str, Any]]] = None, + aux_address: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, gateway: Optional[pulumi.Input[str]] = None, ip_range: Optional[pulumi.Input[str]] = None, subnet: Optional[pulumi.Input[str]] = None): """ - :param pulumi.Input[Mapping[str, Any]] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver :param pulumi.Input[str] gateway: The IP address of the gateway :param pulumi.Input[str] ip_range: The ip range in CIDR form :param pulumi.Input[str] subnet: The subnet in CIDR form @@ -1155,14 +1155,14 @@ def __init__(__self__, *, @property @pulumi.getter(name="auxAddress") - def aux_address(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def aux_address(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Auxiliary IPv4 or IPv6 addresses used by Network driver """ return pulumi.get(self, "aux_address") @aux_address.setter - def aux_address(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def aux_address(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "aux_address", value) @property @@ -2739,7 +2739,7 @@ def __init__(__self__, *, secrets: Optional[pulumi.Input[Sequence[pulumi.Input['ServiceTaskSpecContainerSpecSecretArgs']]]] = None, stop_grace_period: Optional[pulumi.Input[str]] = None, stop_signal: Optional[pulumi.Input[str]] = None, - sysctl: Optional[pulumi.Input[Mapping[str, Any]]] = None, + sysctl: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, user: Optional[pulumi.Input[str]] = None): """ :param pulumi.Input[str] image: The image name to use for the containers of the service, like `nginx:1.17.6`. Also use the data-source or resource of `RemoteImage` with the `repo_digest` or `RegistryImage` with the `name` attribute for this, as shown in the examples. @@ -2761,7 +2761,7 @@ def __init__(__self__, *, :param pulumi.Input[Sequence[pulumi.Input['ServiceTaskSpecContainerSpecSecretArgs']]] secrets: References to zero or more secrets that will be exposed to the service :param pulumi.Input[str] stop_grace_period: Amount of time to wait for the container to terminate before forcefully removing it (ms|s|m|h). If not specified or '0s' the destroy will not check if all tasks/containers of the service terminate. :param pulumi.Input[str] stop_signal: Signal to stop the container - :param pulumi.Input[Mapping[str, Any]] sysctl: Sysctls config (Linux only) + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] sysctl: Sysctls config (Linux only) :param pulumi.Input[str] user: The user inside the container """ pulumi.set(__self__, "image", image) @@ -3036,14 +3036,14 @@ def stop_signal(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def sysctl(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def sysctl(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Sysctls config (Linux only) """ return pulumi.get(self, "sysctl") @sysctl.setter - def sysctl(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def sysctl(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "sysctl", value) @property diff --git a/sdk/python/pulumi_docker/container.py b/sdk/python/pulumi_docker/container.py index 65bb6efb..d9854c3d 100644 --- a/sdk/python/pulumi_docker/container.py +++ b/sdk/python/pulumi_docker/container.py @@ -41,7 +41,7 @@ def __init__(__self__, *, ipc_mode: Optional[pulumi.Input[str]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerLabelArgs']]]] = None, log_driver: Optional[pulumi.Input[str]] = None, - log_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + log_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, logs: Optional[pulumi.Input[bool]] = None, max_retry_count: Optional[pulumi.Input[int]] = None, memory: Optional[pulumi.Input[int]] = None, @@ -66,9 +66,9 @@ def __init__(__self__, *, stdin_open: Optional[pulumi.Input[bool]] = None, stop_signal: Optional[pulumi.Input[str]] = None, stop_timeout: Optional[pulumi.Input[int]] = None, - storage_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - sysctls: Optional[pulumi.Input[Mapping[str, Any]]] = None, - tmpfs: Optional[pulumi.Input[Mapping[str, Any]]] = None, + storage_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + sysctls: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + tmpfs: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, tty: Optional[pulumi.Input[bool]] = None, ulimits: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerUlimitArgs']]]] = None, uploads: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerUploadArgs']]]] = None, @@ -105,7 +105,7 @@ def __init__(__self__, *, :param pulumi.Input[str] ipc_mode: IPC sharing mode for the container. Possible values are: `none`, `private`, `shareable`, `container:` or `host`. :param pulumi.Input[Sequence[pulumi.Input['ContainerLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] log_driver: The logging driver to use for the container. - :param pulumi.Input[Mapping[str, Any]] log_opts: Key/value pairs to use as options for the logging driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] log_opts: Key/value pairs to use as options for the logging driver. :param pulumi.Input[bool] logs: Save the container logs (`attach` must be enabled). Defaults to `false`. :param pulumi.Input[int] max_retry_count: The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. :param pulumi.Input[int] memory: The memory limit for the container in MBs. @@ -129,9 +129,9 @@ def __init__(__self__, *, :param pulumi.Input[bool] stdin_open: If `true`, keep STDIN open even if not attached (`docker run -i`). Defaults to `false`. :param pulumi.Input[str] stop_signal: Signal to stop a container (default `SIGTERM`). :param pulumi.Input[int] stop_timeout: Timeout (in seconds) to stop a container. - :param pulumi.Input[Mapping[str, Any]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` - :param pulumi.Input[Mapping[str, Any]] sysctls: A map of kernel parameters (sysctls) to set in the container. - :param pulumi.Input[Mapping[str, Any]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] sysctls: A map of kernel parameters (sysctls) to set in the container. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. :param pulumi.Input[bool] tty: If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. :param pulumi.Input[Sequence[pulumi.Input['ContainerUlimitArgs']]] ulimits: Ulimit options to add. :param pulumi.Input[Sequence[pulumi.Input['ContainerUploadArgs']]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. @@ -568,14 +568,14 @@ def log_driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="logOpts") - def log_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def log_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Key/value pairs to use as options for the logging driver. """ return pulumi.get(self, "log_opts") @log_opts.setter - def log_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def log_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "log_opts", value) @property @@ -865,38 +865,38 @@ def stop_timeout(self, value: Optional[pulumi.Input[int]]): @property @pulumi.getter(name="storageOpts") - def storage_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def storage_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Key/value pairs for the storage driver options, e.g. `size`: `120G` """ return pulumi.get(self, "storage_opts") @storage_opts.setter - def storage_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def storage_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "storage_opts", value) @property @pulumi.getter - def sysctls(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def sysctls(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of kernel parameters (sysctls) to set in the container. """ return pulumi.get(self, "sysctls") @sysctls.setter - def sysctls(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def sysctls(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "sysctls", value) @property @pulumi.getter - def tmpfs(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def tmpfs(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. """ return pulumi.get(self, "tmpfs") @tmpfs.setter - def tmpfs(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def tmpfs(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "tmpfs", value) @property @@ -1039,7 +1039,7 @@ def __init__(__self__, *, ipc_mode: Optional[pulumi.Input[str]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerLabelArgs']]]] = None, log_driver: Optional[pulumi.Input[str]] = None, - log_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + log_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, logs: Optional[pulumi.Input[bool]] = None, max_retry_count: Optional[pulumi.Input[int]] = None, memory: Optional[pulumi.Input[int]] = None, @@ -1065,9 +1065,9 @@ def __init__(__self__, *, stdin_open: Optional[pulumi.Input[bool]] = None, stop_signal: Optional[pulumi.Input[str]] = None, stop_timeout: Optional[pulumi.Input[int]] = None, - storage_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - sysctls: Optional[pulumi.Input[Mapping[str, Any]]] = None, - tmpfs: Optional[pulumi.Input[Mapping[str, Any]]] = None, + storage_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + sysctls: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + tmpfs: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, tty: Optional[pulumi.Input[bool]] = None, ulimits: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerUlimitArgs']]]] = None, uploads: Optional[pulumi.Input[Sequence[pulumi.Input['ContainerUploadArgs']]]] = None, @@ -1107,7 +1107,7 @@ def __init__(__self__, *, :param pulumi.Input[str] ipc_mode: IPC sharing mode for the container. Possible values are: `none`, `private`, `shareable`, `container:` or `host`. :param pulumi.Input[Sequence[pulumi.Input['ContainerLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] log_driver: The logging driver to use for the container. - :param pulumi.Input[Mapping[str, Any]] log_opts: Key/value pairs to use as options for the logging driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] log_opts: Key/value pairs to use as options for the logging driver. :param pulumi.Input[bool] logs: Save the container logs (`attach` must be enabled). Defaults to `false`. :param pulumi.Input[int] max_retry_count: The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. :param pulumi.Input[int] memory: The memory limit for the container in MBs. @@ -1132,9 +1132,9 @@ def __init__(__self__, *, :param pulumi.Input[bool] stdin_open: If `true`, keep STDIN open even if not attached (`docker run -i`). Defaults to `false`. :param pulumi.Input[str] stop_signal: Signal to stop a container (default `SIGTERM`). :param pulumi.Input[int] stop_timeout: Timeout (in seconds) to stop a container. - :param pulumi.Input[Mapping[str, Any]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` - :param pulumi.Input[Mapping[str, Any]] sysctls: A map of kernel parameters (sysctls) to set in the container. - :param pulumi.Input[Mapping[str, Any]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] sysctls: A map of kernel parameters (sysctls) to set in the container. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. :param pulumi.Input[bool] tty: If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. :param pulumi.Input[Sequence[pulumi.Input['ContainerUlimitArgs']]] ulimits: Ulimit options to add. :param pulumi.Input[Sequence[pulumi.Input['ContainerUploadArgs']]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. @@ -1616,14 +1616,14 @@ def log_driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="logOpts") - def log_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def log_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Key/value pairs to use as options for the logging driver. """ return pulumi.get(self, "log_opts") @log_opts.setter - def log_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def log_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "log_opts", value) @property @@ -1925,38 +1925,38 @@ def stop_timeout(self, value: Optional[pulumi.Input[int]]): @property @pulumi.getter(name="storageOpts") - def storage_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def storage_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Key/value pairs for the storage driver options, e.g. `size`: `120G` """ return pulumi.get(self, "storage_opts") @storage_opts.setter - def storage_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def storage_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "storage_opts", value) @property @pulumi.getter - def sysctls(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def sysctls(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of kernel parameters (sysctls) to set in the container. """ return pulumi.get(self, "sysctls") @sysctls.setter - def sysctls(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def sysctls(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "sysctls", value) @property @pulumi.getter - def tmpfs(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def tmpfs(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. """ return pulumi.get(self, "tmpfs") @tmpfs.setter - def tmpfs(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def tmpfs(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "tmpfs", value) @property @@ -2074,14 +2074,14 @@ def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, attach: Optional[pulumi.Input[bool]] = None, - capabilities: Optional[pulumi.Input[pulumi.InputType['ContainerCapabilitiesArgs']]] = None, + capabilities: Optional[pulumi.Input[Union['ContainerCapabilitiesArgs', 'ContainerCapabilitiesArgsDict']]] = None, cgroupns_mode: Optional[pulumi.Input[str]] = None, command: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, container_read_refresh_timeout_milliseconds: Optional[pulumi.Input[int]] = None, cpu_set: Optional[pulumi.Input[str]] = None, cpu_shares: Optional[pulumi.Input[int]] = None, destroy_grace_seconds: Optional[pulumi.Input[int]] = None, - devices: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerDeviceArgs']]]]] = None, + devices: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerDeviceArgs', 'ContainerDeviceArgsDict']]]]] = None, dns: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_opts: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_searches: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, @@ -2090,26 +2090,26 @@ def __init__(__self__, envs: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, gpus: Optional[pulumi.Input[str]] = None, group_adds: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - healthcheck: Optional[pulumi.Input[pulumi.InputType['ContainerHealthcheckArgs']]] = None, + healthcheck: Optional[pulumi.Input[Union['ContainerHealthcheckArgs', 'ContainerHealthcheckArgsDict']]] = None, hostname: Optional[pulumi.Input[str]] = None, - hosts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerHostArgs']]]]] = None, + hosts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerHostArgs', 'ContainerHostArgsDict']]]]] = None, image: Optional[pulumi.Input[str]] = None, init: Optional[pulumi.Input[bool]] = None, ipc_mode: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerLabelArgs', 'ContainerLabelArgsDict']]]]] = None, log_driver: Optional[pulumi.Input[str]] = None, - log_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + log_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, logs: Optional[pulumi.Input[bool]] = None, max_retry_count: Optional[pulumi.Input[int]] = None, memory: Optional[pulumi.Input[int]] = None, memory_swap: Optional[pulumi.Input[int]] = None, - mounts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerMountArgs']]]]] = None, + mounts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerMountArgs', 'ContainerMountArgsDict']]]]] = None, must_run: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, network_mode: Optional[pulumi.Input[str]] = None, - networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworksAdvancedArgs']]]]] = None, + networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworksAdvancedArgs', 'ContainerNetworksAdvancedArgsDict']]]]] = None, pid_mode: Optional[pulumi.Input[str]] = None, - ports: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerPortArgs']]]]] = None, + ports: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerPortArgs', 'ContainerPortArgsDict']]]]] = None, privileged: Optional[pulumi.Input[bool]] = None, publish_all_ports: Optional[pulumi.Input[bool]] = None, read_only: Optional[pulumi.Input[bool]] = None, @@ -2123,15 +2123,15 @@ def __init__(__self__, stdin_open: Optional[pulumi.Input[bool]] = None, stop_signal: Optional[pulumi.Input[str]] = None, stop_timeout: Optional[pulumi.Input[int]] = None, - storage_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - sysctls: Optional[pulumi.Input[Mapping[str, Any]]] = None, - tmpfs: Optional[pulumi.Input[Mapping[str, Any]]] = None, + storage_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + sysctls: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + tmpfs: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, tty: Optional[pulumi.Input[bool]] = None, - ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUlimitArgs']]]]] = None, - uploads: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUploadArgs']]]]] = None, + ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUlimitArgs', 'ContainerUlimitArgsDict']]]]] = None, + uploads: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUploadArgs', 'ContainerUploadArgsDict']]]]] = None, user: Optional[pulumi.Input[str]] = None, userns_mode: Optional[pulumi.Input[str]] = None, - volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerVolumeArgs']]]]] = None, + volumes: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerVolumeArgs', 'ContainerVolumeArgsDict']]]]] = None, wait: Optional[pulumi.Input[bool]] = None, wait_timeout: Optional[pulumi.Input[int]] = None, working_dir: Optional[pulumi.Input[str]] = None, @@ -2199,14 +2199,14 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[bool] attach: If `true` attach to the container after its creation and waits the end of its execution. Defaults to `false`. - :param pulumi.Input[pulumi.InputType['ContainerCapabilitiesArgs']] capabilities: Add or drop certrain linux capabilities. + :param pulumi.Input[Union['ContainerCapabilitiesArgs', 'ContainerCapabilitiesArgsDict']] capabilities: Add or drop certrain linux capabilities. :param pulumi.Input[str] cgroupns_mode: Cgroup namespace mode to use for the container. Possible values are: `private`, `host`. :param pulumi.Input[Sequence[pulumi.Input[str]]] command: The command to use to start the container. For example, to run `/usr/bin/myprogram -f baz.conf` set the command to be `["/usr/bin/myprogram","-f","baz.con"]`. :param pulumi.Input[int] container_read_refresh_timeout_milliseconds: The total number of milliseconds to wait for the container to reach status 'running' :param pulumi.Input[str] cpu_set: A comma-separated list or hyphen-separated range of CPUs a container can use, e.g. `0-1`. :param pulumi.Input[int] cpu_shares: CPU shares (relative weight) for the container. :param pulumi.Input[int] destroy_grace_seconds: If defined will attempt to stop the container before destroying. Container will be destroyed after `n` seconds or on successful stop. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerDeviceArgs']]]] devices: Bind devices to the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerDeviceArgs', 'ContainerDeviceArgsDict']]]] devices: Bind devices to the container. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns: DNS servers to use. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns_opts: DNS options used by the DNS provider(s), see `resolv.conf` documentation for valid list of options. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns_searches: DNS search domains that are used when bare unqualified hostnames are used inside of the container. @@ -2215,25 +2215,25 @@ def __init__(__self__, :param pulumi.Input[Sequence[pulumi.Input[str]]] envs: Environment variables to set in the form of `KEY=VALUE`, e.g. `DEBUG=0` :param pulumi.Input[str] gpus: GPU devices to add to the container. Currently, only the value `all` is supported. Passing any other value will result in unexpected behavior. :param pulumi.Input[Sequence[pulumi.Input[str]]] group_adds: Additional groups for the container user - :param pulumi.Input[pulumi.InputType['ContainerHealthcheckArgs']] healthcheck: A test to perform to check that the container is healthy + :param pulumi.Input[Union['ContainerHealthcheckArgs', 'ContainerHealthcheckArgsDict']] healthcheck: A test to perform to check that the container is healthy :param pulumi.Input[str] hostname: Hostname of the container. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerHostArgs']]]] hosts: Additional hosts to add to the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerHostArgs', 'ContainerHostArgsDict']]]] hosts: Additional hosts to add to the container. :param pulumi.Input[str] image: The ID of the image to back this container. The easiest way to get this value is to use the `RemoteImage` resource as is shown in the example. :param pulumi.Input[bool] init: Configured whether an init process should be injected for this container. If unset this will default to the `dockerd` defaults. :param pulumi.Input[str] ipc_mode: IPC sharing mode for the container. Possible values are: `none`, `private`, `shareable`, `container:` or `host`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerLabelArgs', 'ContainerLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] log_driver: The logging driver to use for the container. - :param pulumi.Input[Mapping[str, Any]] log_opts: Key/value pairs to use as options for the logging driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] log_opts: Key/value pairs to use as options for the logging driver. :param pulumi.Input[bool] logs: Save the container logs (`attach` must be enabled). Defaults to `false`. :param pulumi.Input[int] max_retry_count: The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. :param pulumi.Input[int] memory: The memory limit for the container in MBs. :param pulumi.Input[int] memory_swap: The total memory limit (memory + swap) for the container in MBs. This setting may compute to `-1` after `pulumi up` if the target host doesn't support memory swap, when that is the case docker will use a soft limitation. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerMountArgs']]]] mounts: Specification for mounts to be added to containers created as part of the service. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerMountArgs', 'ContainerMountArgsDict']]]] mounts: Specification for mounts to be added to containers created as part of the service. :param pulumi.Input[str] name: The name of the container. :param pulumi.Input[str] network_mode: Network mode of the container. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworksAdvancedArgs']]]] networks_advanced: The networks the container is attached to + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworksAdvancedArgs', 'ContainerNetworksAdvancedArgsDict']]]] networks_advanced: The networks the container is attached to :param pulumi.Input[str] pid_mode: he PID (Process) Namespace mode for the container. Either `container:` or `host`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerPortArgs']]]] ports: Publish a container's port(s) to the host. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerPortArgs', 'ContainerPortArgsDict']]]] ports: Publish a container's port(s) to the host. :param pulumi.Input[bool] privileged: If `true`, the container runs in privileged mode. :param pulumi.Input[bool] publish_all_ports: Publish all ports of the container. :param pulumi.Input[bool] read_only: If `true`, the container will be started as readonly. Defaults to `false`. @@ -2247,15 +2247,15 @@ def __init__(__self__, :param pulumi.Input[bool] stdin_open: If `true`, keep STDIN open even if not attached (`docker run -i`). Defaults to `false`. :param pulumi.Input[str] stop_signal: Signal to stop a container (default `SIGTERM`). :param pulumi.Input[int] stop_timeout: Timeout (in seconds) to stop a container. - :param pulumi.Input[Mapping[str, Any]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` - :param pulumi.Input[Mapping[str, Any]] sysctls: A map of kernel parameters (sysctls) to set in the container. - :param pulumi.Input[Mapping[str, Any]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] sysctls: A map of kernel parameters (sysctls) to set in the container. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. :param pulumi.Input[bool] tty: If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUlimitArgs']]]] ulimits: Ulimit options to add. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUploadArgs']]]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerUlimitArgs', 'ContainerUlimitArgsDict']]]] ulimits: Ulimit options to add. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerUploadArgs', 'ContainerUploadArgsDict']]]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. :param pulumi.Input[str] user: User used for run the first process. Format is `user` or `user:group` which user and group can be passed literraly or by name. :param pulumi.Input[str] userns_mode: Sets the usernamespace mode for the container when usernamespace remapping option is enabled. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerVolumeArgs']]]] volumes: Spec for mounting volumes in the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerVolumeArgs', 'ContainerVolumeArgsDict']]]] volumes: Spec for mounting volumes in the container. :param pulumi.Input[bool] wait: If `true`, then the Docker container is waited for being healthy state after creation. If `false`, then the container health state is not checked. Defaults to `false`. :param pulumi.Input[int] wait_timeout: The timeout in seconds to wait the container to be healthy after creation. Defaults to `60`. :param pulumi.Input[str] working_dir: The working directory for commands to run in. @@ -2342,14 +2342,14 @@ def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, attach: Optional[pulumi.Input[bool]] = None, - capabilities: Optional[pulumi.Input[pulumi.InputType['ContainerCapabilitiesArgs']]] = None, + capabilities: Optional[pulumi.Input[Union['ContainerCapabilitiesArgs', 'ContainerCapabilitiesArgsDict']]] = None, cgroupns_mode: Optional[pulumi.Input[str]] = None, command: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, container_read_refresh_timeout_milliseconds: Optional[pulumi.Input[int]] = None, cpu_set: Optional[pulumi.Input[str]] = None, cpu_shares: Optional[pulumi.Input[int]] = None, destroy_grace_seconds: Optional[pulumi.Input[int]] = None, - devices: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerDeviceArgs']]]]] = None, + devices: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerDeviceArgs', 'ContainerDeviceArgsDict']]]]] = None, dns: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_opts: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_searches: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, @@ -2358,26 +2358,26 @@ def _internal_init(__self__, envs: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, gpus: Optional[pulumi.Input[str]] = None, group_adds: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - healthcheck: Optional[pulumi.Input[pulumi.InputType['ContainerHealthcheckArgs']]] = None, + healthcheck: Optional[pulumi.Input[Union['ContainerHealthcheckArgs', 'ContainerHealthcheckArgsDict']]] = None, hostname: Optional[pulumi.Input[str]] = None, - hosts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerHostArgs']]]]] = None, + hosts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerHostArgs', 'ContainerHostArgsDict']]]]] = None, image: Optional[pulumi.Input[str]] = None, init: Optional[pulumi.Input[bool]] = None, ipc_mode: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerLabelArgs', 'ContainerLabelArgsDict']]]]] = None, log_driver: Optional[pulumi.Input[str]] = None, - log_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + log_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, logs: Optional[pulumi.Input[bool]] = None, max_retry_count: Optional[pulumi.Input[int]] = None, memory: Optional[pulumi.Input[int]] = None, memory_swap: Optional[pulumi.Input[int]] = None, - mounts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerMountArgs']]]]] = None, + mounts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerMountArgs', 'ContainerMountArgsDict']]]]] = None, must_run: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, network_mode: Optional[pulumi.Input[str]] = None, - networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworksAdvancedArgs']]]]] = None, + networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworksAdvancedArgs', 'ContainerNetworksAdvancedArgsDict']]]]] = None, pid_mode: Optional[pulumi.Input[str]] = None, - ports: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerPortArgs']]]]] = None, + ports: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerPortArgs', 'ContainerPortArgsDict']]]]] = None, privileged: Optional[pulumi.Input[bool]] = None, publish_all_ports: Optional[pulumi.Input[bool]] = None, read_only: Optional[pulumi.Input[bool]] = None, @@ -2391,15 +2391,15 @@ def _internal_init(__self__, stdin_open: Optional[pulumi.Input[bool]] = None, stop_signal: Optional[pulumi.Input[str]] = None, stop_timeout: Optional[pulumi.Input[int]] = None, - storage_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - sysctls: Optional[pulumi.Input[Mapping[str, Any]]] = None, - tmpfs: Optional[pulumi.Input[Mapping[str, Any]]] = None, + storage_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + sysctls: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + tmpfs: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, tty: Optional[pulumi.Input[bool]] = None, - ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUlimitArgs']]]]] = None, - uploads: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUploadArgs']]]]] = None, + ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUlimitArgs', 'ContainerUlimitArgsDict']]]]] = None, + uploads: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUploadArgs', 'ContainerUploadArgsDict']]]]] = None, user: Optional[pulumi.Input[str]] = None, userns_mode: Optional[pulumi.Input[str]] = None, - volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerVolumeArgs']]]]] = None, + volumes: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerVolumeArgs', 'ContainerVolumeArgsDict']]]]] = None, wait: Optional[pulumi.Input[bool]] = None, wait_timeout: Optional[pulumi.Input[int]] = None, working_dir: Optional[pulumi.Input[str]] = None, @@ -2492,7 +2492,7 @@ def get(resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, attach: Optional[pulumi.Input[bool]] = None, bridge: Optional[pulumi.Input[str]] = None, - capabilities: Optional[pulumi.Input[pulumi.InputType['ContainerCapabilitiesArgs']]] = None, + capabilities: Optional[pulumi.Input[Union['ContainerCapabilitiesArgs', 'ContainerCapabilitiesArgsDict']]] = None, cgroupns_mode: Optional[pulumi.Input[str]] = None, command: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, container_logs: Optional[pulumi.Input[str]] = None, @@ -2500,7 +2500,7 @@ def get(resource_name: str, cpu_set: Optional[pulumi.Input[str]] = None, cpu_shares: Optional[pulumi.Input[int]] = None, destroy_grace_seconds: Optional[pulumi.Input[int]] = None, - devices: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerDeviceArgs']]]]] = None, + devices: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerDeviceArgs', 'ContainerDeviceArgsDict']]]]] = None, dns: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_opts: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, dns_searches: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, @@ -2510,27 +2510,27 @@ def get(resource_name: str, exit_code: Optional[pulumi.Input[int]] = None, gpus: Optional[pulumi.Input[str]] = None, group_adds: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - healthcheck: Optional[pulumi.Input[pulumi.InputType['ContainerHealthcheckArgs']]] = None, + healthcheck: Optional[pulumi.Input[Union['ContainerHealthcheckArgs', 'ContainerHealthcheckArgsDict']]] = None, hostname: Optional[pulumi.Input[str]] = None, - hosts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerHostArgs']]]]] = None, + hosts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerHostArgs', 'ContainerHostArgsDict']]]]] = None, image: Optional[pulumi.Input[str]] = None, init: Optional[pulumi.Input[bool]] = None, ipc_mode: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerLabelArgs', 'ContainerLabelArgsDict']]]]] = None, log_driver: Optional[pulumi.Input[str]] = None, - log_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + log_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, logs: Optional[pulumi.Input[bool]] = None, max_retry_count: Optional[pulumi.Input[int]] = None, memory: Optional[pulumi.Input[int]] = None, memory_swap: Optional[pulumi.Input[int]] = None, - mounts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerMountArgs']]]]] = None, + mounts: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerMountArgs', 'ContainerMountArgsDict']]]]] = None, must_run: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, - network_datas: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworkDataArgs']]]]] = None, + network_datas: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworkDataArgs', 'ContainerNetworkDataArgsDict']]]]] = None, network_mode: Optional[pulumi.Input[str]] = None, - networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworksAdvancedArgs']]]]] = None, + networks_advanced: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworksAdvancedArgs', 'ContainerNetworksAdvancedArgsDict']]]]] = None, pid_mode: Optional[pulumi.Input[str]] = None, - ports: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerPortArgs']]]]] = None, + ports: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerPortArgs', 'ContainerPortArgsDict']]]]] = None, privileged: Optional[pulumi.Input[bool]] = None, publish_all_ports: Optional[pulumi.Input[bool]] = None, read_only: Optional[pulumi.Input[bool]] = None, @@ -2544,15 +2544,15 @@ def get(resource_name: str, stdin_open: Optional[pulumi.Input[bool]] = None, stop_signal: Optional[pulumi.Input[str]] = None, stop_timeout: Optional[pulumi.Input[int]] = None, - storage_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - sysctls: Optional[pulumi.Input[Mapping[str, Any]]] = None, - tmpfs: Optional[pulumi.Input[Mapping[str, Any]]] = None, + storage_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + sysctls: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + tmpfs: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, tty: Optional[pulumi.Input[bool]] = None, - ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUlimitArgs']]]]] = None, - uploads: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUploadArgs']]]]] = None, + ulimits: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUlimitArgs', 'ContainerUlimitArgsDict']]]]] = None, + uploads: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerUploadArgs', 'ContainerUploadArgsDict']]]]] = None, user: Optional[pulumi.Input[str]] = None, userns_mode: Optional[pulumi.Input[str]] = None, - volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerVolumeArgs']]]]] = None, + volumes: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ContainerVolumeArgs', 'ContainerVolumeArgsDict']]]]] = None, wait: Optional[pulumi.Input[bool]] = None, wait_timeout: Optional[pulumi.Input[int]] = None, working_dir: Optional[pulumi.Input[str]] = None) -> 'Container': @@ -2565,7 +2565,7 @@ def get(resource_name: str, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[bool] attach: If `true` attach to the container after its creation and waits the end of its execution. Defaults to `false`. :param pulumi.Input[str] bridge: The network bridge of the container as read from its NetworkSettings. - :param pulumi.Input[pulumi.InputType['ContainerCapabilitiesArgs']] capabilities: Add or drop certrain linux capabilities. + :param pulumi.Input[Union['ContainerCapabilitiesArgs', 'ContainerCapabilitiesArgsDict']] capabilities: Add or drop certrain linux capabilities. :param pulumi.Input[str] cgroupns_mode: Cgroup namespace mode to use for the container. Possible values are: `private`, `host`. :param pulumi.Input[Sequence[pulumi.Input[str]]] command: The command to use to start the container. For example, to run `/usr/bin/myprogram -f baz.conf` set the command to be `["/usr/bin/myprogram","-f","baz.con"]`. :param pulumi.Input[str] container_logs: The logs of the container if its execution is done (`attach` must be disabled). @@ -2573,7 +2573,7 @@ def get(resource_name: str, :param pulumi.Input[str] cpu_set: A comma-separated list or hyphen-separated range of CPUs a container can use, e.g. `0-1`. :param pulumi.Input[int] cpu_shares: CPU shares (relative weight) for the container. :param pulumi.Input[int] destroy_grace_seconds: If defined will attempt to stop the container before destroying. Container will be destroyed after `n` seconds or on successful stop. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerDeviceArgs']]]] devices: Bind devices to the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerDeviceArgs', 'ContainerDeviceArgsDict']]]] devices: Bind devices to the container. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns: DNS servers to use. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns_opts: DNS options used by the DNS provider(s), see `resolv.conf` documentation for valid list of options. :param pulumi.Input[Sequence[pulumi.Input[str]]] dns_searches: DNS search domains that are used when bare unqualified hostnames are used inside of the container. @@ -2583,26 +2583,26 @@ def get(resource_name: str, :param pulumi.Input[int] exit_code: The exit code of the container if its execution is done (`must_run` must be disabled). :param pulumi.Input[str] gpus: GPU devices to add to the container. Currently, only the value `all` is supported. Passing any other value will result in unexpected behavior. :param pulumi.Input[Sequence[pulumi.Input[str]]] group_adds: Additional groups for the container user - :param pulumi.Input[pulumi.InputType['ContainerHealthcheckArgs']] healthcheck: A test to perform to check that the container is healthy + :param pulumi.Input[Union['ContainerHealthcheckArgs', 'ContainerHealthcheckArgsDict']] healthcheck: A test to perform to check that the container is healthy :param pulumi.Input[str] hostname: Hostname of the container. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerHostArgs']]]] hosts: Additional hosts to add to the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerHostArgs', 'ContainerHostArgsDict']]]] hosts: Additional hosts to add to the container. :param pulumi.Input[str] image: The ID of the image to back this container. The easiest way to get this value is to use the `RemoteImage` resource as is shown in the example. :param pulumi.Input[bool] init: Configured whether an init process should be injected for this container. If unset this will default to the `dockerd` defaults. :param pulumi.Input[str] ipc_mode: IPC sharing mode for the container. Possible values are: `none`, `private`, `shareable`, `container:` or `host`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerLabelArgs', 'ContainerLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] log_driver: The logging driver to use for the container. - :param pulumi.Input[Mapping[str, Any]] log_opts: Key/value pairs to use as options for the logging driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] log_opts: Key/value pairs to use as options for the logging driver. :param pulumi.Input[bool] logs: Save the container logs (`attach` must be enabled). Defaults to `false`. :param pulumi.Input[int] max_retry_count: The maximum amount of times to an attempt a restart when `restart` is set to 'on-failure'. :param pulumi.Input[int] memory: The memory limit for the container in MBs. :param pulumi.Input[int] memory_swap: The total memory limit (memory + swap) for the container in MBs. This setting may compute to `-1` after `pulumi up` if the target host doesn't support memory swap, when that is the case docker will use a soft limitation. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerMountArgs']]]] mounts: Specification for mounts to be added to containers created as part of the service. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerMountArgs', 'ContainerMountArgsDict']]]] mounts: Specification for mounts to be added to containers created as part of the service. :param pulumi.Input[str] name: The name of the container. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworkDataArgs']]]] network_datas: The data of the networks the container is connected to. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworkDataArgs', 'ContainerNetworkDataArgsDict']]]] network_datas: The data of the networks the container is connected to. :param pulumi.Input[str] network_mode: Network mode of the container. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerNetworksAdvancedArgs']]]] networks_advanced: The networks the container is attached to + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerNetworksAdvancedArgs', 'ContainerNetworksAdvancedArgsDict']]]] networks_advanced: The networks the container is attached to :param pulumi.Input[str] pid_mode: he PID (Process) Namespace mode for the container. Either `container:` or `host`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerPortArgs']]]] ports: Publish a container's port(s) to the host. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerPortArgs', 'ContainerPortArgsDict']]]] ports: Publish a container's port(s) to the host. :param pulumi.Input[bool] privileged: If `true`, the container runs in privileged mode. :param pulumi.Input[bool] publish_all_ports: Publish all ports of the container. :param pulumi.Input[bool] read_only: If `true`, the container will be started as readonly. Defaults to `false`. @@ -2616,15 +2616,15 @@ def get(resource_name: str, :param pulumi.Input[bool] stdin_open: If `true`, keep STDIN open even if not attached (`docker run -i`). Defaults to `false`. :param pulumi.Input[str] stop_signal: Signal to stop a container (default `SIGTERM`). :param pulumi.Input[int] stop_timeout: Timeout (in seconds) to stop a container. - :param pulumi.Input[Mapping[str, Any]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` - :param pulumi.Input[Mapping[str, Any]] sysctls: A map of kernel parameters (sysctls) to set in the container. - :param pulumi.Input[Mapping[str, Any]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] storage_opts: Key/value pairs for the storage driver options, e.g. `size`: `120G` + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] sysctls: A map of kernel parameters (sysctls) to set in the container. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tmpfs: A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. :param pulumi.Input[bool] tty: If `true`, allocate a pseudo-tty (`docker run -t`). Defaults to `false`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUlimitArgs']]]] ulimits: Ulimit options to add. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerUploadArgs']]]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerUlimitArgs', 'ContainerUlimitArgsDict']]]] ulimits: Ulimit options to add. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerUploadArgs', 'ContainerUploadArgsDict']]]] uploads: Specifies files to upload to the container before starting it. Only one of `content` or `content_base64` can be set and at least one of them has to be set. :param pulumi.Input[str] user: User used for run the first process. Format is `user` or `user:group` which user and group can be passed literraly or by name. :param pulumi.Input[str] userns_mode: Sets the usernamespace mode for the container when usernamespace remapping option is enabled. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ContainerVolumeArgs']]]] volumes: Spec for mounting volumes in the container. + :param pulumi.Input[Sequence[pulumi.Input[Union['ContainerVolumeArgs', 'ContainerVolumeArgsDict']]]] volumes: Spec for mounting volumes in the container. :param pulumi.Input[bool] wait: If `true`, then the Docker container is waited for being healthy state after creation. If `false`, then the container health state is not checked. Defaults to `false`. :param pulumi.Input[int] wait_timeout: The timeout in seconds to wait the container to be healthy after creation. Defaults to `60`. :param pulumi.Input[str] working_dir: The working directory for commands to run in. @@ -2927,7 +2927,7 @@ def log_driver(self) -> pulumi.Output[str]: @property @pulumi.getter(name="logOpts") - def log_opts(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def log_opts(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ Key/value pairs to use as options for the logging driver. """ @@ -3132,7 +3132,7 @@ def stop_timeout(self) -> pulumi.Output[int]: @property @pulumi.getter(name="storageOpts") - def storage_opts(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def storage_opts(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ Key/value pairs for the storage driver options, e.g. `size`: `120G` """ @@ -3140,7 +3140,7 @@ def storage_opts(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: @property @pulumi.getter - def sysctls(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def sysctls(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ A map of kernel parameters (sysctls) to set in the container. """ @@ -3148,7 +3148,7 @@ def sysctls(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: @property @pulumi.getter - def tmpfs(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def tmpfs(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ A map of container directories which should be replaced by `tmpfs mounts`, and their corresponding mount options. """ diff --git a/sdk/python/pulumi_docker/get_network.py b/sdk/python/pulumi_docker/get_network.py index 4b7c84b0..11d3af96 100644 --- a/sdk/python/pulumi_docker/get_network.py +++ b/sdk/python/pulumi_docker/get_network.py @@ -87,7 +87,7 @@ def name(self) -> str: @property @pulumi.getter - def options(self) -> Mapping[str, Any]: + def options(self) -> Mapping[str, str]: """ Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ diff --git a/sdk/python/pulumi_docker/get_plugin.py b/sdk/python/pulumi_docker/get_plugin.py index 92afefe5..8837b2d8 100644 --- a/sdk/python/pulumi_docker/get_plugin.py +++ b/sdk/python/pulumi_docker/get_plugin.py @@ -124,15 +124,15 @@ def get_plugin(alias: Optional[str] = None, ## Example Usage - ### With alias - data "Plugin" "by_alias" { - alias = "sample-volume-plugin:latest" - } + ```python + import pulumi + import pulumi_docker as docker + ### With alias + by_alias = docker.get_plugin(alias="sample-volume-plugin:latest") ### With ID - data "Plugin" "by_id" { - id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - } + by_id = docker.get_plugin(id="e9a9db917b3bfd6706b5d3a66d4bceb9f") + ``` :param str alias: The alias of the Docker plugin. If the tag is omitted, `:latest` is complemented to the attribute value. @@ -163,15 +163,15 @@ def get_plugin_output(alias: Optional[pulumi.Input[Optional[str]]] = None, ## Example Usage - ### With alias - data "Plugin" "by_alias" { - alias = "sample-volume-plugin:latest" - } + ```python + import pulumi + import pulumi_docker as docker + ### With alias + by_alias = docker.get_plugin(alias="sample-volume-plugin:latest") ### With ID - data "Plugin" "by_id" { - id = "e9a9db917b3bfd6706b5d3a66d4bceb9f" - } + by_id = docker.get_plugin(id="e9a9db917b3bfd6706b5d3a66d4bceb9f") + ``` :param str alias: The alias of the Docker plugin. If the tag is omitted, `:latest` is complemented to the attribute value. diff --git a/sdk/python/pulumi_docker/image.py b/sdk/python/pulumi_docker/image.py index c7c7e800..c09f6394 100644 --- a/sdk/python/pulumi_docker/image.py +++ b/sdk/python/pulumi_docker/image.py @@ -111,10 +111,10 @@ class Image(pulumi.CustomResource): def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - build: Optional[pulumi.Input[pulumi.InputType['DockerBuildArgs']]] = None, + build: Optional[pulumi.Input[Union['DockerBuildArgs', 'DockerBuildArgsDict']]] = None, build_on_preview: Optional[pulumi.Input[bool]] = None, image_name: Optional[pulumi.Input[str]] = None, - registry: Optional[pulumi.Input[pulumi.InputType['RegistryArgs']]] = None, + registry: Optional[pulumi.Input[Union['RegistryArgs', 'RegistryArgsDict']]] = None, skip_push: Optional[pulumi.Input[bool]] = None, __props__=None): """ @@ -155,11 +155,11 @@ def __init__(__self__, import pulumi_docker as docker demo_image = docker.Image("demo-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - platform="linux/amd64", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + "platform": "linux/amd64", + }, image_name="username/image:tag1", skip_push=True) pulumi.export("imageName", demo_image.image_name) @@ -170,10 +170,10 @@ def __init__(__self__, import pulumi_docker as docker demo_push_image = docker.Image("demo-push-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + }, image_name="docker.io/username/push-image:tag1") pulumi.export("imageName", demo_push_image.image_name) pulumi.export("repoDigest", demo_push_image.repo_digest) @@ -187,32 +187,32 @@ def __init__(__self__, ecr_repository = aws.ecr.Repository("ecr-repository", name="docker-repository") auth_token = aws.ecr.get_authorization_token_output(registry_id=ecr_repository.registry_id) my_app_image = docker.Image("my-app-image", - build=docker.DockerBuildArgs( - args={ - "BUILDKIT_INLINE_CACHE": "1", + build={ + "args": { + "buildki_t__inlin_e__cache": "1", }, - cache_from=docker.CacheFromArgs( - images=[ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], - ), - context="app/", - dockerfile="app/Dockerfile", - ), + "cache_from": { + "images": [ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], + }, + "context": "app/", + "dockerfile": "app/Dockerfile", + }, image_name=ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest"), - registry=docker.RegistryArgs( - password=pulumi.Output.secret(auth_token.password), - server=ecr_repository.repository_url, - username=auth_token.user_name, - )) + registry={ + "password": pulumi.Output.secret(auth_token.password), + "server": ecr_repository.repository_url, + "username": auth_token.user_name, + }) pulumi.export("imageName", my_app_image.image_name) ``` :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[pulumi.InputType['DockerBuildArgs']] build: The Docker build context + :param pulumi.Input[Union['DockerBuildArgs', 'DockerBuildArgsDict']] build: The Docker build context :param pulumi.Input[bool] build_on_preview: A flag to build an image on preview :param pulumi.Input[str] image_name: The image name, of the format repository[:tag], e.g. `docker.io/username/demo-image:v1`. This reference is not unique to each build and push.For the unique manifest SHA of a pushed docker image, or the local image ID, please use `repoDigest`. - :param pulumi.Input[pulumi.InputType['RegistryArgs']] registry: The registry to push the image to + :param pulumi.Input[Union['RegistryArgs', 'RegistryArgsDict']] registry: The registry to push the image to :param pulumi.Input[bool] skip_push: A flag to skip a registry push. """ ... @@ -259,11 +259,11 @@ def __init__(__self__, import pulumi_docker as docker demo_image = docker.Image("demo-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - platform="linux/amd64", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + "platform": "linux/amd64", + }, image_name="username/image:tag1", skip_push=True) pulumi.export("imageName", demo_image.image_name) @@ -274,10 +274,10 @@ def __init__(__self__, import pulumi_docker as docker demo_push_image = docker.Image("demo-push-image", - build=docker.DockerBuildArgs( - context=".", - dockerfile="Dockerfile", - ), + build={ + "context": ".", + "dockerfile": "Dockerfile", + }, image_name="docker.io/username/push-image:tag1") pulumi.export("imageName", demo_push_image.image_name) pulumi.export("repoDigest", demo_push_image.repo_digest) @@ -291,22 +291,22 @@ def __init__(__self__, ecr_repository = aws.ecr.Repository("ecr-repository", name="docker-repository") auth_token = aws.ecr.get_authorization_token_output(registry_id=ecr_repository.registry_id) my_app_image = docker.Image("my-app-image", - build=docker.DockerBuildArgs( - args={ - "BUILDKIT_INLINE_CACHE": "1", + build={ + "args": { + "buildki_t__inlin_e__cache": "1", + }, + "cache_from": { + "images": [ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], }, - cache_from=docker.CacheFromArgs( - images=[ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest")], - ), - context="app/", - dockerfile="app/Dockerfile", - ), + "context": "app/", + "dockerfile": "app/Dockerfile", + }, image_name=ecr_repository.repository_url.apply(lambda repository_url: f"{repository_url}:latest"), - registry=docker.RegistryArgs( - password=pulumi.Output.secret(auth_token.password), - server=ecr_repository.repository_url, - username=auth_token.user_name, - )) + registry={ + "password": pulumi.Output.secret(auth_token.password), + "server": ecr_repository.repository_url, + "username": auth_token.user_name, + }) pulumi.export("imageName", my_app_image.image_name) ``` @@ -325,10 +325,10 @@ def __init__(__self__, resource_name: str, *args, **kwargs): def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - build: Optional[pulumi.Input[pulumi.InputType['DockerBuildArgs']]] = None, + build: Optional[pulumi.Input[Union['DockerBuildArgs', 'DockerBuildArgsDict']]] = None, build_on_preview: Optional[pulumi.Input[bool]] = None, image_name: Optional[pulumi.Input[str]] = None, - registry: Optional[pulumi.Input[pulumi.InputType['RegistryArgs']]] = None, + registry: Optional[pulumi.Input[Union['RegistryArgs', 'RegistryArgsDict']]] = None, skip_push: Optional[pulumi.Input[bool]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) diff --git a/sdk/python/pulumi_docker/network.py b/sdk/python/pulumi_docker/network.py index cb718401..c3d60c66 100644 --- a/sdk/python/pulumi_docker/network.py +++ b/sdk/python/pulumi_docker/network.py @@ -23,11 +23,11 @@ def __init__(__self__, *, internal: Optional[pulumi.Input[bool]] = None, ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input['NetworkIpamConfigArgs']]]] = None, ipam_driver: Optional[pulumi.Input[str]] = None, - ipam_options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + ipam_options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, ipv6: Optional[pulumi.Input[bool]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['NetworkLabelArgs']]]] = None, name: Optional[pulumi.Input[str]] = None, - options: Optional[pulumi.Input[Mapping[str, Any]]] = None): + options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None): """ The set of arguments for constructing a Network resource. :param pulumi.Input[bool] attachable: Enable manual container attachment to the network. @@ -37,11 +37,11 @@ def __init__(__self__, *, :param pulumi.Input[bool] internal: Whether the network is internal. :param pulumi.Input[Sequence[pulumi.Input['NetworkIpamConfigArgs']]] ipam_configs: The IPAM configuration options :param pulumi.Input[str] ipam_driver: Driver used by the custom IP scheme of the network. Defaults to `default` - :param pulumi.Input[Mapping[str, Any]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. :param pulumi.Input[bool] ipv6: Enable IPv6 networking. Defaults to `false`. :param pulumi.Input[Sequence[pulumi.Input['NetworkLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker network. - :param pulumi.Input[Mapping[str, Any]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ if attachable is not None: pulumi.set(__self__, "attachable", attachable) @@ -154,14 +154,14 @@ def ipam_driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="ipamOptions") - def ipam_options(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def ipam_options(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. """ return pulumi.get(self, "ipam_options") @ipam_options.setter - def ipam_options(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def ipam_options(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "ipam_options", value) @property @@ -202,14 +202,14 @@ def name(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def options(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def options(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ return pulumi.get(self, "options") @options.setter - def options(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def options(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "options", value) @@ -223,11 +223,11 @@ def __init__(__self__, *, internal: Optional[pulumi.Input[bool]] = None, ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input['NetworkIpamConfigArgs']]]] = None, ipam_driver: Optional[pulumi.Input[str]] = None, - ipam_options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + ipam_options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, ipv6: Optional[pulumi.Input[bool]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['NetworkLabelArgs']]]] = None, name: Optional[pulumi.Input[str]] = None, - options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, scope: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering Network resources. @@ -238,11 +238,11 @@ def __init__(__self__, *, :param pulumi.Input[bool] internal: Whether the network is internal. :param pulumi.Input[Sequence[pulumi.Input['NetworkIpamConfigArgs']]] ipam_configs: The IPAM configuration options :param pulumi.Input[str] ipam_driver: Driver used by the custom IP scheme of the network. Defaults to `default` - :param pulumi.Input[Mapping[str, Any]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. :param pulumi.Input[bool] ipv6: Enable IPv6 networking. Defaults to `false`. :param pulumi.Input[Sequence[pulumi.Input['NetworkLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker network. - :param pulumi.Input[Mapping[str, Any]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. :param pulumi.Input[str] scope: Scope of the network. One of `swarm`, `global`, or `local`. """ if attachable is not None: @@ -358,14 +358,14 @@ def ipam_driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="ipamOptions") - def ipam_options(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def ipam_options(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. """ return pulumi.get(self, "ipam_options") @ipam_options.setter - def ipam_options(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def ipam_options(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "ipam_options", value) @property @@ -406,14 +406,14 @@ def name(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def options(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def options(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ return pulumi.get(self, "options") @options.setter - def options(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def options(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "options", value) @property @@ -439,13 +439,13 @@ def __init__(__self__, driver: Optional[pulumi.Input[str]] = None, ingress: Optional[pulumi.Input[bool]] = None, internal: Optional[pulumi.Input[bool]] = None, - ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkIpamConfigArgs']]]]] = None, + ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkIpamConfigArgs', 'NetworkIpamConfigArgsDict']]]]] = None, ipam_driver: Optional[pulumi.Input[str]] = None, - ipam_options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + ipam_options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, ipv6: Optional[pulumi.Input[bool]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkLabelArgs', 'NetworkLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, - options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): """ @@ -499,13 +499,13 @@ def __init__(__self__, :param pulumi.Input[str] driver: The driver of the Docker network. Possible values are `bridge`, `host`, `overlay`, `macvlan`. See [network docs](https://docs.docker.com/network/#network-drivers) for more details. :param pulumi.Input[bool] ingress: Create swarm routing-mesh network. Defaults to `false`. :param pulumi.Input[bool] internal: Whether the network is internal. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkIpamConfigArgs']]]] ipam_configs: The IPAM configuration options + :param pulumi.Input[Sequence[pulumi.Input[Union['NetworkIpamConfigArgs', 'NetworkIpamConfigArgsDict']]]] ipam_configs: The IPAM configuration options :param pulumi.Input[str] ipam_driver: Driver used by the custom IP scheme of the network. Defaults to `default` - :param pulumi.Input[Mapping[str, Any]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. :param pulumi.Input[bool] ipv6: Enable IPv6 networking. Defaults to `false`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['NetworkLabelArgs', 'NetworkLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker network. - :param pulumi.Input[Mapping[str, Any]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ ... @overload @@ -578,13 +578,13 @@ def _internal_init(__self__, driver: Optional[pulumi.Input[str]] = None, ingress: Optional[pulumi.Input[bool]] = None, internal: Optional[pulumi.Input[bool]] = None, - ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkIpamConfigArgs']]]]] = None, + ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkIpamConfigArgs', 'NetworkIpamConfigArgsDict']]]]] = None, ipam_driver: Optional[pulumi.Input[str]] = None, - ipam_options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + ipam_options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, ipv6: Optional[pulumi.Input[bool]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkLabelArgs', 'NetworkLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, - options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) if not isinstance(opts, pulumi.ResourceOptions): @@ -622,13 +622,13 @@ def get(resource_name: str, driver: Optional[pulumi.Input[str]] = None, ingress: Optional[pulumi.Input[bool]] = None, internal: Optional[pulumi.Input[bool]] = None, - ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkIpamConfigArgs']]]]] = None, + ipam_configs: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkIpamConfigArgs', 'NetworkIpamConfigArgsDict']]]]] = None, ipam_driver: Optional[pulumi.Input[str]] = None, - ipam_options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + ipam_options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, ipv6: Optional[pulumi.Input[bool]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['NetworkLabelArgs', 'NetworkLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, - options: Optional[pulumi.Input[Mapping[str, Any]]] = None, + options: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, scope: Optional[pulumi.Input[str]] = None) -> 'Network': """ Get an existing Network resource's state with the given name, id, and optional extra @@ -642,13 +642,13 @@ def get(resource_name: str, :param pulumi.Input[str] driver: The driver of the Docker network. Possible values are `bridge`, `host`, `overlay`, `macvlan`. See [network docs](https://docs.docker.com/network/#network-drivers) for more details. :param pulumi.Input[bool] ingress: Create swarm routing-mesh network. Defaults to `false`. :param pulumi.Input[bool] internal: Whether the network is internal. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkIpamConfigArgs']]]] ipam_configs: The IPAM configuration options + :param pulumi.Input[Sequence[pulumi.Input[Union['NetworkIpamConfigArgs', 'NetworkIpamConfigArgsDict']]]] ipam_configs: The IPAM configuration options :param pulumi.Input[str] ipam_driver: Driver used by the custom IP scheme of the network. Defaults to `default` - :param pulumi.Input[Mapping[str, Any]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] ipam_options: Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. :param pulumi.Input[bool] ipv6: Enable IPv6 networking. Defaults to `false`. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['NetworkLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['NetworkLabelArgs', 'NetworkLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker network. - :param pulumi.Input[Mapping[str, Any]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] options: Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. :param pulumi.Input[str] scope: Scope of the network. One of `swarm`, `global`, or `local`. """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -728,7 +728,7 @@ def ipam_driver(self) -> pulumi.Output[Optional[str]]: @property @pulumi.getter(name="ipamOptions") - def ipam_options(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def ipam_options(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ Provide explicit options to the IPAM driver. Valid options vary with `ipam_driver` and refer to that driver's documentation for more details. """ @@ -760,7 +760,7 @@ def name(self) -> pulumi.Output[str]: @property @pulumi.getter - def options(self) -> pulumi.Output[Mapping[str, Any]]: + def options(self) -> pulumi.Output[Mapping[str, str]]: """ Only available with bridge networks. See [bridge options docs](https://docs.docker.com/engine/reference/commandline/network_create/#bridge-driver-options) for more details. """ diff --git a/sdk/python/pulumi_docker/outputs.py b/sdk/python/pulumi_docker/outputs.py index 0c14cc1b..7a7a6017 100644 --- a/sdk/python/pulumi_docker/outputs.py +++ b/sdk/python/pulumi_docker/outputs.py @@ -1100,12 +1100,12 @@ def get(self, key: str, default = None) -> Any: return super().get(key, default) def __init__(__self__, *, - aux_address: Optional[Mapping[str, Any]] = None, + aux_address: Optional[Mapping[str, str]] = None, gateway: Optional[str] = None, ip_range: Optional[str] = None, subnet: Optional[str] = None): """ - :param Mapping[str, Any] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver + :param Mapping[str, str] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver :param str gateway: The IP address of the gateway :param str ip_range: The ip range in CIDR form :param str subnet: The subnet in CIDR form @@ -1121,7 +1121,7 @@ def __init__(__self__, *, @property @pulumi.getter(name="auxAddress") - def aux_address(self) -> Optional[Mapping[str, Any]]: + def aux_address(self) -> Optional[Mapping[str, str]]: """ Auxiliary IPv4 or IPv6 addresses used by Network driver """ @@ -2465,7 +2465,7 @@ def __init__(__self__, *, secrets: Optional[Sequence['outputs.ServiceTaskSpecContainerSpecSecret']] = None, stop_grace_period: Optional[str] = None, stop_signal: Optional[str] = None, - sysctl: Optional[Mapping[str, Any]] = None, + sysctl: Optional[Mapping[str, str]] = None, user: Optional[str] = None): """ :param str image: The image name to use for the containers of the service, like `nginx:1.17.6`. Also use the data-source or resource of `RemoteImage` with the `repo_digest` or `RegistryImage` with the `name` attribute for this, as shown in the examples. @@ -2487,7 +2487,7 @@ def __init__(__self__, *, :param Sequence['ServiceTaskSpecContainerSpecSecretArgs'] secrets: References to zero or more secrets that will be exposed to the service :param str stop_grace_period: Amount of time to wait for the container to terminate before forcefully removing it (ms|s|m|h). If not specified or '0s' the destroy will not check if all tasks/containers of the service terminate. :param str stop_signal: Signal to stop the container - :param Mapping[str, Any] sysctl: Sysctls config (Linux only) + :param Mapping[str, str] sysctl: Sysctls config (Linux only) :param str user: The user inside the container """ pulumi.set(__self__, "image", image) @@ -2686,7 +2686,7 @@ def stop_signal(self) -> Optional[str]: @property @pulumi.getter - def sysctl(self) -> Optional[Mapping[str, Any]]: + def sysctl(self) -> Optional[Mapping[str, str]]: """ Sysctls config (Linux only) """ @@ -4111,12 +4111,12 @@ def value(self) -> str: @pulumi.output_type class GetNetworkIpamConfigResult(dict): def __init__(__self__, *, - aux_address: Optional[Mapping[str, Any]] = None, + aux_address: Optional[Mapping[str, str]] = None, gateway: Optional[str] = None, ip_range: Optional[str] = None, subnet: Optional[str] = None): """ - :param Mapping[str, Any] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver + :param Mapping[str, str] aux_address: Auxiliary IPv4 or IPv6 addresses used by Network driver :param str gateway: The IP address of the gateway :param str ip_range: The ip range in CIDR form :param str subnet: The subnet in CIDR form @@ -4132,7 +4132,7 @@ def __init__(__self__, *, @property @pulumi.getter(name="auxAddress") - def aux_address(self) -> Optional[Mapping[str, Any]]: + def aux_address(self) -> Optional[Mapping[str, str]]: """ Auxiliary IPv4 or IPv6 addresses used by Network driver """ diff --git a/sdk/python/pulumi_docker/plugin.py b/sdk/python/pulumi_docker/plugin.py index 89802228..c6082295 100644 --- a/sdk/python/pulumi_docker/plugin.py +++ b/sdk/python/pulumi_docker/plugin.py @@ -345,7 +345,7 @@ def __init__(__self__, force_destroy: Optional[pulumi.Input[bool]] = None, force_disable: Optional[pulumi.Input[bool]] = None, grant_all_permissions: Optional[pulumi.Input[bool]] = None, - grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['PluginGrantPermissionArgs']]]]] = None, + grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['PluginGrantPermissionArgs', 'PluginGrantPermissionArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): """ @@ -369,7 +369,7 @@ def __init__(__self__, :param pulumi.Input[bool] force_destroy: If true, then the plugin is destroyed forcibly :param pulumi.Input[bool] force_disable: If true, then the plugin is disabled forcibly :param pulumi.Input[bool] grant_all_permissions: If true, grant all permissions necessary to run the plugin - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['PluginGrantPermissionArgs']]]] grant_permissions: Grant specific permissions only + :param pulumi.Input[Sequence[pulumi.Input[Union['PluginGrantPermissionArgs', 'PluginGrantPermissionArgsDict']]]] grant_permissions: Grant specific permissions only :param pulumi.Input[str] name: Docker Plugin name """ ... @@ -412,7 +412,7 @@ def _internal_init(__self__, force_destroy: Optional[pulumi.Input[bool]] = None, force_disable: Optional[pulumi.Input[bool]] = None, grant_all_permissions: Optional[pulumi.Input[bool]] = None, - grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['PluginGrantPermissionArgs']]]]] = None, + grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['PluginGrantPermissionArgs', 'PluginGrantPermissionArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) @@ -450,7 +450,7 @@ def get(resource_name: str, force_destroy: Optional[pulumi.Input[bool]] = None, force_disable: Optional[pulumi.Input[bool]] = None, grant_all_permissions: Optional[pulumi.Input[bool]] = None, - grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['PluginGrantPermissionArgs']]]]] = None, + grant_permissions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['PluginGrantPermissionArgs', 'PluginGrantPermissionArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, plugin_reference: Optional[pulumi.Input[str]] = None) -> 'Plugin': """ @@ -467,7 +467,7 @@ def get(resource_name: str, :param pulumi.Input[bool] force_destroy: If true, then the plugin is destroyed forcibly :param pulumi.Input[bool] force_disable: If true, then the plugin is disabled forcibly :param pulumi.Input[bool] grant_all_permissions: If true, grant all permissions necessary to run the plugin - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['PluginGrantPermissionArgs']]]] grant_permissions: Grant specific permissions only + :param pulumi.Input[Sequence[pulumi.Input[Union['PluginGrantPermissionArgs', 'PluginGrantPermissionArgsDict']]]] grant_permissions: Grant specific permissions only :param pulumi.Input[str] name: Docker Plugin name :param pulumi.Input[str] plugin_reference: Docker Plugin Reference """ diff --git a/sdk/python/pulumi_docker/provider.py b/sdk/python/pulumi_docker/provider.py index db8e325c..1add7439 100644 --- a/sdk/python/pulumi_docker/provider.py +++ b/sdk/python/pulumi_docker/provider.py @@ -140,7 +140,7 @@ def __init__(__self__, cert_path: Optional[pulumi.Input[str]] = None, host: Optional[pulumi.Input[str]] = None, key_material: Optional[pulumi.Input[str]] = None, - registry_auth: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ProviderRegistryAuthArgs']]]]] = None, + registry_auth: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ProviderRegistryAuthArgs', 'ProviderRegistryAuthArgsDict']]]]] = None, ssh_opts: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, __props__=None): """ @@ -190,7 +190,7 @@ def _internal_init(__self__, cert_path: Optional[pulumi.Input[str]] = None, host: Optional[pulumi.Input[str]] = None, key_material: Optional[pulumi.Input[str]] = None, - registry_auth: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ProviderRegistryAuthArgs']]]]] = None, + registry_auth: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ProviderRegistryAuthArgs', 'ProviderRegistryAuthArgsDict']]]]] = None, ssh_opts: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) diff --git a/sdk/python/pulumi_docker/registry_image.py b/sdk/python/pulumi_docker/registry_image.py index 0aa29770..371bc5a8 100644 --- a/sdk/python/pulumi_docker/registry_image.py +++ b/sdk/python/pulumi_docker/registry_image.py @@ -17,13 +17,13 @@ def __init__(__self__, *, insecure_skip_verify: Optional[pulumi.Input[bool]] = None, keep_remotely: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None): + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None): """ The set of arguments for constructing a RegistryImage resource. :param pulumi.Input[bool] insecure_skip_verify: If `true`, the verification of TLS certificates of the server/registry is disabled. Defaults to `false` :param pulumi.Input[bool] keep_remotely: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker registry on destroy operation. Defaults to `false` :param pulumi.Input[str] name: The name of the Docker image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ if insecure_skip_verify is not None: pulumi.set(__self__, "insecure_skip_verify", insecure_skip_verify) @@ -72,14 +72,14 @@ def name(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def triggers(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def triggers(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ return pulumi.get(self, "triggers") @triggers.setter - def triggers(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def triggers(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "triggers", value) @@ -90,14 +90,14 @@ def __init__(__self__, *, keep_remotely: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, sha256_digest: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None): + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None): """ Input properties used for looking up and filtering RegistryImage resources. :param pulumi.Input[bool] insecure_skip_verify: If `true`, the verification of TLS certificates of the server/registry is disabled. Defaults to `false` :param pulumi.Input[bool] keep_remotely: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker registry on destroy operation. Defaults to `false` :param pulumi.Input[str] name: The name of the Docker image. :param pulumi.Input[str] sha256_digest: The sha256 digest of the image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ if insecure_skip_verify is not None: pulumi.set(__self__, "insecure_skip_verify", insecure_skip_verify) @@ -160,14 +160,14 @@ def sha256_digest(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def triggers(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def triggers(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ return pulumi.get(self, "triggers") @triggers.setter - def triggers(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def triggers(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "triggers", value) @@ -179,7 +179,7 @@ def __init__(__self__, insecure_skip_verify: Optional[pulumi.Input[bool]] = None, keep_remotely: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None, + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): """ @@ -190,7 +190,7 @@ def __init__(__self__, :param pulumi.Input[bool] insecure_skip_verify: If `true`, the verification of TLS certificates of the server/registry is disabled. Defaults to `false` :param pulumi.Input[bool] keep_remotely: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker registry on destroy operation. Defaults to `false` :param pulumi.Input[str] name: The name of the Docker image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ ... @overload @@ -220,7 +220,7 @@ def _internal_init(__self__, insecure_skip_verify: Optional[pulumi.Input[bool]] = None, keep_remotely: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None, + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) if not isinstance(opts, pulumi.ResourceOptions): @@ -249,7 +249,7 @@ def get(resource_name: str, keep_remotely: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, sha256_digest: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None) -> 'RegistryImage': + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None) -> 'RegistryImage': """ Get an existing RegistryImage resource's state with the given name, id, and optional extra properties used to qualify the lookup. @@ -261,7 +261,7 @@ def get(resource_name: str, :param pulumi.Input[bool] keep_remotely: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker registry on destroy operation. Defaults to `false` :param pulumi.Input[str] name: The name of the Docker image. :param pulumi.Input[str] sha256_digest: The sha256 digest of the image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -308,7 +308,7 @@ def sha256_digest(self) -> pulumi.Output[str]: @property @pulumi.getter - def triggers(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def triggers(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ A map of arbitrary strings that, when changed, will force the `RegistryImage` resource to be replaced. This can be used to repush a local image """ diff --git a/sdk/python/pulumi_docker/remote_image.py b/sdk/python/pulumi_docker/remote_image.py index 2194dffb..7fb6e6a6 100644 --- a/sdk/python/pulumi_docker/remote_image.py +++ b/sdk/python/pulumi_docker/remote_image.py @@ -22,7 +22,7 @@ def __init__(__self__, *, keep_locally: Optional[pulumi.Input[bool]] = None, platform: Optional[pulumi.Input[str]] = None, pull_triggers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None): + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None): """ The set of arguments for constructing a RemoteImage resource. :param pulumi.Input[str] name: The name of the Docker image, including any tags or SHA256 repo digests. @@ -31,7 +31,7 @@ def __init__(__self__, *, :param pulumi.Input[bool] keep_locally: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker local storage on destroy operation. :param pulumi.Input[str] platform: The platform to use when pulling the image. Defaults to the platform of the current machine. :param pulumi.Input[Sequence[pulumi.Input[str]]] pull_triggers: List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ pulumi.set(__self__, "name", name) if build is not None: @@ -121,14 +121,14 @@ def pull_triggers(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]] @property @pulumi.getter - def triggers(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def triggers(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ return pulumi.get(self, "triggers") @triggers.setter - def triggers(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def triggers(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "triggers", value) @@ -143,7 +143,7 @@ def __init__(__self__, *, platform: Optional[pulumi.Input[str]] = None, pull_triggers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, repo_digest: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None): + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None): """ Input properties used for looking up and filtering RemoteImage resources. :param pulumi.Input['RemoteImageBuildArgs'] build: Configuration to build an image. Please see [docker build command reference](https://docs.docker.com/engine/reference/commandline/build/#options) too. @@ -154,7 +154,7 @@ def __init__(__self__, *, :param pulumi.Input[str] platform: The platform to use when pulling the image. Defaults to the platform of the current machine. :param pulumi.Input[Sequence[pulumi.Input[str]]] pull_triggers: List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. :param pulumi.Input[str] repo_digest: The image sha256 digest in the form of `repo[:tag]@sha256:`. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ if build is not None: pulumi.set(__self__, "build", build) @@ -273,14 +273,14 @@ def repo_digest(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter - def triggers(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def triggers(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ return pulumi.get(self, "triggers") @triggers.setter - def triggers(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def triggers(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "triggers", value) @@ -289,13 +289,13 @@ class RemoteImage(pulumi.CustomResource): def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - build: Optional[pulumi.Input[pulumi.InputType['RemoteImageBuildArgs']]] = None, + build: Optional[pulumi.Input[Union['RemoteImageBuildArgs', 'RemoteImageBuildArgsDict']]] = None, force_remove: Optional[pulumi.Input[bool]] = None, keep_locally: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, platform: Optional[pulumi.Input[str]] = None, pull_triggers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None, + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): """ @@ -342,29 +342,29 @@ def __init__(__self__, zoo = docker.RemoteImage("zoo", name="zoo", - build=docker.RemoteImageBuildArgs( - context=".", - tags=["zoo:develop"], - build_arg={ + build={ + "context": ".", + "tags": ["zoo:develop"], + "build_arg": { "foo": "zoo", }, - label={ + "label": { "author": "zoo", }, - )) + }) ``` You can use the `triggers` argument to specify when the image should be rebuild. This is for example helpful when you want to rebuild the docker image whenever the source code changes. :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[pulumi.InputType['RemoteImageBuildArgs']] build: Configuration to build an image. Please see [docker build command reference](https://docs.docker.com/engine/reference/commandline/build/#options) too. + :param pulumi.Input[Union['RemoteImageBuildArgs', 'RemoteImageBuildArgsDict']] build: Configuration to build an image. Please see [docker build command reference](https://docs.docker.com/engine/reference/commandline/build/#options) too. :param pulumi.Input[bool] force_remove: If true, then the image is removed forcibly when the resource is destroyed. :param pulumi.Input[bool] keep_locally: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker local storage on destroy operation. :param pulumi.Input[str] name: The name of the Docker image, including any tags or SHA256 repo digests. :param pulumi.Input[str] platform: The platform to use when pulling the image. Defaults to the platform of the current machine. :param pulumi.Input[Sequence[pulumi.Input[str]]] pull_triggers: List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ ... @overload @@ -417,16 +417,16 @@ def __init__(__self__, zoo = docker.RemoteImage("zoo", name="zoo", - build=docker.RemoteImageBuildArgs( - context=".", - tags=["zoo:develop"], - build_arg={ + build={ + "context": ".", + "tags": ["zoo:develop"], + "build_arg": { "foo": "zoo", }, - label={ + "label": { "author": "zoo", }, - )) + }) ``` You can use the `triggers` argument to specify when the image should be rebuild. This is for example helpful when you want to rebuild the docker image whenever the source code changes. @@ -446,13 +446,13 @@ def __init__(__self__, resource_name: str, *args, **kwargs): def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - build: Optional[pulumi.Input[pulumi.InputType['RemoteImageBuildArgs']]] = None, + build: Optional[pulumi.Input[Union['RemoteImageBuildArgs', 'RemoteImageBuildArgsDict']]] = None, force_remove: Optional[pulumi.Input[bool]] = None, keep_locally: Optional[pulumi.Input[bool]] = None, name: Optional[pulumi.Input[str]] = None, platform: Optional[pulumi.Input[str]] = None, pull_triggers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None, + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) if not isinstance(opts, pulumi.ResourceOptions): @@ -483,7 +483,7 @@ def _internal_init(__self__, def get(resource_name: str, id: pulumi.Input[str], opts: Optional[pulumi.ResourceOptions] = None, - build: Optional[pulumi.Input[pulumi.InputType['RemoteImageBuildArgs']]] = None, + build: Optional[pulumi.Input[Union['RemoteImageBuildArgs', 'RemoteImageBuildArgsDict']]] = None, force_remove: Optional[pulumi.Input[bool]] = None, image_id: Optional[pulumi.Input[str]] = None, keep_locally: Optional[pulumi.Input[bool]] = None, @@ -491,7 +491,7 @@ def get(resource_name: str, platform: Optional[pulumi.Input[str]] = None, pull_triggers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, repo_digest: Optional[pulumi.Input[str]] = None, - triggers: Optional[pulumi.Input[Mapping[str, Any]]] = None) -> 'RemoteImage': + triggers: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None) -> 'RemoteImage': """ Get an existing RemoteImage resource's state with the given name, id, and optional extra properties used to qualify the lookup. @@ -499,7 +499,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[pulumi.InputType['RemoteImageBuildArgs']] build: Configuration to build an image. Please see [docker build command reference](https://docs.docker.com/engine/reference/commandline/build/#options) too. + :param pulumi.Input[Union['RemoteImageBuildArgs', 'RemoteImageBuildArgsDict']] build: Configuration to build an image. Please see [docker build command reference](https://docs.docker.com/engine/reference/commandline/build/#options) too. :param pulumi.Input[bool] force_remove: If true, then the image is removed forcibly when the resource is destroyed. :param pulumi.Input[str] image_id: The ID of the image (as seen when executing `docker inspect` on the image). Can be used to reference the image via its ID in other resources. :param pulumi.Input[bool] keep_locally: If true, then the Docker image won't be deleted on destroy operation. If this is false, it will delete the image from the docker local storage on destroy operation. @@ -507,7 +507,7 @@ def get(resource_name: str, :param pulumi.Input[str] platform: The platform to use when pulling the image. Defaults to the platform of the current machine. :param pulumi.Input[Sequence[pulumi.Input[str]]] pull_triggers: List of values which cause an image pull when changed. This is used to store the image digest from the registry when using the docker*registry*image. :param pulumi.Input[str] repo_digest: The image sha256 digest in the form of `repo[:tag]@sha256:`. - :param pulumi.Input[Mapping[str, Any]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] triggers: A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -590,7 +590,7 @@ def repo_digest(self) -> pulumi.Output[str]: @property @pulumi.getter - def triggers(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def triggers(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ A map of arbitrary strings that, when changed, will force the `RemoteImage` resource to be replaced. This can be used to rebuild an image when contents of source code folders change """ diff --git a/sdk/python/pulumi_docker/secret.py b/sdk/python/pulumi_docker/secret.py index 48904123..aeca8e11 100644 --- a/sdk/python/pulumi_docker/secret.py +++ b/sdk/python/pulumi_docker/secret.py @@ -130,7 +130,7 @@ def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, data: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecretLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['SecretLabelArgs', 'SecretLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): """ @@ -143,7 +143,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] data: Base64-url-safe-encoded secret data - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecretLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['SecretLabelArgs', 'SecretLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] name: User-defined name of the secret """ ... @@ -175,7 +175,7 @@ def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, data: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecretLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['SecretLabelArgs', 'SecretLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) @@ -204,7 +204,7 @@ def get(resource_name: str, id: pulumi.Input[str], opts: Optional[pulumi.ResourceOptions] = None, data: Optional[pulumi.Input[str]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecretLabelArgs']]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['SecretLabelArgs', 'SecretLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None) -> 'Secret': """ Get an existing Secret resource's state with the given name, id, and optional extra @@ -214,7 +214,7 @@ def get(resource_name: str, :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] data: Base64-url-safe-encoded secret data - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecretLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Sequence[pulumi.Input[Union['SecretLabelArgs', 'SecretLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] name: User-defined name of the secret """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) diff --git a/sdk/python/pulumi_docker/service.py b/sdk/python/pulumi_docker/service.py index 6e030a57..9b0b82af 100644 --- a/sdk/python/pulumi_docker/service.py +++ b/sdk/python/pulumi_docker/service.py @@ -321,15 +321,15 @@ class Service(pulumi.CustomResource): def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - auth: Optional[pulumi.Input[pulumi.InputType['ServiceAuthArgs']]] = None, - converge_config: Optional[pulumi.Input[pulumi.InputType['ServiceConvergeConfigArgs']]] = None, - endpoint_spec: Optional[pulumi.Input[pulumi.InputType['ServiceEndpointSpecArgs']]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ServiceLabelArgs']]]]] = None, - mode: Optional[pulumi.Input[pulumi.InputType['ServiceModeArgs']]] = None, + auth: Optional[pulumi.Input[Union['ServiceAuthArgs', 'ServiceAuthArgsDict']]] = None, + converge_config: Optional[pulumi.Input[Union['ServiceConvergeConfigArgs', 'ServiceConvergeConfigArgsDict']]] = None, + endpoint_spec: Optional[pulumi.Input[Union['ServiceEndpointSpecArgs', 'ServiceEndpointSpecArgsDict']]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ServiceLabelArgs', 'ServiceLabelArgsDict']]]]] = None, + mode: Optional[pulumi.Input[Union['ServiceModeArgs', 'ServiceModeArgsDict']]] = None, name: Optional[pulumi.Input[str]] = None, - rollback_config: Optional[pulumi.Input[pulumi.InputType['ServiceRollbackConfigArgs']]] = None, - task_spec: Optional[pulumi.Input[pulumi.InputType['ServiceTaskSpecArgs']]] = None, - update_config: Optional[pulumi.Input[pulumi.InputType['ServiceUpdateConfigArgs']]] = None, + rollback_config: Optional[pulumi.Input[Union['ServiceRollbackConfigArgs', 'ServiceRollbackConfigArgsDict']]] = None, + task_spec: Optional[pulumi.Input[Union['ServiceTaskSpecArgs', 'ServiceTaskSpecArgsDict']]] = None, + update_config: Optional[pulumi.Input[Union['ServiceUpdateConfigArgs', 'ServiceUpdateConfigArgsDict']]] = None, __props__=None): """ @@ -393,15 +393,15 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[pulumi.InputType['ServiceAuthArgs']] auth: Configuration for the authentication for pulling the images of the service - :param pulumi.Input[pulumi.InputType['ServiceConvergeConfigArgs']] converge_config: A configuration to ensure that a service converges aka reaches the desired that of all task up and running - :param pulumi.Input[pulumi.InputType['ServiceEndpointSpecArgs']] endpoint_spec: Properties that can be configured to access and load balance a service - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ServiceLabelArgs']]]] labels: User-defined key/value metadata - :param pulumi.Input[pulumi.InputType['ServiceModeArgs']] mode: Scheduling mode for the service + :param pulumi.Input[Union['ServiceAuthArgs', 'ServiceAuthArgsDict']] auth: Configuration for the authentication for pulling the images of the service + :param pulumi.Input[Union['ServiceConvergeConfigArgs', 'ServiceConvergeConfigArgsDict']] converge_config: A configuration to ensure that a service converges aka reaches the desired that of all task up and running + :param pulumi.Input[Union['ServiceEndpointSpecArgs', 'ServiceEndpointSpecArgsDict']] endpoint_spec: Properties that can be configured to access and load balance a service + :param pulumi.Input[Sequence[pulumi.Input[Union['ServiceLabelArgs', 'ServiceLabelArgsDict']]]] labels: User-defined key/value metadata + :param pulumi.Input[Union['ServiceModeArgs', 'ServiceModeArgsDict']] mode: Scheduling mode for the service :param pulumi.Input[str] name: Name of the service - :param pulumi.Input[pulumi.InputType['ServiceRollbackConfigArgs']] rollback_config: Specification for the rollback strategy of the service - :param pulumi.Input[pulumi.InputType['ServiceTaskSpecArgs']] task_spec: User modifiable task configuration - :param pulumi.Input[pulumi.InputType['ServiceUpdateConfigArgs']] update_config: Specification for the update strategy of the service + :param pulumi.Input[Union['ServiceRollbackConfigArgs', 'ServiceRollbackConfigArgsDict']] rollback_config: Specification for the rollback strategy of the service + :param pulumi.Input[Union['ServiceTaskSpecArgs', 'ServiceTaskSpecArgsDict']] task_spec: User modifiable task configuration + :param pulumi.Input[Union['ServiceUpdateConfigArgs', 'ServiceUpdateConfigArgsDict']] update_config: Specification for the update strategy of the service """ ... @overload @@ -484,15 +484,15 @@ def __init__(__self__, resource_name: str, *args, **kwargs): def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, - auth: Optional[pulumi.Input[pulumi.InputType['ServiceAuthArgs']]] = None, - converge_config: Optional[pulumi.Input[pulumi.InputType['ServiceConvergeConfigArgs']]] = None, - endpoint_spec: Optional[pulumi.Input[pulumi.InputType['ServiceEndpointSpecArgs']]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ServiceLabelArgs']]]]] = None, - mode: Optional[pulumi.Input[pulumi.InputType['ServiceModeArgs']]] = None, + auth: Optional[pulumi.Input[Union['ServiceAuthArgs', 'ServiceAuthArgsDict']]] = None, + converge_config: Optional[pulumi.Input[Union['ServiceConvergeConfigArgs', 'ServiceConvergeConfigArgsDict']]] = None, + endpoint_spec: Optional[pulumi.Input[Union['ServiceEndpointSpecArgs', 'ServiceEndpointSpecArgsDict']]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ServiceLabelArgs', 'ServiceLabelArgsDict']]]]] = None, + mode: Optional[pulumi.Input[Union['ServiceModeArgs', 'ServiceModeArgsDict']]] = None, name: Optional[pulumi.Input[str]] = None, - rollback_config: Optional[pulumi.Input[pulumi.InputType['ServiceRollbackConfigArgs']]] = None, - task_spec: Optional[pulumi.Input[pulumi.InputType['ServiceTaskSpecArgs']]] = None, - update_config: Optional[pulumi.Input[pulumi.InputType['ServiceUpdateConfigArgs']]] = None, + rollback_config: Optional[pulumi.Input[Union['ServiceRollbackConfigArgs', 'ServiceRollbackConfigArgsDict']]] = None, + task_spec: Optional[pulumi.Input[Union['ServiceTaskSpecArgs', 'ServiceTaskSpecArgsDict']]] = None, + update_config: Optional[pulumi.Input[Union['ServiceUpdateConfigArgs', 'ServiceUpdateConfigArgsDict']]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) if not isinstance(opts, pulumi.ResourceOptions): @@ -523,15 +523,15 @@ def _internal_init(__self__, def get(resource_name: str, id: pulumi.Input[str], opts: Optional[pulumi.ResourceOptions] = None, - auth: Optional[pulumi.Input[pulumi.InputType['ServiceAuthArgs']]] = None, - converge_config: Optional[pulumi.Input[pulumi.InputType['ServiceConvergeConfigArgs']]] = None, - endpoint_spec: Optional[pulumi.Input[pulumi.InputType['ServiceEndpointSpecArgs']]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ServiceLabelArgs']]]]] = None, - mode: Optional[pulumi.Input[pulumi.InputType['ServiceModeArgs']]] = None, + auth: Optional[pulumi.Input[Union['ServiceAuthArgs', 'ServiceAuthArgsDict']]] = None, + converge_config: Optional[pulumi.Input[Union['ServiceConvergeConfigArgs', 'ServiceConvergeConfigArgsDict']]] = None, + endpoint_spec: Optional[pulumi.Input[Union['ServiceEndpointSpecArgs', 'ServiceEndpointSpecArgsDict']]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ServiceLabelArgs', 'ServiceLabelArgsDict']]]]] = None, + mode: Optional[pulumi.Input[Union['ServiceModeArgs', 'ServiceModeArgsDict']]] = None, name: Optional[pulumi.Input[str]] = None, - rollback_config: Optional[pulumi.Input[pulumi.InputType['ServiceRollbackConfigArgs']]] = None, - task_spec: Optional[pulumi.Input[pulumi.InputType['ServiceTaskSpecArgs']]] = None, - update_config: Optional[pulumi.Input[pulumi.InputType['ServiceUpdateConfigArgs']]] = None) -> 'Service': + rollback_config: Optional[pulumi.Input[Union['ServiceRollbackConfigArgs', 'ServiceRollbackConfigArgsDict']]] = None, + task_spec: Optional[pulumi.Input[Union['ServiceTaskSpecArgs', 'ServiceTaskSpecArgsDict']]] = None, + update_config: Optional[pulumi.Input[Union['ServiceUpdateConfigArgs', 'ServiceUpdateConfigArgsDict']]] = None) -> 'Service': """ Get an existing Service resource's state with the given name, id, and optional extra properties used to qualify the lookup. @@ -539,15 +539,15 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[pulumi.InputType['ServiceAuthArgs']] auth: Configuration for the authentication for pulling the images of the service - :param pulumi.Input[pulumi.InputType['ServiceConvergeConfigArgs']] converge_config: A configuration to ensure that a service converges aka reaches the desired that of all task up and running - :param pulumi.Input[pulumi.InputType['ServiceEndpointSpecArgs']] endpoint_spec: Properties that can be configured to access and load balance a service - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ServiceLabelArgs']]]] labels: User-defined key/value metadata - :param pulumi.Input[pulumi.InputType['ServiceModeArgs']] mode: Scheduling mode for the service + :param pulumi.Input[Union['ServiceAuthArgs', 'ServiceAuthArgsDict']] auth: Configuration for the authentication for pulling the images of the service + :param pulumi.Input[Union['ServiceConvergeConfigArgs', 'ServiceConvergeConfigArgsDict']] converge_config: A configuration to ensure that a service converges aka reaches the desired that of all task up and running + :param pulumi.Input[Union['ServiceEndpointSpecArgs', 'ServiceEndpointSpecArgsDict']] endpoint_spec: Properties that can be configured to access and load balance a service + :param pulumi.Input[Sequence[pulumi.Input[Union['ServiceLabelArgs', 'ServiceLabelArgsDict']]]] labels: User-defined key/value metadata + :param pulumi.Input[Union['ServiceModeArgs', 'ServiceModeArgsDict']] mode: Scheduling mode for the service :param pulumi.Input[str] name: Name of the service - :param pulumi.Input[pulumi.InputType['ServiceRollbackConfigArgs']] rollback_config: Specification for the rollback strategy of the service - :param pulumi.Input[pulumi.InputType['ServiceTaskSpecArgs']] task_spec: User modifiable task configuration - :param pulumi.Input[pulumi.InputType['ServiceUpdateConfigArgs']] update_config: Specification for the update strategy of the service + :param pulumi.Input[Union['ServiceRollbackConfigArgs', 'ServiceRollbackConfigArgsDict']] rollback_config: Specification for the rollback strategy of the service + :param pulumi.Input[Union['ServiceTaskSpecArgs', 'ServiceTaskSpecArgsDict']] task_spec: User modifiable task configuration + :param pulumi.Input[Union['ServiceUpdateConfigArgs', 'ServiceUpdateConfigArgsDict']] update_config: Specification for the update strategy of the service """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) diff --git a/sdk/python/pulumi_docker/volume.py b/sdk/python/pulumi_docker/volume.py index cd00951f..e1b99f98 100644 --- a/sdk/python/pulumi_docker/volume.py +++ b/sdk/python/pulumi_docker/volume.py @@ -17,13 +17,13 @@ class VolumeArgs: def __init__(__self__, *, driver: Optional[pulumi.Input[str]] = None, - driver_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + driver_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['VolumeLabelArgs']]]] = None, name: Optional[pulumi.Input[str]] = None): """ The set of arguments for constructing a Volume resource. :param pulumi.Input[str] driver: Driver type for the volume. Defaults to `local`. - :param pulumi.Input[Mapping[str, Any]] driver_opts: Options specific to the driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] driver_opts: Options specific to the driver. :param pulumi.Input[Sequence[pulumi.Input['VolumeLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker volume (will be generated if not provided). """ @@ -50,14 +50,14 @@ def driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="driverOpts") - def driver_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def driver_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Options specific to the driver. """ return pulumi.get(self, "driver_opts") @driver_opts.setter - def driver_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def driver_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "driver_opts", value) @property @@ -89,14 +89,14 @@ def name(self, value: Optional[pulumi.Input[str]]): class _VolumeState: def __init__(__self__, *, driver: Optional[pulumi.Input[str]] = None, - driver_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, + driver_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, labels: Optional[pulumi.Input[Sequence[pulumi.Input['VolumeLabelArgs']]]] = None, mountpoint: Optional[pulumi.Input[str]] = None, name: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering Volume resources. :param pulumi.Input[str] driver: Driver type for the volume. Defaults to `local`. - :param pulumi.Input[Mapping[str, Any]] driver_opts: Options specific to the driver. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] driver_opts: Options specific to the driver. :param pulumi.Input[Sequence[pulumi.Input['VolumeLabelArgs']]] labels: User-defined key/value metadata :param pulumi.Input[str] mountpoint: The mountpoint of the volume. :param pulumi.Input[str] name: The name of the Docker volume (will be generated if not provided). @@ -126,14 +126,14 @@ def driver(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter(name="driverOpts") - def driver_opts(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + def driver_opts(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: """ Options specific to the driver. """ return pulumi.get(self, "driver_opts") @driver_opts.setter - def driver_opts(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + def driver_opts(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): pulumi.set(self, "driver_opts", value) @property @@ -179,8 +179,8 @@ def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, driver: Optional[pulumi.Input[str]] = None, - driver_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeLabelArgs']]]]] = None, + driver_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['VolumeLabelArgs', 'VolumeLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): """ @@ -231,8 +231,8 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] driver: Driver type for the volume. Defaults to `local`. - :param pulumi.Input[Mapping[str, Any]] driver_opts: Options specific to the driver. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] driver_opts: Options specific to the driver. + :param pulumi.Input[Sequence[pulumi.Input[Union['VolumeLabelArgs', 'VolumeLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] name: The name of the Docker volume (will be generated if not provided). """ ... @@ -302,8 +302,8 @@ def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, driver: Optional[pulumi.Input[str]] = None, - driver_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeLabelArgs']]]]] = None, + driver_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['VolumeLabelArgs', 'VolumeLabelArgsDict']]]]] = None, name: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) @@ -330,8 +330,8 @@ def get(resource_name: str, id: pulumi.Input[str], opts: Optional[pulumi.ResourceOptions] = None, driver: Optional[pulumi.Input[str]] = None, - driver_opts: Optional[pulumi.Input[Mapping[str, Any]]] = None, - labels: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeLabelArgs']]]]] = None, + driver_opts: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None, + labels: Optional[pulumi.Input[Sequence[pulumi.Input[Union['VolumeLabelArgs', 'VolumeLabelArgsDict']]]]] = None, mountpoint: Optional[pulumi.Input[str]] = None, name: Optional[pulumi.Input[str]] = None) -> 'Volume': """ @@ -342,8 +342,8 @@ def get(resource_name: str, :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] driver: Driver type for the volume. Defaults to `local`. - :param pulumi.Input[Mapping[str, Any]] driver_opts: Options specific to the driver. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeLabelArgs']]]] labels: User-defined key/value metadata + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] driver_opts: Options specific to the driver. + :param pulumi.Input[Sequence[pulumi.Input[Union['VolumeLabelArgs', 'VolumeLabelArgsDict']]]] labels: User-defined key/value metadata :param pulumi.Input[str] mountpoint: The mountpoint of the volume. :param pulumi.Input[str] name: The name of the Docker volume (will be generated if not provided). """ @@ -368,7 +368,7 @@ def driver(self) -> pulumi.Output[str]: @property @pulumi.getter(name="driverOpts") - def driver_opts(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + def driver_opts(self) -> pulumi.Output[Optional[Mapping[str, str]]]: """ Options specific to the driver. """