maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #8172 (#8320)

Browse source 
* Fix #8172

* Accept test baselines

* Update CHANGELOG_PENDING
This commit is contained in:
Anton Tayanovskyy 2021-11-01 13:21:01 -04:00 committed by GitHub
parent 6890b9acc9
commit 343b4a3501
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 131 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG_PENDING.md
View file

@ -19,7 +19,7 @@
[#8275](https://github.com/pulumi/pulumi/pull/8275)
- [codegen/go] - Interaction between the `plain` and `default` tags of a type.
- [codegen/go] - Interaction between the `plain` and `default` tags of a type.
[#8254](https://github.com/pulumi/pulumi/pull/8254)
- [sdk/dotnet] - Fix a race condition when detecting exceptions in stack creation
@ -31,6 +31,10 @@
- [sdk/dotnet] - Don't panic on schema mismatches
[#8286](https://github.com/pulumi/pulumi/pull/8286)
- [codegen/python] - Fixes issue with `$fn_output` functions failing in
preview when called with unknown arguments
[#8320](https://github.com/pulumi/pulumi/pull/8320)
### Miscellaneous
- [sdk/python] - Drop support for python 3.6

5
pkg/codegen/internal/test/testdata/cyclic-types/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/dash-named-schema/python/pulumi_foo_bar/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/dashed-import-schema/python/pulumi_plant/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/external-resource-schema/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/hyphen-url/python/pulumi_registrygeoreplication/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/naming-collisions/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/nested-module-thirdparty/python/foo_bar/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/nested-module/python/pulumi_foo/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/output-funcs-edgeorder/python/pulumi_myedgeorder/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/output-funcs-tfbridge20/python/pulumi_mypkg/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

42
pkg/codegen/internal/test/testdata/output-funcs/python-extras/tests/test_codegen.py vendored
View file

@ -13,6 +13,7 @@
# limitations under the License.
import asyncio
import json
import pytest
@ -32,8 +33,20 @@ def my_mocks():
pulumi.runtime.settings.configure(old_settings)
@pytest.fixture
def my_preview_mocks():
old_settings = pulumi.runtime.settings.SETTINGS
try:
mocks = MyMocks()
pulumi.runtime.mocks.set_mocks(mocks, preview=True)
yield mocks
finally:
pulumi.runtime.settings.configure(old_settings)
class MyMocks(pulumi.runtime.Mocks):
def call(self, args):
if args.token in ['mypkg::funcWithAllOptionalInputs',
'mypkg::funcWithDefaultValue']:
a = args.args.get('a', None)
@ -49,6 +62,15 @@ class MyMocks(pulumi.runtime.Mocks):
'value': [args.args]}
if args.token == 'mypkg::listStorageAccountKeys':
if 'accountName' not in args.args or \
not args.args['accountName'] or \
pulumi.contains_unknowns(args.args['accountName']):
raise Exception(
'Missing required argument: '
'The argument "account_name" is required, '
'but no definition was found')
return {'keys': [
dict(creationTime='my-creation-time',
keyName='my-key-name',
@ -193,6 +215,15 @@ def test_list_storage_accounts(my_mocks):
)])
@pulumi.runtime.test
def test_preview_with_unknowns(my_preview_mocks):
def check(r):
assert False, 'check() should not be called when args contain unknowns'
return list_storage_account_keys_output(account_name=unknown()).apply(check)
def jstr(x):
return json.dumps(x, sort_keys=True)
@ -203,3 +234,14 @@ def r(x):
def out(x):
return pulumi.Output.from_input(x).apply(lambda x: x)
def unknown():
is_known_fut: asyncio.Future[bool] = asyncio.Future()
is_secret_fut: asyncio.Future[bool] = asyncio.Future()
is_known_fut.set_result(False)
is_secret_fut.set_result(False)
value_fut: asyncio.Future[Any] = asyncio.Future()
value_fut.set_result(pulumi.UNKNOWN)
return pulumi.Output(set(), value_fut, is_known_fut, is_secret_fut)

5
pkg/codegen/internal/test/testdata/output-funcs/python/pulumi_mypkg/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/plain-and-default/python/pulumi_foobar/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/plain-schema-gh6957/python/pulumi_xyz/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/provider-config-schema/python/pulumi_configstation/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/regress-node-8110/python/pulumi_my8110/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/replace-on-change/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/resource-args-python-case-insensitive/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/resource-args-python/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/resource-property-overlap/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-enum-schema/python/pulumi_plant/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-methods-schema-single-value-returns/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-methods-schema/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-plain-schema-with-root-package/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-plain-schema/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-resource-schema-custom-pypackage-name/python/custom_py_package/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-resource-schema/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/internal/test/testdata/simple-yaml-schema/python/pulumi_example/_utilities.py vendored
View file

@ -224,9 +224,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,

5
pkg/codegen/python/gen.go
View file

@ -3017,9 +3017,10 @@ def lift_output_func(func: typing.Any) -> typing.Callable[[_F], _F]:
def lifted_func(*args, opts=None, **kwargs):
bound_args = func_sig.bind(*args, **kwargs)
# Convert tuple to list, see pulumi/pulumi#8172
args_list = list(bound_args.args)
return pulumi.Output.from_input({
'args': bound_args.args,
'args': args_list,
'kwargs': bound_args.kwargs
}).apply(lambda resolved_args: func(*resolved_args['args'],
opts=opts,