Skip to content

Commit

Permalink
Merge pull request #17 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 authored Aug 31, 2020
2 parents bda4d40 + 502d522 commit ddff582
Show file tree
Hide file tree
Showing 21 changed files with 123 additions and 117 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+inc

require (
github.com/hashicorp/terraform-plugin-sdk v1.9.1
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-pagerduty v1.7.1
)
6 changes: 6 additions & 0 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,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 h1:5rBPG2Wnoqgbt4Fz1MbahtE4gLxaPdwI9sr1zaV6lUs=
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=
Expand All @@ -507,6 +509,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 @@ -518,6 +522,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/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d/go.mod h1:yv9XozKsue9ZELHQbrBGgIaFtE3OX3Q4m7koTzTqgpE=
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 h1:h+pUwgEser1Ole6TMCc66njRPcw7SEVXpeoClG+ihEM=
Expand Down
6 changes: 3 additions & 3 deletions sdk/python/pulumi_pagerduty/addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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

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

@property
@pulumi.getter
def src(self) -> str:
def src(self) -> pulumi.Output[str]:
"""
The source URL to display in a frame in the PagerDuty UI. `HTTPS` is required.
"""
Expand Down
16 changes: 8 additions & 8 deletions sdk/python/pulumi_pagerduty/business_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class BusinessService(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
description: Optional[pulumi.Input[str]] = None,
name: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -109,43 +109,43 @@ def get(resource_name: str,

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

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

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

@property
@pulumi.getter(name="pointOfContact")
def point_of_contact(self) -> Optional[str]:
def point_of_contact(self) -> pulumi.Output[Optional[str]]:
"""
The owner of the business service.
"""
return pulumi.get(self, "point_of_contact")

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

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

@property
@pulumi.getter
def type(self) -> Optional[str]:
def type(self) -> pulumi.Output[Optional[str]]:
"""
Default value is `business_service`. Can also be set as `business_service_reference`.
"""
Expand Down
12 changes: 6 additions & 6 deletions sdk/python/pulumi_pagerduty/escalation_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class EscalationPolicy(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
description: Optional[pulumi.Input[str]] = None,
name: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -121,36 +121,36 @@ def get(resource_name: str,

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

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

@property
@pulumi.getter(name="numLoops")
def num_loops(self) -> Optional[float]:
def num_loops(self) -> pulumi.Output[Optional[float]]:
"""
The number of times the escalation policy will repeat after reaching the end of its escalation.
"""
return pulumi.get(self, "num_loops")

@property
@pulumi.getter
def rules(self) -> List['outputs.EscalationPolicyRule']:
def rules(self) -> pulumi.Output[List['outputs.EscalationPolicyRule']]:
"""
An Escalation rule block. Escalation rules documented below.
"""
return pulumi.get(self, "rules")

@property
@pulumi.getter
def teams(self) -> Optional[List[str]]:
def teams(self) -> pulumi.Output[Optional[List[str]]]:
"""
Teams associated with the policy. Account must have the `teams` ability to use this parameter.
"""
Expand Down
10 changes: 5 additions & 5 deletions sdk/python/pulumi_pagerduty/event_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class EventRule(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
action_json: Optional[pulumi.Input[str]] = None,
advanced_condition_json: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -202,31 +202,31 @@ def get(resource_name: str,

@property
@pulumi.getter(name="actionJson")
def action_json(self) -> str:
def action_json(self) -> pulumi.Output[str]:
"""
A list of one or more actions for each rule. Each action within the list is itself a list.
"""
return pulumi.get(self, "action_json")

@property
@pulumi.getter(name="advancedConditionJson")
def advanced_condition_json(self) -> Optional[str]:
def advanced_condition_json(self) -> pulumi.Output[Optional[str]]:
"""
Contains a list of specific conditions including `active-between`,`scheduled-weekly`, and `frequency-over`. The first element in the list is the label for the condition, followed by a list of values for the specific condition. For more details on these conditions see [Advanced Condition](https://v2.developer.pagerduty.com/docs/global-event-rules-api#section-advanced-condition) in the PagerDuty API documentation.
"""
return pulumi.get(self, "advanced_condition_json")

@property
@pulumi.getter(name="catchAll")
def catch_all(self) -> bool:
def catch_all(self) -> pulumi.Output[bool]:
"""
A boolean that indicates whether the rule is a catch all for the account. This field is read-only through the PagerDuty API.
"""
return pulumi.get(self, "catch_all")

@property
@pulumi.getter(name="conditionJson")
def condition_json(self) -> str:
def condition_json(self) -> pulumi.Output[str]:
"""
Contains a list of conditions. The first field in the list is `and` or `or`, followed by a list of operators and values.
"""
Expand Down
16 changes: 8 additions & 8 deletions sdk/python/pulumi_pagerduty/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class Extension(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
config: Optional[pulumi.Input[str]] = None,
endpoint_url: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -151,15 +151,15 @@ def get(resource_name: str,

@property
@pulumi.getter
def config(self) -> Optional[str]:
def config(self) -> pulumi.Output[Optional[str]]:
"""
The configuration of the service extension as string containing plain JSON-encoded data.
"""
return pulumi.get(self, "config")

@property
@pulumi.getter(name="endpointUrl")
def endpoint_url(self) -> Optional[str]:
def endpoint_url(self) -> pulumi.Output[Optional[str]]:
"""
The url of the extension.
**Note:** The [endpoint URL is Optional API wise](https://api-reference.pagerduty.com/#!/Extensions/post_extensions) in most cases. But in some cases it is a _Required_ parameter. For example, `getExtensionSchema` named `Generic V2 Webhook` doesn't accept `Extension` with no `endpoint_url`, but one with named `Slack` accepts.
Expand All @@ -168,39 +168,39 @@ def endpoint_url(self) -> Optional[str]:

@property
@pulumi.getter(name="extensionObjects")
def extension_objects(self) -> List[str]:
def extension_objects(self) -> pulumi.Output[List[str]]:
"""
This is the objects for which the extension applies (An array of service ids).
"""
return pulumi.get(self, "extension_objects")

@property
@pulumi.getter(name="extensionSchema")
def extension_schema(self) -> str:
def extension_schema(self) -> pulumi.Output[str]:
"""
This is the schema for this extension.
"""
return pulumi.get(self, "extension_schema")

@property
@pulumi.getter(name="htmlUrl")
def html_url(self) -> str:
def html_url(self) -> pulumi.Output[str]:
"""
URL at which the entity is uniquely displayed in the Web app
"""
return pulumi.get(self, "html_url")

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

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

def translate_output_property(self, prop):
Expand Down
10 changes: 5 additions & 5 deletions sdk/python/pulumi_pagerduty/maintenance_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class MaintenanceWindow(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
description: Optional[pulumi.Input[str]] = None,
end_time: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -111,31 +111,31 @@ def get(resource_name: str,

@property
@pulumi.getter
def description(self) -> Optional[str]:
def description(self) -> pulumi.Output[Optional[str]]:
"""
A description for the maintenance window.
"""
return pulumi.get(self, "description")

@property
@pulumi.getter(name="endTime")
def end_time(self) -> str:
def end_time(self) -> pulumi.Output[str]:
"""
The maintenance window's end time. This is when the services will start creating incidents again. This date must be in the future and after the `start_time`.
"""
return pulumi.get(self, "end_time")

@property
@pulumi.getter
def services(self) -> List[str]:
def services(self) -> pulumi.Output[List[str]]:
"""
A list of service IDs to include in the maintenance window.
"""
return pulumi.get(self, "services")

@property
@pulumi.getter(name="startTime")
def start_time(self) -> str:
def start_time(self) -> pulumi.Output[str]:
"""
The maintenance window's start time. This is when the services will stop creating incidents. If this date is in the past, it will be updated to be the current time.
"""
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_pagerduty/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class Provider(pulumi.ProviderResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
skip_credentials_validation: Optional[pulumi.Input[bool]] = None,
token: Optional[pulumi.Input[str]] = None,
Expand Down
10 changes: 5 additions & 5 deletions sdk/python/pulumi_pagerduty/ruleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class Ruleset(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
name: Optional[pulumi.Input[str]] = None,
team: Optional[pulumi.Input[pulumi.InputType['RulesetTeamArgs']]] = None,
Expand Down Expand Up @@ -101,31 +101,31 @@ def get(resource_name: str,

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

@property
@pulumi.getter(name="routingKeys")
def routing_keys(self) -> List[str]:
def routing_keys(self) -> pulumi.Output[List[str]]:
"""
Routing keys routed to this ruleset.
"""
return pulumi.get(self, "routing_keys")

@property
@pulumi.getter
def team(self) -> Optional['outputs.RulesetTeam']:
def team(self) -> pulumi.Output[Optional['outputs.RulesetTeam']]:
"""
Reference to the team that owns the ruleset. If none is specified, only admins have access.
"""
return pulumi.get(self, "team")

@property
@pulumi.getter
def type(self) -> str:
def type(self) -> pulumi.Output[str]:
"""
Type of ruleset. Currently only sets to `global`.
"""
Expand Down
Loading

0 comments on commit ddff582

Please sign in to comment.