Skip to content

Commit

Permalink
Upgrade to Pulumi v2.12.0 and pulumi-terraform-bridge v2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Oct 18, 2020
1 parent 477f64a commit 6efa9a9
Show file tree
Hide file tree
Showing 43 changed files with 5,242 additions and 5,226 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)
_(none)_
* Upgrade to Pulumi v2.12.0 and pulumi-terraform-bridge v2.11.0

---

Expand Down
3 changes: 0 additions & 3 deletions provider/cmd/pulumi-resource-datadog/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
name: datadog
description: A Pulumi resource provider for datadog.
language: schema
3,302 changes: 1,651 additions & 1,651 deletions provider/cmd/pulumi-resource-datadog/schema.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ go 1.14

require (
github.com/hashicorp/terraform-plugin-sdk v1.15.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.8.0
github.com/pulumi/pulumi/sdk/v2 v2.10.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.11.0
github.com/pulumi/pulumi/sdk/v2 v2.12.0
github.com/terraform-providers/terraform-provider-datadog v1.9.1-0.20200722132015-43f01ca20637
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
github.com/hashicorp/terraform-plugin-test => github.com/hashicorp/terraform-plugin-test v1.3.0
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
github.com/terraform-providers/terraform-provider-datadog => github.com/pulumi/terraform-provider-datadog v1.9.1-0.20200917105147-afdca33046c0
)
192 changes: 111 additions & 81 deletions provider/go.sum

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/pulumi/pulumi-terraform-bridge/v2/pkg/tfbridge"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
"github.com/terraform-providers/terraform-provider-datadog/datadog"
shimv1 "github.com/pulumi/pulumi-terraform-bridge/v2/pkg/tfshim/sdk-v1"
)

const (
Expand Down Expand Up @@ -50,7 +51,7 @@ func makeDataSource(mod string, res string) tokens.ModuleMember {
}

func Provider() tfbridge.ProviderInfo {
p := datadog.Provider().(*schema.Provider)
p := shimv1.NewProvider(datadog.Provider().(*schema.Provider))
prov := tfbridge.ProviderInfo{
P: p,
Name: "datadog",
Expand Down
3 changes: 0 additions & 3 deletions sdk/dotnet/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
name: datadog
description: A Pulumi resource provider for datadog.
language: dotnet
3 changes: 0 additions & 3 deletions sdk/go/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
name: datadog
description: A Pulumi resource provider for datadog.
language: go
3 changes: 0 additions & 3 deletions sdk/nodejs/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
name: datadog
description: A Pulumi resource provider for datadog.
language: nodejs
3 changes: 0 additions & 3 deletions sdk/python/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
name: datadog
description: A Pulumi resource provider for datadog.
language: python
3,866 changes: 1,933 additions & 1,933 deletions sdk/python/pulumi_datadog/_inputs.py

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions sdk/python/pulumi_datadog/aws/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from .. import _utilities, _tables

__all__ = ['Integration']
Expand All @@ -17,9 +17,9 @@ def __init__(__self__,
opts: Optional[pulumi.ResourceOptions] = None,
account_id: Optional[pulumi.Input[str]] = None,
account_specific_namespace_rules: Optional[pulumi.Input[Mapping[str, Any]]] = None,
excluded_regions: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
filter_tags: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
host_tags: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
excluded_regions: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
filter_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
host_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
role_name: Optional[pulumi.Input[str]] = None,
__props__=None,
__name__=None,
Expand Down Expand Up @@ -95,10 +95,10 @@ def get(resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
account_id: Optional[pulumi.Input[str]] = None,
account_specific_namespace_rules: Optional[pulumi.Input[Mapping[str, Any]]] = None,
excluded_regions: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
excluded_regions: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
external_id: Optional[pulumi.Input[str]] = None,
filter_tags: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
host_tags: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
filter_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
host_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
role_name: Optional[pulumi.Input[str]] = None) -> 'Integration':
"""
Get an existing Integration resource's state with the given name, id, and optional extra
Expand Down Expand Up @@ -133,7 +133,7 @@ def account_specific_namespace_rules(self) -> pulumi.Output[Optional[Mapping[str

@property
@pulumi.getter(name="excludedRegions")
def excluded_regions(self) -> pulumi.Output[Optional[List[str]]]:
def excluded_regions(self) -> pulumi.Output[Optional[Sequence[str]]]:
return pulumi.get(self, "excluded_regions")

@property
Expand All @@ -143,12 +143,12 @@ def external_id(self) -> pulumi.Output[str]:

@property
@pulumi.getter(name="filterTags")
def filter_tags(self) -> pulumi.Output[Optional[List[str]]]:
def filter_tags(self) -> pulumi.Output[Optional[Sequence[str]]]:
return pulumi.get(self, "filter_tags")

@property
@pulumi.getter(name="hostTags")
def host_tags(self) -> pulumi.Output[Optional[List[str]]]:
def host_tags(self) -> pulumi.Output[Optional[Sequence[str]]]:
return pulumi.get(self, "host_tags")

@property
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_datadog/aws/integration_lambda_arn.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from .. import _utilities, _tables

__all__ = ['IntegrationLambdaArn']
Expand Down
8 changes: 4 additions & 4 deletions sdk/python/pulumi_datadog/aws/integration_log_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from .. import _utilities, _tables

__all__ = ['IntegrationLogCollection']
Expand All @@ -16,7 +16,7 @@ def __init__(__self__,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
account_id: Optional[pulumi.Input[str]] = None,
services: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
services: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
__props__=None,
__name__=None,
__opts__=None):
Expand Down Expand Up @@ -72,7 +72,7 @@ def get(resource_name: str,
id: pulumi.Input[str],
opts: Optional[pulumi.ResourceOptions] = None,
account_id: Optional[pulumi.Input[str]] = None,
services: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None) -> 'IntegrationLogCollection':
services: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None) -> 'IntegrationLogCollection':
"""
Get an existing IntegrationLogCollection resource's state with the given name, id, and optional extra
properties used to qualify the lookup.
Expand All @@ -96,7 +96,7 @@ def account_id(self) -> pulumi.Output[str]:

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

def translate_output_property(self, prop):
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_datadog/azure/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from .. import _utilities, _tables

__all__ = ['Integration']
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/pulumi_datadog/config/vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from .. import _utilities, _tables

__all__ = [
Expand Down
58 changes: 29 additions & 29 deletions sdk/python/pulumi_datadog/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
from typing import Any, Mapping, Optional, Sequence, Union
from . import _utilities, _tables
from . import outputs
from ._inputs import *
Expand All @@ -17,16 +17,16 @@ class Dashboard(pulumi.CustomResource):
def __init__(__self__,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
dashboard_lists: Optional[pulumi.Input[List[pulumi.Input[float]]]] = None,
dashboard_lists: Optional[pulumi.Input[Sequence[pulumi.Input[int]]]] = None,
description: Optional[pulumi.Input[str]] = None,
is_read_only: Optional[pulumi.Input[bool]] = None,
layout_type: Optional[pulumi.Input[str]] = None,
notify_lists: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
template_variable_presets: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]]] = None,
template_variables: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]]] = None,
notify_lists: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
template_variable_presets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]]] = None,
template_variables: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]]] = None,
title: Optional[pulumi.Input[str]] = None,
url: Optional[pulumi.Input[str]] = None,
widgets: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]]] = None,
widgets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]]] = None,
__props__=None,
__name__=None,
__opts__=None):
Expand Down Expand Up @@ -673,16 +673,16 @@ def __init__(__self__,
:param str resource_name: The name of the resource.
:param pulumi.ResourceOptions opts: Options for the resource.
:param pulumi.Input[List[pulumi.Input[float]]] dashboard_lists: The list of dashboard lists this dashboard belongs to.
:param pulumi.Input[Sequence[pulumi.Input[int]]] dashboard_lists: The list of dashboard lists this dashboard belongs to.
:param pulumi.Input[str] description: The description of the dashboard.
:param pulumi.Input[bool] is_read_only: Whether this dashboard is read-only.
:param pulumi.Input[str] layout_type: The layout type of the dashboard, either 'free' or 'ordered'.
:param pulumi.Input[List[pulumi.Input[str]]] notify_lists: The list of handles of users to notify when changes are made to this dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]] template_variable_presets: The list of selectable template variable presets for this dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]] template_variables: The list of template variables for this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[str]]] notify_lists: The list of handles of users to notify when changes are made to this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]] template_variable_presets: The list of selectable template variable presets for this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]] template_variables: The list of template variables for this dashboard.
:param pulumi.Input[str] title: The title of the dashboard.
:param pulumi.Input[str] url: The URL of the dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]] widgets: The list of widgets to display on the dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]] widgets: The list of widgets to display on the dashboard.
"""
if __name__ is not None:
warnings.warn("explicit use of __name__ is deprecated", DeprecationWarning)
Expand Down Expand Up @@ -728,35 +728,35 @@ def __init__(__self__,
def get(resource_name: str,
id: pulumi.Input[str],
opts: Optional[pulumi.ResourceOptions] = None,
dashboard_lists: Optional[pulumi.Input[List[pulumi.Input[float]]]] = None,
dashboard_lists_removeds: Optional[pulumi.Input[List[pulumi.Input[float]]]] = None,
dashboard_lists: Optional[pulumi.Input[Sequence[pulumi.Input[int]]]] = None,
dashboard_lists_removeds: Optional[pulumi.Input[Sequence[pulumi.Input[int]]]] = None,
description: Optional[pulumi.Input[str]] = None,
is_read_only: Optional[pulumi.Input[bool]] = None,
layout_type: Optional[pulumi.Input[str]] = None,
notify_lists: Optional[pulumi.Input[List[pulumi.Input[str]]]] = None,
template_variable_presets: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]]] = None,
template_variables: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]]] = None,
notify_lists: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
template_variable_presets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]]] = None,
template_variables: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]]] = None,
title: Optional[pulumi.Input[str]] = None,
url: Optional[pulumi.Input[str]] = None,
widgets: Optional[pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]]] = None) -> 'Dashboard':
widgets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]]] = None) -> 'Dashboard':
"""
Get an existing Dashboard resource's state with the given name, id, and optional extra
properties used to qualify the lookup.
:param str resource_name: The unique name of the resulting resource.
:param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
:param pulumi.ResourceOptions opts: Options for the resource.
:param pulumi.Input[List[pulumi.Input[float]]] dashboard_lists: The list of dashboard lists this dashboard belongs to.
:param pulumi.Input[List[pulumi.Input[float]]] dashboard_lists_removeds: The list of dashboard lists this dashboard should be removed from. Internal only.
:param pulumi.Input[Sequence[pulumi.Input[int]]] dashboard_lists: The list of dashboard lists this dashboard belongs to.
:param pulumi.Input[Sequence[pulumi.Input[int]]] dashboard_lists_removeds: The list of dashboard lists this dashboard should be removed from. Internal only.
:param pulumi.Input[str] description: The description of the dashboard.
:param pulumi.Input[bool] is_read_only: Whether this dashboard is read-only.
:param pulumi.Input[str] layout_type: The layout type of the dashboard, either 'free' or 'ordered'.
:param pulumi.Input[List[pulumi.Input[str]]] notify_lists: The list of handles of users to notify when changes are made to this dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]] template_variable_presets: The list of selectable template variable presets for this dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]] template_variables: The list of template variables for this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[str]]] notify_lists: The list of handles of users to notify when changes are made to this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariablePresetArgs']]]] template_variable_presets: The list of selectable template variable presets for this dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardTemplateVariableArgs']]]] template_variables: The list of template variables for this dashboard.
:param pulumi.Input[str] title: The title of the dashboard.
:param pulumi.Input[str] url: The URL of the dashboard.
:param pulumi.Input[List[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]] widgets: The list of widgets to display on the dashboard.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DashboardWidgetArgs']]]] widgets: The list of widgets to display on the dashboard.
"""
opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))

Expand All @@ -777,15 +777,15 @@ def get(resource_name: str,

@property
@pulumi.getter(name="dashboardLists")
def dashboard_lists(self) -> pulumi.Output[Optional[List[float]]]:
def dashboard_lists(self) -> pulumi.Output[Optional[Sequence[int]]]:
"""
The list of dashboard lists this dashboard belongs to.
"""
return pulumi.get(self, "dashboard_lists")

@property
@pulumi.getter(name="dashboardListsRemoveds")
def dashboard_lists_removeds(self) -> pulumi.Output[List[float]]:
def dashboard_lists_removeds(self) -> pulumi.Output[Sequence[int]]:
"""
The list of dashboard lists this dashboard should be removed from. Internal only.
"""
Expand Down Expand Up @@ -817,23 +817,23 @@ def layout_type(self) -> pulumi.Output[str]:

@property
@pulumi.getter(name="notifyLists")
def notify_lists(self) -> pulumi.Output[Optional[List[str]]]:
def notify_lists(self) -> pulumi.Output[Optional[Sequence[str]]]:
"""
The list of handles of users to notify when changes are made to this dashboard.
"""
return pulumi.get(self, "notify_lists")

@property
@pulumi.getter(name="templateVariablePresets")
def template_variable_presets(self) -> pulumi.Output[Optional[List['outputs.DashboardTemplateVariablePreset']]]:
def template_variable_presets(self) -> pulumi.Output[Optional[Sequence['outputs.DashboardTemplateVariablePreset']]]:
"""
The list of selectable template variable presets for this dashboard.
"""
return pulumi.get(self, "template_variable_presets")

@property
@pulumi.getter(name="templateVariables")
def template_variables(self) -> pulumi.Output[Optional[List['outputs.DashboardTemplateVariable']]]:
def template_variables(self) -> pulumi.Output[Optional[Sequence['outputs.DashboardTemplateVariable']]]:
"""
The list of template variables for this dashboard.
"""
Expand All @@ -857,7 +857,7 @@ def url(self) -> pulumi.Output[str]:

@property
@pulumi.getter
def widgets(self) -> pulumi.Output[List['outputs.DashboardWidget']]:
def widgets(self) -> pulumi.Output[Sequence['outputs.DashboardWidget']]:
"""
The list of widgets to display on the dashboard.
"""
Expand Down
Loading

0 comments on commit 6efa9a9

Please sign in to comment.