Skip to content

Commit

Permalink
Upgrade pulumi-terraform-bridge to v3.63.2 (#247)
Browse files Browse the repository at this point in the history
This PR was generated via `$ upgrade-provider pulumi/pulumi-tailscale
--kind=bridge --pr-reviewers=t0yv0`.

---

- Upgrading pulumi-terraform-bridge from v3.63.1 to v3.63.2.
  • Loading branch information
pulumi-bot committed Oct 28, 2023
1 parent ca6e7e6 commit 3f70c1d
Show file tree
Hide file tree
Showing 23 changed files with 85 additions and 500 deletions.
4 changes: 2 additions & 2 deletions examples/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/pulumi/pulumi-tailscale/examples

go 1.21

require github.com/pulumi/pulumi/pkg/v3 v3.90.1
require github.com/pulumi/pulumi/pkg/v3 v3.91.1

require (
cloud.google.com/go v0.110.4 // indirect
Expand Down Expand Up @@ -135,7 +135,7 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/esc v0.5.6 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.90.1 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.91.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions examples/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1436,10 +1436,10 @@ github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGO
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI=
github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04=
github.com/pulumi/pulumi/pkg/v3 v3.90.1 h1:RFC/eqTbDfIvfeVQL8WaPmyQr1KzZhAGIIDGr9jj9y8=
github.com/pulumi/pulumi/pkg/v3 v3.90.1/go.mod h1:J+WbfN30g3FfQifpLjQPI0UhPsC9ASEePLK8Nix06A8=
github.com/pulumi/pulumi/sdk/v3 v3.90.1 h1:iT4t57N92WGhEQtg+KVDEmYzgfEyri39eihQzcNmtrM=
github.com/pulumi/pulumi/sdk/v3 v3.90.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
github.com/pulumi/pulumi/pkg/v3 v3.91.1 h1:xHnyEwJO9we2zCiM9gHTkJxjZ6a6yi5vYCwWHCYRj9Y=
github.com/pulumi/pulumi/pkg/v3 v3.91.1/go.mod h1:dzBQDJyCOEhtBVN5INA5/i9yG9DZlsStl/mAkrhs9II=
github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA=
github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
Expand Down
6 changes: 3 additions & 3 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraf

require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.1
github.com/pulumi/pulumi/sdk/v3 v3.90.1
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.2
github.com/pulumi/pulumi/sdk/v3 v3.91.1
github.com/tailscale/terraform-provider-tailscale v0.13.11
)

Expand Down Expand Up @@ -173,7 +173,7 @@ require (
github.com/pulumi/pulumi-java/pkg v0.9.8 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 // indirect
github.com/pulumi/pulumi-yaml v1.2.2 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.90.1 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.91.1 // 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
Expand Down
12 changes: 6 additions & 6 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2176,16 +2176,16 @@ github.com/pulumi/pulumi-java/pkg v0.9.8 h1:c8mYsalnRXA2Ibgvv6scefOn6mW1Vb0UT0mc
github.com/pulumi/pulumi-java/pkg v0.9.8/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1/go.mod h1:7OeUPH8rpt5ipyj9EFcnXpuzQ8SHL0dyqdfa8nOacdk=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.1 h1:hBgediyT2LdS5yfD5AMiCmBJ/TYP94Xxv6a4TcAfV0g=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.1/go.mod h1:6YVbDo019OeHkQWo9MnUbBy6cCgCQeoXZDjmR9SYmUA=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.2 h1:6JRJz3Wk7O9OhNFbxCrNvPVQAK+prBm6XBuSlIVqRnU=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.63.2/go.mod h1:ye7JUFqTNbBh6ohcr1KpyXNv+kYFYvZAIqXqts4Ialc=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 h1:rIzMmtcVpPX8ynaz6/nW5AHNY63DiNfCohqmxWvMpM4=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4/go.mod h1:Kt8RIZWa/N8rW3+0g6NrqCBmF3o+HuIhFaZpssEkG6w=
github.com/pulumi/pulumi-yaml v1.2.2 h1:W6BeUBLhDrJ2GSU0em1AUVelG9PBI4ABY61DdhJOO3E=
github.com/pulumi/pulumi-yaml v1.2.2/go.mod h1:EgakC7b/4+VBNnlgM1RZIea2gUstV8s/7bdFJZt0P64=
github.com/pulumi/pulumi/pkg/v3 v3.90.1 h1:RFC/eqTbDfIvfeVQL8WaPmyQr1KzZhAGIIDGr9jj9y8=
github.com/pulumi/pulumi/pkg/v3 v3.90.1/go.mod h1:J+WbfN30g3FfQifpLjQPI0UhPsC9ASEePLK8Nix06A8=
github.com/pulumi/pulumi/sdk/v3 v3.90.1 h1:iT4t57N92WGhEQtg+KVDEmYzgfEyri39eihQzcNmtrM=
github.com/pulumi/pulumi/sdk/v3 v3.90.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
github.com/pulumi/pulumi/pkg/v3 v3.91.1 h1:xHnyEwJO9we2zCiM9gHTkJxjZ6a6yi5vYCwWHCYRj9Y=
github.com/pulumi/pulumi/pkg/v3 v3.91.1/go.mod h1:dzBQDJyCOEhtBVN5INA5/i9yG9DZlsStl/mAkrhs9II=
github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA=
github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
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=
Expand Down
2 changes: 1 addition & 1 deletion sdk/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/blang/semver v3.5.1+incompatible
github.com/pulumi/pulumi/sdk/v3 v3.90.1
github.com/pulumi/pulumi/sdk/v3 v3.91.1
)

require (
Expand Down
4 changes: 2 additions & 2 deletions sdk/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI=
github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04=
github.com/pulumi/pulumi/sdk/v3 v3.90.1 h1:iT4t57N92WGhEQtg+KVDEmYzgfEyri39eihQzcNmtrM=
github.com/pulumi/pulumi/sdk/v3 v3.90.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA=
github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
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=
Expand Down
19 changes: 0 additions & 19 deletions sdk/python/pulumi_tailscale/_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,24 +246,5 @@ def lifted_func(*args, opts=None, **kwargs):

return (lambda _: lifted_func)


def configure(val, cls: type, input: bool):
def _apply(v):
if isinstance(v, typing.Mapping):
def _setter(key, value):
v[key] = value
cls._configure(_setter, **v)
return v

# Check that cls has a static _configure method. External classes may
# not have it if it was generated with older codegen.
if hasattr(cls, "_configure"):
if isinstance(val, typing.Mapping):
return _apply(val)
elif input and val is not None and not isinstance(val, cls):
return pulumi.Output.from_input(val).apply(_apply)

return val

def get_plugin_download_url():
return None
34 changes: 3 additions & 31 deletions sdk/python/pulumi_tailscale/acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
from typing import Any, Mapping, Optional, Sequence, Union, overload
from . import _utilities

__all__ = ['AclArgs', 'Acl']
Expand All @@ -19,20 +19,7 @@ def __init__(__self__, *,
The set of arguments for constructing a Acl resource.
:param pulumi.Input[str] acl: The JSON-based policy that defines which devices and users are allowed to connect in your network
"""
AclArgs._configure(
lambda key, value: pulumi.set(__self__, key, value),
acl=acl,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
acl: Optional[pulumi.Input[str]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if acl is None:
raise TypeError("Missing 'acl' argument")

_setter("acl", acl)
pulumi.set(__self__, "acl", acl)

@property
@pulumi.getter
Expand All @@ -55,19 +42,8 @@ def __init__(__self__, *,
Input properties used for looking up and filtering Acl resources.
:param pulumi.Input[str] acl: The JSON-based policy that defines which devices and users are allowed to connect in your network
"""
_AclState._configure(
lambda key, value: pulumi.set(__self__, key, value),
acl=acl,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
acl: Optional[pulumi.Input[str]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):

if acl is not None:
_setter("acl", acl)
pulumi.set(__self__, "acl", acl)

@property
@pulumi.getter
Expand Down Expand Up @@ -147,10 +123,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
if resource_args is not None:
__self__._internal_init(resource_name, opts, **resource_args.__dict__)
else:
kwargs = kwargs or {}
def _setter(key, value):
kwargs[key] = value
AclArgs._configure(_setter, **kwargs)
__self__._internal_init(resource_name, *args, **kwargs)

def _internal_init(__self__,
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_tailscale/config/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import copy
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
from typing import Any, Mapping, Optional, Sequence, Union, overload
from .. import _utilities

apiKey: Optional[str]
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_tailscale/config/vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
from typing import Any, Mapping, Optional, Sequence, Union, overload
from .. import _utilities

import types
Expand Down
48 changes: 5 additions & 43 deletions sdk/python/pulumi_tailscale/device_authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
from typing import Any, Mapping, Optional, Sequence, Union, overload
from . import _utilities

__all__ = ['DeviceAuthorizationArgs', 'DeviceAuthorization']
Expand All @@ -21,27 +21,8 @@ def __init__(__self__, *,
:param pulumi.Input[bool] authorized: Whether or not the device is authorized
:param pulumi.Input[str] device_id: The device to set as authorized
"""
DeviceAuthorizationArgs._configure(
lambda key, value: pulumi.set(__self__, key, value),
authorized=authorized,
device_id=device_id,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
authorized: Optional[pulumi.Input[bool]] = None,
device_id: Optional[pulumi.Input[str]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if authorized is None:
raise TypeError("Missing 'authorized' argument")
if device_id is None and 'deviceId' in kwargs:
device_id = kwargs['deviceId']
if device_id is None:
raise TypeError("Missing 'device_id' argument")

_setter("authorized", authorized)
_setter("device_id", device_id)
pulumi.set(__self__, "authorized", authorized)
pulumi.set(__self__, "device_id", device_id)

@property
@pulumi.getter
Expand Down Expand Up @@ -78,25 +59,10 @@ def __init__(__self__, *,
:param pulumi.Input[bool] authorized: Whether or not the device is authorized
:param pulumi.Input[str] device_id: The device to set as authorized
"""
_DeviceAuthorizationState._configure(
lambda key, value: pulumi.set(__self__, key, value),
authorized=authorized,
device_id=device_id,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
authorized: Optional[pulumi.Input[bool]] = None,
device_id: Optional[pulumi.Input[str]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if device_id is None and 'deviceId' in kwargs:
device_id = kwargs['deviceId']

if authorized is not None:
_setter("authorized", authorized)
pulumi.set(__self__, "authorized", authorized)
if device_id is not None:
_setter("device_id", device_id)
pulumi.set(__self__, "device_id", device_id)

@property
@pulumi.getter
Expand Down Expand Up @@ -182,10 +148,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
if resource_args is not None:
__self__._internal_init(resource_name, opts, **resource_args.__dict__)
else:
kwargs = kwargs or {}
def _setter(key, value):
kwargs[key] = value
DeviceAuthorizationArgs._configure(_setter, **kwargs)
__self__._internal_init(resource_name, *args, **kwargs)

def _internal_init(__self__,
Expand Down
50 changes: 5 additions & 45 deletions sdk/python/pulumi_tailscale/device_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
from typing import Any, Mapping, Optional, Sequence, Union, overload
from . import _utilities

__all__ = ['DeviceKeyArgs', 'DeviceKey']
Expand All @@ -21,28 +21,9 @@ def __init__(__self__, *,
:param pulumi.Input[str] device_id: The device to update the key properties of
:param pulumi.Input[bool] key_expiry_disabled: Determines whether or not the device's key will expire
"""
DeviceKeyArgs._configure(
lambda key, value: pulumi.set(__self__, key, value),
device_id=device_id,
key_expiry_disabled=key_expiry_disabled,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
device_id: Optional[pulumi.Input[str]] = None,
key_expiry_disabled: Optional[pulumi.Input[bool]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if device_id is None and 'deviceId' in kwargs:
device_id = kwargs['deviceId']
if device_id is None:
raise TypeError("Missing 'device_id' argument")
if key_expiry_disabled is None and 'keyExpiryDisabled' in kwargs:
key_expiry_disabled = kwargs['keyExpiryDisabled']

_setter("device_id", device_id)
pulumi.set(__self__, "device_id", device_id)
if key_expiry_disabled is not None:
_setter("key_expiry_disabled", key_expiry_disabled)
pulumi.set(__self__, "key_expiry_disabled", key_expiry_disabled)

@property
@pulumi.getter(name="deviceId")
Expand Down Expand Up @@ -79,27 +60,10 @@ def __init__(__self__, *,
:param pulumi.Input[str] device_id: The device to update the key properties of
:param pulumi.Input[bool] key_expiry_disabled: Determines whether or not the device's key will expire
"""
_DeviceKeyState._configure(
lambda key, value: pulumi.set(__self__, key, value),
device_id=device_id,
key_expiry_disabled=key_expiry_disabled,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
device_id: Optional[pulumi.Input[str]] = None,
key_expiry_disabled: Optional[pulumi.Input[bool]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if device_id is None and 'deviceId' in kwargs:
device_id = kwargs['deviceId']
if key_expiry_disabled is None and 'keyExpiryDisabled' in kwargs:
key_expiry_disabled = kwargs['keyExpiryDisabled']

if device_id is not None:
_setter("device_id", device_id)
pulumi.set(__self__, "device_id", device_id)
if key_expiry_disabled is not None:
_setter("key_expiry_disabled", key_expiry_disabled)
pulumi.set(__self__, "key_expiry_disabled", key_expiry_disabled)

@property
@pulumi.getter(name="deviceId")
Expand Down Expand Up @@ -185,10 +149,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
if resource_args is not None:
__self__._internal_init(resource_name, opts, **resource_args.__dict__)
else:
kwargs = kwargs or {}
def _setter(key, value):
kwargs[key] = value
DeviceKeyArgs._configure(_setter, **kwargs)
__self__._internal_init(resource_name, *args, **kwargs)

def _internal_init(__self__,
Expand Down
Loading

0 comments on commit 3f70c1d

Please sign in to comment.