Skip to content

Commit

Permalink
Merge pull request #129 from pulumi/bridge-v2.7.3
Browse files Browse the repository at this point in the history 
Upgrade to pulumi-terraform-bridge v2.7.3
  • Loading branch information
@stack72
stack72 authored Aug 31, 2020
2 parents 8927c09 + 491f4ed commit bb71cf8
Show file tree
Hide file tree
Showing 34 changed files with 294 additions and 288 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
* Upgrade to pulumi-terraform-bridge v2.7.0
* Upgrade to pulumi-terraform-bridge v2.7.3
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python

---
Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.14

require (
github.com/hashicorp/terraform-plugin-sdk v1.7.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd
github.com/terraform-providers/terraform-provider-digitalocean v1.19.0
)

Expand Down
6 changes: 6 additions & 0 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,8 @@ github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.2 h1:2fZdQQ1uO1D7J1O8D5ytsaPwz
github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.2/go.mod h1:lxWrXLYAMbse0AJeY570Iy2KYI3uUwNg6JOUZ6U7M+Q=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2 h1:ZgBUEz1zPN1p8el+YDXoRlOPSPcBz8ytfZH6Ncj/PN4=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2/go.mod h1:UvbLRW8+YFluKwRZjzP3coPYWQPPYh/q9e2NN2GPbxg=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3 h1:XZxl0fsf9vO45FM+tKPYE9f30fM+q2s6lHsEzkdnBNs=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3/go.mod h1:TW+CNCZHzlH42y0vmRA9gOzeTFh3Cp7MN9DoGcRDLvo=
github.com/pulumi/pulumi/pkg/v2 v2.0.0/go.mod h1:kNG9MBTdKP9AzMgkETumR3fmX9gUYB+HpQL767K6jXc=
github.com/pulumi/pulumi/pkg/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:GV88eCIrqfFcBWd5QUdN3qMsR0h+x+iRIBnBhhvB78A=
github.com/pulumi/pulumi/pkg/v2 v2.3.1-0.20200607162109-9754465b04db h1:5HrO1GNA53QEp+yN1UCX7BUsJD2I5/k1u2KLO4hOxOA=
Expand All @@ -840,6 +842,8 @@ github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200630091945-bb358c4d2173 h1:7nc8B91a
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200630091945-bb358c4d2173/go.mod h1:zfUm4/GH2dVRlHZ3Yeb9bRweCQM7icVBdplu6MUDRrQ=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213 h1:c8UQ842Zg6XzX4sPeGhBo8hiGFzoU23vaMmxk64V8eU=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd h1:e4nK2jqLm6g7qMW0BInHR3ZM55y1NblvgOlkfNGT2F4=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
github.com/pulumi/pulumi/sdk/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
Expand All @@ -851,6 +855,8 @@ github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200630091945-bb358c4d2173 h1:tKAYUvIW
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200630091945-bb358c4d2173/go.mod h1:llk6tmXss8kJrt3vEXAkwiwgZOuINEFmKIfMveVIwO8=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213 h1:h4hBtS6/S0a1deLtJuUuYAIZGOCIJY9OVSdmC4VRk+M=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd h1:m5jEWpbr/Q94vCqA/7fw5US7cHZLeQiMQXrnSblZzdU=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200616132413-016bf6859393 h1:dOaePp2GQPxMhe+1nokbs5VDgrYPP5S2jACrD6ecXYM=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200616132413-016bf6859393/go.mod h1:fmkoHCZCH38dQOOHhKGDgYZBvq1NfFWKV98XAmakYIM=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
Expand Down
14 changes: 7 additions & 7 deletions sdk/python/pulumi_digitalocean/cdn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class Cdn(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
certificate_id: Optional[pulumi.Input[str]] = None,
custom_domain: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -137,47 +137,47 @@ def get(resource_name: str,

@property
@pulumi.getter(name="certificateId")
def certificate_id(self) -> Optional[str]:
def certificate_id(self) -> pulumi.Output[Optional[str]]:
"""
The ID of a DigitalOcean managed TLS certificate used for SSL when a custom subdomain is provided.
"""
return pulumi.get(self, "certificate_id")

@property
@pulumi.getter(name="createdAt")
def created_at(self) -> str:
def created_at(self) -> pulumi.Output[str]:
"""
The date and time when the CDN Endpoint was created.
"""
return pulumi.get(self, "created_at")

@property
@pulumi.getter(name="customDomain")
def custom_domain(self) -> Optional[str]:
def custom_domain(self) -> pulumi.Output[Optional[str]]:
"""
The fully qualified domain name (FQDN) of the custom subdomain used with the CDN Endpoint.
"""
return pulumi.get(self, "custom_domain")

@property
@pulumi.getter
def endpoint(self) -> str:
def endpoint(self) -> pulumi.Output[str]:
"""
The fully qualified domain name (FQDN) from which the CDN-backed content is served.
"""
return pulumi.get(self, "endpoint")

@property
@pulumi.getter
def origin(self) -> str:
def origin(self) -> pulumi.Output[str]:
"""
The fully qualified domain name, (FQDN) for a Space.
"""
return pulumi.get(self, "origin")

@property
@pulumi.getter
def ttl(self) -> float:
def ttl(self) -> pulumi.Output[float]:
"""
The time to live for the CDN Endpoint, in seconds. Default is 3600 seconds.
"""
Expand Down
20 changes: 10 additions & 10 deletions sdk/python/pulumi_digitalocean/certificate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class Certificate(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
certificate_chain: Optional[pulumi.Input[str]] = None,
domains: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
Expand Down Expand Up @@ -181,7 +181,7 @@ def get(resource_name: str,

@property
@pulumi.getter(name="certificateChain")
def certificate_chain(self) -> Optional[str]:
def certificate_chain(self) -> pulumi.Output[Optional[str]]:
"""
The full PEM-formatted trust chain
between the certificate authority's certificate and your domain's TLS
Expand All @@ -191,7 +191,7 @@ def certificate_chain(self) -> Optional[str]:

@property
@pulumi.getter
def domains(self) -> Optional[List[str]]:
def domains(self) -> pulumi.Output[Optional[List[str]]]:
"""
List of fully qualified domain names (FQDNs) for
which the certificate will be issued. The domains must be managed using
Expand All @@ -201,7 +201,7 @@ def domains(self) -> Optional[List[str]]:

@property
@pulumi.getter(name="leafCertificate")
def leaf_certificate(self) -> Optional[str]:
def leaf_certificate(self) -> pulumi.Output[Optional[str]]:
"""
The contents of a PEM-formatted public
TLS certificate. Only valid when type is `custom`.
Expand All @@ -210,23 +210,23 @@ def leaf_certificate(self) -> Optional[str]:

@property
@pulumi.getter
def name(self) -> str:
def name(self) -> pulumi.Output[str]:
"""
The name of the certificate for identification.
"""
return pulumi.get(self, "name")

@property
@pulumi.getter(name="notAfter")
def not_after(self) -> str:
def not_after(self) -> pulumi.Output[str]:
"""
The expiration date of the certificate
"""
return pulumi.get(self, "not_after")

@property
@pulumi.getter(name="privateKey")
def private_key(self) -> Optional[str]:
def private_key(self) -> pulumi.Output[Optional[str]]:
"""
The contents of a PEM-formatted private-key
corresponding to the SSL certificate. Only valid when type is `custom`.
Expand All @@ -235,20 +235,20 @@ def private_key(self) -> Optional[str]:

@property
@pulumi.getter(name="sha1Fingerprint")
def sha1_fingerprint(self) -> str:
def sha1_fingerprint(self) -> pulumi.Output[str]:
"""
The SHA-1 fingerprint of the certificate
"""
return pulumi.get(self, "sha1_fingerprint")

@property
@pulumi.getter
def state(self) -> str:
def state(self) -> pulumi.Output[str]:
return pulumi.get(self, "state")

@property
@pulumi.getter
def type(self) -> Optional[str]:
def type(self) -> pulumi.Output[Optional[str]]:
"""
The type of certificate to provision. Can be either
`custom` or `lets_encrypt`. Defaults to `custom`.
Expand Down
8 changes: 4 additions & 4 deletions sdk/python/pulumi_digitalocean/container_registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class ContainerRegistry(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
name: Optional[pulumi.Input[str]] = None,
__props__=None,
Expand Down Expand Up @@ -90,20 +90,20 @@ def get(resource_name: str,

@property
@pulumi.getter
def endpoint(self) -> str:
def endpoint(self) -> pulumi.Output[str]:
return pulumi.get(self, "endpoint")

@property
@pulumi.getter
def name(self) -> str:
def name(self) -> pulumi.Output[str]:
"""
The name of the container_registry
"""
return pulumi.get(self, "name")

@property
@pulumi.getter(name="serverUrl")
def server_url(self) -> str:
def server_url(self) -> pulumi.Output[str]:
return pulumi.get(self, "server_url")

def translate_output_property(self, prop):
Expand Down
12 changes: 6 additions & 6 deletions sdk/python/pulumi_digitalocean/container_registry_docker_credentials.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class ContainerRegistryDockerCredentials(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
expiry_seconds: Optional[pulumi.Input[float]] = None,
registry_name: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -118,33 +118,33 @@ def get(resource_name: str,

@property
@pulumi.getter(name="credentialExpirationTime")
def credential_expiration_time(self) -> str:
def credential_expiration_time(self) -> pulumi.Output[str]:
return pulumi.get(self, "credential_expiration_time")

@property
@pulumi.getter(name="dockerCredentials")
def docker_credentials(self) -> str:
def docker_credentials(self) -> pulumi.Output[str]:
return pulumi.get(self, "docker_credentials")

@property
@pulumi.getter(name="expirySeconds")
def expiry_seconds(self) -> Optional[float]:
def expiry_seconds(self) -> pulumi.Output[Optional[float]]:
"""
The amount of time to pass before the Docker credentials expire in seconds. Defaults to 2147483647, or roughly 68 years. Must be greater than 0 and less than 2147483647.
"""
return pulumi.get(self, "expiry_seconds")

@property
@pulumi.getter(name="registryName")
def registry_name(self) -> str:
def registry_name(self) -> pulumi.Output[str]:
"""
The name of the container registry.
"""
return pulumi.get(self, "registry_name")

@property
@pulumi.getter
def write(self) -> Optional[bool]:
def write(self) -> pulumi.Output[Optional[bool]]:
"""
Allow for write access to the container registry. Defaults to false.
"""
Expand Down
Loading

0 comments on commit bb71cf8

Please sign in to comment.