Skip to content

Commit

Permalink
Merge pull request #96 from pulumi/stack72/v2.17.0
Browse files Browse the repository at this point in the history
Upgrade to v2.17.0 of the DataDog Terraform Provider
  • Loading branch information
stack72 authored Dec 8, 2020
2 parents 521bb80 + b42b4fa commit 74e32a3
Show file tree
Hide file tree
Showing 33 changed files with 1,602 additions and 91 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 v2.17.0 of the datadog Terraform Provider

---

Expand Down
158 changes: 157 additions & 1 deletion provider/cmd/pulumi-resource-datadog/schema.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ require (
github.com/hashicorp/terraform-plugin-sdk v1.15.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.13.2
github.com/pulumi/pulumi/sdk/v2 v2.13.3-0.20201109230029-a6f8b9b205cd
github.com/satori/go.uuid v1.2.0 // indirect
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.20201109111850-85ec1a567283
github.com/terraform-providers/terraform-provider-datadog => github.com/pulumi/terraform-provider-datadog v1.9.1-0.20201126141533-0f7d7456e4de
)
13 changes: 2 additions & 11 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -538,22 +538,15 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.11.1-0.20201020163502-64cff1e50894 h1:yUnJDty8PgO26E8T0xX5CwslQ5CZTVqdTzfv0PnSN20=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.11.1-0.20201020163502-64cff1e50894/go.mod h1:HeGEtErxeRTElloiI8SJvnb2X/AgGvOxgTGI0irEIus=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.13.2 h1:8sEHpBhHUl+lVuruvvMXL8NJFrpPSEVxB6Nexuy1irs=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.13.2/go.mod h1:NVzB8KA29SMXW8Nwp6OHI4yevnQkLiY0VMucAI2R7jU=
github.com/pulumi/pulumi/pkg/v2 v2.12.1-0.20201019222817-89c956d18942 h1:IB34mt9friGXJGaRbZNwerIK9Oz0LfBruhbVEkJKDPg=
github.com/pulumi/pulumi/pkg/v2 v2.12.1-0.20201019222817-89c956d18942/go.mod h1:a5zxh9WrYwWR/cDOhPMNFOUpJuwtyeFS+ZYJebehQ+c=
github.com/pulumi/pulumi/pkg/v2 v2.13.3-0.20201109230029-a6f8b9b205cd h1:ID3x2Bv/yEDQCU67THkmdhgoINcYYb0zYXo01FeJUhU=
github.com/pulumi/pulumi/pkg/v2 v2.13.3-0.20201109230029-a6f8b9b205cd/go.mod h1:xLEDqsipr92IXfe8EJrl8bANoEUtwmBJGBE8X8PKmP0=
github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
github.com/pulumi/pulumi/sdk/v2 v2.11.3-0.20201009201355-249140242ebb/go.mod h1:WQ4WaHMA7mduVHAJi87iIqbWvqsuBUYccBiKK+FrayI=
github.com/pulumi/pulumi/sdk/v2 v2.12.0 h1:d2BQnOvRWCbxDG5DO0bz5FkhFbymABmOxlsx0h2Yhm8=
github.com/pulumi/pulumi/sdk/v2 v2.12.0/go.mod h1:WQ4WaHMA7mduVHAJi87iIqbWvqsuBUYccBiKK+FrayI=
github.com/pulumi/pulumi/sdk/v2 v2.13.3-0.20201109230029-a6f8b9b205cd h1:acvoTtWZHySIlANIlR5LSfRyjYSUadeJcdUZhyx9y4o=
github.com/pulumi/pulumi/sdk/v2 v2.13.3-0.20201109230029-a6f8b9b205cd/go.mod h1:Z9ifPo/Q0+hUpAyguVx2gp5Sx+CBumnWvYQDhrM8l3E=
github.com/pulumi/terraform-provider-datadog v1.9.1-0.20201109111850-85ec1a567283 h1:yaWfiw+bPl+Q0AIqM3zE96WV3JT9DNVwYlvXxRrgyio=
github.com/pulumi/terraform-provider-datadog v1.9.1-0.20201109111850-85ec1a567283/go.mod h1:DlLbOgn+4XMv2laOeftgPGrE2b//ymFICiWcbYoWQeg=
github.com/pulumi/terraform-provider-datadog v1.9.1-0.20201126141533-0f7d7456e4de h1:JboIB0Ye8Emh7/YFqKWi2Aa7/Fqsv4ZUpDcJkKYOn+M=
github.com/pulumi/terraform-provider-datadog v1.9.1-0.20201126141533-0f7d7456e4de/go.mod h1:DlLbOgn+4XMv2laOeftgPGrE2b//ymFICiWcbYoWQeg=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand All @@ -562,8 +555,6 @@ github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFo
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 h1:G04eS0JkAIVZfaJLjla9dNxkJCPiKIGZlw9AfOhzOD0=
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down
99 changes: 27 additions & 72 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,92 +79,45 @@ func Provider() tfbridge.ProviderInfo {
},
},
Resources: map[string]*tfbridge.ResourceInfo{
"datadog_dashboard": {
Tok: makeResource(datadogMod, "Dashboard"),
},
"datadog_downtime": {
Tok: makeResource(datadogMod, "Downtime"),
},
"datadog_metric_metadata": {
Tok: makeResource(datadogMod, "MetricMetadata"),
},
"datadog_monitor": {
Tok: makeResource(datadogMod, "Monitor"),
},
"datadog_timeboard": {
Tok: makeResource(datadogMod, "TimeBoard"),
},
"datadog_screenboard": {
Tok: makeResource(datadogMod, "ScreenBoard"),
},
"datadog_user": {
Tok: makeResource(datadogMod, "User"),
},
"datadog_dashboard": {Tok: makeResource(datadogMod, "Dashboard")},
"datadog_downtime": {Tok: makeResource(datadogMod, "Downtime")},
"datadog_metric_metadata": {Tok: makeResource(datadogMod, "MetricMetadata")},
"datadog_monitor": {Tok: makeResource(datadogMod, "Monitor")},
"datadog_timeboard": {Tok: makeResource(datadogMod, "TimeBoard")},
"datadog_screenboard": {Tok: makeResource(datadogMod, "ScreenBoard")},
"datadog_user": {Tok: makeResource(datadogMod, "User")},
"datadog_synthetics_test": {
Tok: makeResource(datadogMod, "SyntheticsTest"),
Docs: &tfbridge.DocInfo{
Source: "synthetics.html.markdown",
},
},
"datadog_synthetics_global_variable": {
Tok: makeResource(datadogMod, "SyntheticsGlobalVariable"),
},
"datadog_dashboard_list": {
Tok: makeResource(datadogMod, "DashboardList"),
},
"datadog_service_level_objective": {
Tok: makeResource(datadogMod, "ServiceLevelObjective"),
},
"datadog_logs_custom_pipeline": {
Tok: makeResource(datadogMod, "LogsCustomPipeline"),
},
"datadog_logs_index": {
Tok: makeResource(datadogMod, "LogsIndex"),
},
"datadog_logs_archive": {
Tok: makeResource(datadogMod, "LogsArchive"),
},
"datadog_logs_index_order": {
Tok: makeResource(datadogMod, "LogsIndexOrder"),
},
"datadog_logs_integration_pipeline": {
Tok: makeResource(datadogMod, "LogsIntegrationPipeline"),
},
"datadog_logs_pipeline_order": {
Tok: makeResource(datadogMod, "LogsPipelineOrder"),
},
"datadog_logs_archive_order": {
Tok: makeResource(datadogMod, "LogsArchiveOrder"),
},
"datadog_synthetics_global_variable": {Tok: makeResource(datadogMod, "SyntheticsGlobalVariable")},
"datadog_dashboard_list": {Tok: makeResource(datadogMod, "DashboardList")},
"datadog_service_level_objective": {Tok: makeResource(datadogMod, "ServiceLevelObjective")},
"datadog_logs_custom_pipeline": {Tok: makeResource(datadogMod, "LogsCustomPipeline")},
"datadog_logs_index": {Tok: makeResource(datadogMod, "LogsIndex")},
"datadog_logs_archive": {Tok: makeResource(datadogMod, "LogsArchive")},
"datadog_logs_index_order": {Tok: makeResource(datadogMod, "LogsIndexOrder")},
"datadog_logs_integration_pipeline": {Tok: makeResource(datadogMod, "LogsIntegrationPipeline")},
"datadog_logs_pipeline_order": {Tok: makeResource(datadogMod, "LogsPipelineOrder")},
"datadog_logs_archive_order": {Tok: makeResource(datadogMod, "LogsArchiveOrder")},
"datadog_role": {Tok: makeResource(datadogMod, "Role")},

// GCP Integrations
"datadog_integration_gcp": {
Tok: makeResource(gcpMod, "Integration"),
},
"datadog_integration_gcp": {Tok: makeResource(gcpMod, "Integration")},

// Azure Integrations
"datadog_integration_azure": {
Tok: makeResource(azureMod, "Integration"),
},
"datadog_integration_azure": {Tok: makeResource(azureMod, "Integration")},

// AWS Integrations
"datadog_integration_aws": {
Tok: makeResource(awsMod, "Integration"),
},
"datadog_integration_aws_lambda_arn": {
Tok: makeResource(awsMod, "IntegrationLambdaArn"),
},
"datadog_integration_aws_log_collection": {
Tok: makeResource(awsMod, "IntegrationLogCollection"),
},
"datadog_integration_aws": {Tok: makeResource(awsMod, "Integration")},
"datadog_integration_aws_lambda_arn": {Tok: makeResource(awsMod, "IntegrationLambdaArn")},
"datadog_integration_aws_log_collection": {Tok: makeResource(awsMod, "IntegrationLogCollection")},

// PagerDuty Integrations
"datadog_integration_pagerduty": {
Tok: makeResource(pdMod, "Integration"),
},
"datadog_integration_pagerduty_service_object": {
Tok: makeResource(pdMod, "ServiceObject"),
},
"datadog_integration_pagerduty": {Tok: makeResource(pdMod, "Integration")},
"datadog_integration_pagerduty_service_object": {Tok: makeResource(pdMod, "ServiceObject")},
},
DataSources: map[string]*tfbridge.DataSourceInfo{
"datadog_ip_ranges": {
Expand All @@ -176,6 +129,8 @@ func Provider() tfbridge.ProviderInfo {
"datadog_dashboard_list": {Tok: makeDataSource(datadogMod, "getDashboardList")},
"datadog_dashboard": {Tok: makeDataSource(datadogMod, "getDashboard")},
"datadog_synthetics_locations": {Tok: makeDataSource(datadogMod, "getSyntheticsLocations")},
"datadog_permissions": {Tok: makeDataSource(datadogMod, "getPermissions")},
"datadog_role": {Tok: makeDataSource(datadogMod, "getRole")},
},
JavaScript: &tfbridge.JavaScriptInfo{
Dependencies: map[string]string{
Expand Down
61 changes: 61 additions & 0 deletions sdk/dotnet/GetPermissions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Datadog
{
public static class GetPermissions
{
/// <summary>
/// Use this data source to retrieve the list of Datadog permissions by name and their corresponding ID, for use in the role resource.
///
/// {{% examples %}}
/// ## Example Usage
/// {{% example %}}
///
/// ```csharp
/// using Pulumi;
/// using Datadog = Pulumi.Datadog;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var permissions = Output.Create(Datadog.GetPermissions.InvokeAsync());
/// }
///
/// }
/// ```
/// {{% /example %}}
/// {{% /examples %}}
/// </summary>
public static Task<GetPermissionsResult> InvokeAsync(InvokeOptions? options = null)
=> Pulumi.Deployment.Instance.InvokeAsync<GetPermissionsResult>("datadog:index/getPermissions:getPermissions", InvokeArgs.Empty, options.WithVersion());
}


[OutputType]
public sealed class GetPermissionsResult
{
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
public readonly string Id;
public readonly ImmutableDictionary<string, string> Permissions;

[OutputConstructor]
private GetPermissionsResult(
string id,

ImmutableDictionary<string, string> permissions)
{
Id = id;
Permissions = permissions;
}
}
}
83 changes: 83 additions & 0 deletions sdk/dotnet/GetRole.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Datadog
{
public static class GetRole
{
/// <summary>
/// Use this data source to retrieve information about an existing role for use in other resources.
///
/// {{% examples %}}
/// ## Example Usage
/// {{% example %}}
///
/// ```csharp
/// using Pulumi;
/// using Datadog = Pulumi.Datadog;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var test = Output.Create(Datadog.GetRole.InvokeAsync(new Datadog.GetRoleArgs
/// {
/// Filter = "Datadog Standard Role",
/// }));
/// }
///
/// }
/// ```
/// {{% /example %}}
/// {{% /examples %}}
/// </summary>
public static Task<GetRoleResult> InvokeAsync(GetRoleArgs args, InvokeOptions? options = null)
=> Pulumi.Deployment.Instance.InvokeAsync<GetRoleResult>("datadog:index/getRole:getRole", args ?? new GetRoleArgs(), options.WithVersion());
}


public sealed class GetRoleArgs : Pulumi.InvokeArgs
{
[Input("filter", required: true)]
public string Filter { get; set; } = null!;

public GetRoleArgs()
{
}
}


[OutputType]
public sealed class GetRoleResult
{
public readonly string Filter;
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
public readonly string Id;
public readonly string Name;
public readonly int UserCount;

[OutputConstructor]
private GetRoleResult(
string filter,

string id,

string name,

int userCount)
{
Filter = filter;
Id = id;
Name = name;
UserCount = userCount;
}
}
}
25 changes: 25 additions & 0 deletions sdk/dotnet/Inputs/RolePermissionArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Datadog.Inputs
{

public sealed class RolePermissionArgs : Pulumi.ResourceArgs
{
[Input("id", required: true)]
public Input<string> Id { get; set; } = null!;

[Input("name")]
public Input<string>? Name { get; set; }

public RolePermissionArgs()
{
}
}
}
25 changes: 25 additions & 0 deletions sdk/dotnet/Inputs/RolePermissionGetArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Datadog.Inputs
{

public sealed class RolePermissionGetArgs : Pulumi.ResourceArgs
{
[Input("id", required: true)]
public Input<string> Id { get; set; } = null!;

[Input("name")]
public Input<string>? Name { get; set; }

public RolePermissionGetArgs()
{
}
}
}
Loading

0 comments on commit 74e32a3

Please sign in to comment.