Skip to content

Commit b9556e1

Browse files
authored
Automated pulumi/pulumi upgrade (#82)
* Regenerating Python SDK based on updated modules * Updated modules
1 parent 1845753 commit b9556e1

File tree

9 files changed

+47
-33
lines changed

9 files changed

+47
-33
lines changed

provider/go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.17
55
require (
66
github.com/golang/protobuf v1.5.2
77
github.com/pkg/sftp v1.13.4
8-
github.com/pulumi/pulumi/pkg/v3 v3.34.1
9-
github.com/pulumi/pulumi/sdk/v3 v3.34.1
8+
github.com/pulumi/pulumi/pkg/v3 v3.35.0
9+
github.com/pulumi/pulumi/sdk/v3 v3.35.0
1010
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
1111
google.golang.org/grpc v1.45.0
1212
)
@@ -34,6 +34,7 @@ require (
3434
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3535
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
3636
github.com/Microsoft/go-winio v0.5.1 // indirect
37+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
3738
github.com/agext/levenshtein v1.2.3 // indirect
3839
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
3940
github.com/aws/aws-sdk-go v1.40.34 // indirect
@@ -54,6 +55,7 @@ require (
5455
github.com/dimchansky/utfbom v1.1.1 // indirect
5556
github.com/djherbis/times v1.5.0 // indirect
5657
github.com/dustin/go-humanize v1.0.0 // indirect
58+
github.com/edsrzf/mmap-go v1.1.0 // indirect
5759
github.com/emirpasic/gods v1.12.0 // indirect
5860
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
5961
github.com/gofrs/uuid v4.2.0+incompatible // indirect
@@ -100,6 +102,7 @@ require (
100102
github.com/mitchellh/mapstructure v1.4.3 // indirect
101103
github.com/mitchellh/reflectwalk v1.0.0 // indirect
102104
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
105+
github.com/natefinch/atomic v1.0.1 // indirect
103106
github.com/opentracing/basictracer-go v1.1.0 // indirect
104107
github.com/opentracing/opentracing-go v1.2.0 // indirect
105108
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
@@ -152,5 +155,6 @@ require (
152155
gopkg.in/warnings.v0 v0.1.2 // indirect
153156
gopkg.in/yaml.v2 v2.4.0 // indirect
154157
gopkg.in/yaml.v3 v3.0.0 // indirect
158+
lukechampine.com/frand v1.4.2 // indirect
155159
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
156160
)

provider/go.sum

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nB
157157
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
158158
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
159159
github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
160+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
161+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
160162
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
161163
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
162164
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
@@ -290,6 +292,8 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
290292
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
291293
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
292294
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
295+
github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
296+
github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
293297
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
294298
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
295299
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -662,6 +666,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
662666
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
663667
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
664668
github.com/mxschmitt/golang-combinations v1.0.0/go.mod h1:RbMhWvfCelHR6WROvT2bVfxJvZHoEvBj71SKe+H0MYU=
669+
github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
670+
github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
665671
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
666672
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
667673
github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
@@ -738,16 +744,16 @@ github.com/pulumi/pulumi/pkg/v3 v3.26.0/go.mod h1:L9E+MXe05AbrSmX1GjX3jIrVNpE2Rr
738744
github.com/pulumi/pulumi/pkg/v3 v3.31.1-0.20220429232336-81582c4dcb93/go.mod h1:bO/BHZJoG2Mm8C3dxP414vLPvjxFfsetPE3Ep7Ffgro=
739745
github.com/pulumi/pulumi/pkg/v3 v3.32.1/go.mod h1:TNPDg+H4Mzy5ldOJNpkzqPYTuYH8ehorPFtnQd3pRUU=
740746
github.com/pulumi/pulumi/pkg/v3 v3.33.3-0.20220601044734-8c3b8ab96f3e/go.mod h1:L6pQPxfwzQ844F0xaPSwBTijOApmiLoGonpuphShQt4=
741-
github.com/pulumi/pulumi/pkg/v3 v3.34.1 h1:yg7B6CixUN4cCQgZZRnY1OZSO2k96ze/7314n1eHMxM=
742-
github.com/pulumi/pulumi/pkg/v3 v3.34.1/go.mod h1:RJ5AFc+/Ej+cN03SDSN49DcBpuX/F7VFuEQ+nb7fq4w=
747+
github.com/pulumi/pulumi/pkg/v3 v3.35.0 h1:AWivM4ssIs0exaBiEMniyPQc+8/e1QKO7GCWxWQxoTo=
748+
github.com/pulumi/pulumi/pkg/v3 v3.35.0/go.mod h1:az7i8k+CEbhweSXDrWXeLHgigPU9+S1lMrMz2nZqzNE=
743749
github.com/pulumi/pulumi/sdk/v3 v3.26.0/go.mod h1:VsxW+TGv2VBLe/MeqsAr9r0zKzK/gbAhFT9QxYr24cY=
744750
github.com/pulumi/pulumi/sdk/v3 v3.28.0/go.mod h1:Oe6AnW5MjJE5X2UJeqeXm1Al7qahdLVhIPeiKuoqxAw=
745751
github.com/pulumi/pulumi/sdk/v3 v3.31.0/go.mod h1:hGo/+AL1L4sPL9Ukd/i5bNFM3WHs3dHcA+GKEW7M3RA=
746752
github.com/pulumi/pulumi/sdk/v3 v3.32.1/go.mod h1:hGo/+AL1L4sPL9Ukd/i5bNFM3WHs3dHcA+GKEW7M3RA=
747753
github.com/pulumi/pulumi/sdk/v3 v3.33.2/go.mod h1:hGo/+AL1L4sPL9Ukd/i5bNFM3WHs3dHcA+GKEW7M3RA=
748754
github.com/pulumi/pulumi/sdk/v3 v3.33.3-0.20220601044734-8c3b8ab96f3e/go.mod h1:sF9VfTkwRXYNk/gCR7ICd79VDC8WcsyVq37/sb8sV5A=
749-
github.com/pulumi/pulumi/sdk/v3 v3.34.1 h1:M1WQwcD+6Z1BjSUl5F7cxZStvu0gpWmRWNkqeJ/A7QI=
750-
github.com/pulumi/pulumi/sdk/v3 v3.34.1/go.mod h1:sF9VfTkwRXYNk/gCR7ICd79VDC8WcsyVq37/sb8sV5A=
755+
github.com/pulumi/pulumi/sdk/v3 v3.35.0 h1:Vg/s0pskq8NhXP1/HQ7qreZfjJhdHfuKSt4W+NYCWVA=
756+
github.com/pulumi/pulumi/sdk/v3 v3.35.0/go.mod h1:e1xuPnh9aKzCesrFf96DEzcybLdRWRMhKeKVBmb2lm0=
751757
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
752758
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
753759
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
@@ -1086,6 +1092,7 @@ golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7w
10861092
golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10871093
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10881094
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1095+
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10891096
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10901097
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10911098
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1501,6 +1508,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
15011508
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
15021509
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
15031510
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1511+
lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
1512+
lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s=
15041513
mvdan.cc/gofumpt v0.0.0-20210107193838-d24d34e18d44/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
15051514
mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
15061515
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

sdk/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ go 1.17
55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/pkg/errors v0.9.1
8-
github.com/pulumi/pulumi/sdk/v3 v3.34.1
8+
github.com/pulumi/pulumi/sdk/v3 v3.35.0
99
)
1010

1111
require (
12+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
1213
github.com/cheggaaa/pb v1.0.18 // indirect
1314
github.com/djherbis/times v1.2.0 // indirect
1415
github.com/emirpasic/gods v1.12.0 // indirect
@@ -53,5 +54,6 @@ require (
5354
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
5455
gopkg.in/warnings.v0 v0.1.2 // indirect
5556
gopkg.in/yaml.v2 v2.4.0 // indirect
57+
lukechampine.com/frand v1.4.2 // indirect
5658
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
5759
)

sdk/go.sum

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
33
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
4+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
5+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
46
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
57
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
68
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
@@ -115,8 +117,8 @@ github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw
115117
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
116118
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
117119
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
118-
github.com/pulumi/pulumi/sdk/v3 v3.34.1 h1:M1WQwcD+6Z1BjSUl5F7cxZStvu0gpWmRWNkqeJ/A7QI=
119-
github.com/pulumi/pulumi/sdk/v3 v3.34.1/go.mod h1:sF9VfTkwRXYNk/gCR7ICd79VDC8WcsyVq37/sb8sV5A=
120+
github.com/pulumi/pulumi/sdk/v3 v3.35.0 h1:Vg/s0pskq8NhXP1/HQ7qreZfjJhdHfuKSt4W+NYCWVA=
121+
github.com/pulumi/pulumi/sdk/v3 v3.35.0/go.mod h1:e1xuPnh9aKzCesrFf96DEzcybLdRWRMhKeKVBmb2lm0=
120122
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
121123
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
122124
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
@@ -196,6 +198,7 @@ golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5h
196198
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
197199
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
198200
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
201+
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
199202
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
200203
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
201204
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -277,6 +280,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie
277280
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
278281
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
279282
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
283+
lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
284+
lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s=
280285
pgregory.net/rapid v0.4.7 h1:MTNRktPuv5FNqOO151TM9mDTa+XHcX6ypYeISDVD14g=
281286
pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
282287
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM=

sdk/python/pulumi_command/_utilities.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,17 @@ def _get_semver_version():
9898
def get_version():
9999
return _version_str
100100

101+
def get_resource_opts_defaults() -> pulumi.ResourceOptions:
102+
return pulumi.ResourceOptions(
103+
version=get_version(),
104+
plugin_download_url=get_plugin_download_url(),
105+
)
106+
107+
def get_invoke_opts_defaults() -> pulumi.InvokeOptions:
108+
return pulumi.InvokeOptions(
109+
version=get_version(),
110+
plugin_download_url=get_plugin_download_url(),
111+
)
101112

102113
def get_resource_args_opts(resource_args_type, resource_options_type, *args, **kwargs):
103114
"""
@@ -234,3 +245,6 @@ def lifted_func(*args, opts=None, **kwargs):
234245
**resolved_args['kwargs']))
235246

236247
return (lambda _: lifted_func)
248+
249+
def get_plugin_download_url():
250+
return None

sdk/python/pulumi_command/local/command.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,9 @@ def _internal_init(__self__,
214214
triggers: Optional[pulumi.Input[Sequence[Any]]] = None,
215215
update: Optional[pulumi.Input[str]] = None,
216216
__props__=None):
217-
if opts is None:
218-
opts = pulumi.ResourceOptions()
219-
else:
220-
opts = copy.copy(opts)
217+
opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
221218
if not isinstance(opts, pulumi.ResourceOptions):
222219
raise TypeError('Expected resource options to be a ResourceOptions instance')
223-
if opts.version is None:
224-
opts.version = _utilities.get_version()
225220
if opts.id is None:
226221
if __props__ is not None:
227222
raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')

sdk/python/pulumi_command/provider.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,9 @@ def _internal_init(__self__,
5555
resource_name: str,
5656
opts: Optional[pulumi.ResourceOptions] = None,
5757
__props__=None):
58-
if opts is None:
59-
opts = pulumi.ResourceOptions()
60-
else:
61-
opts = copy.copy(opts)
58+
opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
6259
if not isinstance(opts, pulumi.ResourceOptions):
6360
raise TypeError('Expected resource options to be a ResourceOptions instance')
64-
if opts.version is None:
65-
opts.version = _utilities.get_version()
6661
if opts.id is None:
6762
if __props__ is not None:
6863
raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')

sdk/python/pulumi_command/remote/command.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,9 @@ def _internal_init(__self__,
192192
triggers: Optional[pulumi.Input[Sequence[Any]]] = None,
193193
update: Optional[pulumi.Input[str]] = None,
194194
__props__=None):
195-
if opts is None:
196-
opts = pulumi.ResourceOptions()
197-
else:
198-
opts = copy.copy(opts)
195+
opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
199196
if not isinstance(opts, pulumi.ResourceOptions):
200197
raise TypeError('Expected resource options to be a ResourceOptions instance')
201-
if opts.version is None:
202-
opts.version = _utilities.get_version()
203198
if opts.id is None:
204199
if __props__ is not None:
205200
raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')

sdk/python/pulumi_command/remote/copy_file.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,9 @@ def _internal_init(__self__,
131131
remote_path: Optional[pulumi.Input[str]] = None,
132132
triggers: Optional[pulumi.Input[Sequence[Any]]] = None,
133133
__props__=None):
134-
if opts is None:
135-
opts = pulumi.ResourceOptions()
136-
else:
137-
opts = copy.copy(opts)
134+
opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
138135
if not isinstance(opts, pulumi.ResourceOptions):
139136
raise TypeError('Expected resource options to be a ResourceOptions instance')
140-
if opts.version is None:
141-
opts.version = _utilities.get_version()
142137
if opts.id is None:
143138
if __props__ is not None:
144139
raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')

0 commit comments

Comments
 (0)