Reduce patch set (#357)

#352 failed to update automatically because of patch conflicts. This reduces the patch while improving docs, and so makes it less likely that we will have such conflicts in the future.
pulumi · Oct 24, 2023 · 3251d2a · 3251d2a
1 parent 2410054
commit 3251d2a
Show file tree

Hide file tree

Showing 30 changed files with 110 additions and 146 deletions.
diff --git a/patches/0001-docs-fixups.patch b/patches/0001-docs-fixups.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ian Wahbe <[email protected]>
+Date: Tue, 24 Oct 2023 11:57:12 -0700
+Subject: [PATCH] docs fixups
+
+
+diff --git a/docs/resources/dashboard_list.md b/docs/resources/dashboard_list.md
+index 7e38f433..6e27b53a 100644
+--- a/docs/resources/dashboard_list.md
++++ b/docs/resources/dashboard_list.md
+@@ -15,6 +15,11 @@ Provides a Datadog dashboard_list resource. This can be used to create and manag
+ ```terraform
+ # Create a new Dashboard List with two Dashboards
+ resource "datadog_dashboard_list" "new_list" {
+-  name = "Terraform Created List"
++  depends_on = [
++    datadog_dashboard.screen,
++    datadog_dashboard.time
++  ]
++
++  name = "Automated Created List"
+   dash_item {
+     type    = "custom_timeboard"
+     dash_id = datadog_dashboard.time.id
diff --git a/patches/0001-fork.patch b/patches/0001-fork.patch
diff --git a/provider/cmd/pulumi-resource-datadog/schema.json b/provider/cmd/pulumi-resource-datadog/schema.json
diff --git a/provider/resources.go b/provider/resources.go
@@ -2,6 +2,7 @@ package datadog
 
 import (
 	// Allow embedding files
+	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
@@ -81,6 +82,7 @@ func Provider() tfbridge.ProviderInfo {
 		MetadataInfo:     tfbridge.NewProviderMetadata(metadata),
 		Version:          version.Version,
 		UpstreamRepoPath: "./upstream",
+		DocRules:         &tfbridge.DocRuleInfo{EditRules: docEditRules},
 		Resources: map[string]*tfbridge.ResourceInfo{
 			"datadog_dashboard":                  {Tok: makeResource(datadogMod, "Dashboard")},
 			"datadog_downtime":                   {Tok: makeResource(datadogMod, "Downtime")},
@@ -259,3 +261,15 @@ func Provider() tfbridge.ProviderInfo {
 
 	return prov
 }
+
+func docEditRules(defaults []tfbridge.DocsEdit) []tfbridge.DocsEdit {
+	return append(defaults, tfbridge.DocsEdit{
+		Path: "*",
+		Edit: func(_ string, b []byte) ([]byte, error) {
+			b = bytes.ReplaceAll(b,
+				[]byte("Created using the Datadog provider in Terraform"),
+				[]byte("Created using the Datadog provider in Pulumi"))
+			return b, nil
+		},
+	})
+}
diff --git a/sdk/dotnet/DashboardJson.cs b/sdk/dotnet/DashboardJson.cs
@@ -27,7 +27,7 @@ namespace Pulumi.Datadog
     ///     {
     ///         Dashboard = @"{
     ///    ""title"":""Ordered Layout Dashboard"",
-    ///    ""description"":""Created using the Datadog provider in Terraform"",
+    ///    ""description"":""Created using the Datadog provider in Pulumi"",
     ///    ""widgets"":[
     ///       {
     ///          ""id"":719369537777170,

diff --git a/sdk/dotnet/DashboardList.cs b/sdk/dotnet/DashboardList.cs
@@ -25,7 +25,7 @@ namespace Pulumi.Datadog
     ///     var time = new Datadog.Dashboard("time", new()
     ///     {
     ///         Title = "TF Test Layout Dashboard",
-    ///         Description = "Created using the Datadog provider",
+    ///         Description = "Created using the Datadog provider in Pulumi",
     ///         LayoutType = "ordered",
     ///         IsReadOnly = true,
     ///         Widgets = new[]
@@ -46,7 +46,7 @@ namespace Pulumi.Datadog
     ///     var screen = new Datadog.Dashboard("screen", new()
     ///     {
     ///         Title = "TF Test Free Layout Dashboard",
-    ///         Description = "Created using the Datadog provider",
+    ///         Description = "Created using the Datadog provider in Pulumi",
     ///         LayoutType = "free",
     ///         IsReadOnly = false,
     ///         Widgets = new[]

diff --git a/sdk/dotnet/GetDashboardList.cs b/sdk/dotnet/GetDashboardList.cs
@@ -38,7 +38,7 @@ public static class GetDashboardList
         ///         {
         ///             test.Apply(getDashboardListResult =&gt; getDashboardListResult.Id),
         ///         },
-        ///         Description = "Created using the Datadog provider in Terraform",
+        ///         Description = "Created using the Datadog provider in Pulumi",
         ///         IsReadOnly = true,
         ///         LayoutType = "ordered",
         ///         Title = "TF Test Layout Dashboard",
@@ -92,7 +92,7 @@ public static Task<GetDashboardListResult> InvokeAsync(GetDashboardListArgs args
         ///         {
         ///             test.Apply(getDashboardListResult =&gt; getDashboardListResult.Id),
         ///         },
-        ///         Description = "Created using the Datadog provider in Terraform",
+        ///         Description = "Created using the Datadog provider in Pulumi",
         ///         IsReadOnly = true,
         ///         LayoutType = "ordered",
         ///         Title = "TF Test Layout Dashboard",

diff --git a/sdk/dotnet/PagerDuty/Integration.cs b/sdk/dotnet/PagerDuty/Integration.cs
@@ -22,6 +22,7 @@ namespace Pulumi.Datadog.PagerDuty
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
+    ///     // Services as Individual Resources
     ///     var pd = new Datadog.PagerDuty.Integration("pd", new()
     ///     {
     ///         ApiToken = "38457822378273432587234242874",

diff --git a/sdk/dotnet/PagerDuty/ServiceObject.cs b/sdk/dotnet/PagerDuty/ServiceObject.cs
@@ -41,7 +41,7 @@ namespace Pulumi.Datadog.PagerDuty
     public partial class ServiceObject : global::Pulumi.CustomResource
     {
         /// <summary>
-        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts.
+        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts to have it destroyed and recreated.
         /// </summary>
         [Output("serviceKey")]
         public Output<string> ServiceKey { get; private set; } = null!;
@@ -106,7 +106,7 @@ public sealed class ServiceObjectArgs : global::Pulumi.ResourceArgs
         private Input<string>? _serviceKey;
 
         /// <summary>
-        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts.
+        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts to have it destroyed and recreated.
         /// </summary>
         public Input<string>? ServiceKey
         {
@@ -136,7 +136,7 @@ public sealed class ServiceObjectState : global::Pulumi.ResourceArgs
         private Input<string>? _serviceKey;
 
         /// <summary>
-        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts.
+        /// Your Service name associated service key in PagerDuty. Note: Since the Datadog API never returns service keys, it is impossible to detect drifts to have it destroyed and recreated.
         /// </summary>
         public Input<string>? ServiceKey
         {

diff --git a/sdk/go/datadog/dashboardJson.go b/sdk/go/datadog/dashboardJson.go
diff --git a/sdk/go/datadog/dashboardList.go b/sdk/go/datadog/dashboardList.go
diff --git a/sdk/go/datadog/getDashboardList.go b/sdk/go/datadog/getDashboardList.go
diff --git a/sdk/go/datadog/pagerduty/serviceObject.go b/sdk/go/datadog/pagerduty/serviceObject.go
diff --git a/sdk/java/src/main/java/com/pulumi/datadog/Dashboard.java b/sdk/java/src/main/java/com/pulumi/datadog/Dashboard.java
@@ -83,7 +83,7 @@
  * 
  *     public static void stack(Context ctx) {
  *         var orderedDashboard = new Dashboard(&#34;orderedDashboard&#34;, DashboardArgs.builder()        
- *             .description(&#34;Created using the Datadog provider in Terraform&#34;)
+ *             .description(&#34;Created using the Datadog provider in Pulumi&#34;)
  *             .isReadOnly(true)
  *             .layoutType(&#34;ordered&#34;)
  *             .templateVariables(            
@@ -323,7 +323,7 @@
  *             .build());
  * 
  *         var freeDashboard = new Dashboard(&#34;freeDashboard&#34;, DashboardArgs.builder()        
- *             .description(&#34;Created using the Datadog provider in Terraform&#34;)
+ *             .description(&#34;Created using the Datadog provider in Pulumi&#34;)
  *             .isReadOnly(false)
  *             .layoutType(&#34;free&#34;)
  *             .templateVariables(            

diff --git a/sdk/java/src/main/java/com/pulumi/datadog/DashboardJson.java b/sdk/java/src/main/java/com/pulumi/datadog/DashboardJson.java
@@ -45,7 +45,7 @@
  *             .dashboard(&#34;&#34;&#34;
  * {
  *    &#34;title&#34;:&#34;Ordered Layout Dashboard&#34;,
- *    &#34;description&#34;:&#34;Created using the Datadog provider in Terraform&#34;,
+ *    &#34;description&#34;:&#34;Created using the Datadog provider in Pulumi&#34;,
  *    &#34;widgets&#34;:[
  *       {
  *          &#34;id&#34;:719369537777170,

diff --git a/sdk/java/src/main/java/com/pulumi/datadog/DashboardList.java b/sdk/java/src/main/java/com/pulumi/datadog/DashboardList.java
@@ -51,7 +51,7 @@
  *     public static void stack(Context ctx) {
  *         var time = new Dashboard(&#34;time&#34;, DashboardArgs.builder()        
  *             .title(&#34;TF Test Layout Dashboard&#34;)
- *             .description(&#34;Created using the Datadog provider&#34;)
+ *             .description(&#34;Created using the Datadog provider in Pulumi&#34;)
  *             .layoutType(&#34;ordered&#34;)
  *             .isReadOnly(true)
  *             .widgets(DashboardWidgetArgs.builder()
@@ -66,7 +66,7 @@
  * 
  *         var screen = new Dashboard(&#34;screen&#34;, DashboardArgs.builder()        
  *             .title(&#34;TF Test Free Layout Dashboard&#34;)
- *             .description(&#34;Created using the Datadog provider&#34;)
+ *             .description(&#34;Created using the Datadog provider in Pulumi&#34;)
  *             .layoutType(&#34;free&#34;)
  *             .isReadOnly(false)
  *             .widgets(DashboardWidgetArgs.builder()