Merge pull request #47 from lbrlabs/grafana_1_31_1

pulumiverse · Nov 28, 2022 · 7bed54d · 7bed54d
2 parents 648cf0d + eda688a
commit 7bed54d
Show file tree

Hide file tree

Showing 227 changed files with 4,199 additions and 1,973 deletions.
diff --git a/go.work.sum b/go.work.sum
diff --git a/provider/cmd/pulumi-resource-grafana/schema.json b/provider/cmd/pulumi-resource-grafana/schema.json
diff --git a/provider/go.mod b/provider/go.mod
@@ -5,9 +5,9 @@ go 1.19
 replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
 
 require (
-	github.com/grafana/terraform-provider-grafana v1.30.0
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.33.0
-	github.com/pulumi/pulumi/sdk/v3 v3.44.3
+	github.com/grafana/terraform-provider-grafana v1.31.1
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.30.0
+	github.com/pulumi/pulumi/sdk/v3 v3.40.0
 )
 
 require (

diff --git a/provider/resources.go b/provider/resources.go
@@ -193,6 +193,7 @@ func Provider() tfbridge.ProviderInfo {
 			"grafana_role_assignment":                   {Tok: grafanaResource(grafanaMod, "RoleAssignment")},
 			"grafana_rule_group":                        {Tok: grafanaResource(grafanaMod, "RuleGroup")},
 			"grafana_service_account":                   {Tok: grafanaResource(grafanaMod, "ServiceAccount")},
+			"grafana_service_account_permission":        {Tok: grafanaResource(grafanaMod, "ServiceAccountPermission")},
 			"grafana_service_account_token":             {Tok: grafanaResource(grafanaMod, "ServiceAccountToken")},
 			"grafana_synthetic_monitoring_check":        {Tok: grafanaResource(grafanaMod, "SyntheticMonitoringCheck")},
 			"grafana_synthetic_monitoring_installation": {Tok: grafanaResource(grafanaMod, "SyntheticMonitoringInstallation")},

diff --git a/sdk/dotnet/Grafana/AlertNotification.cs b/sdk/dotnet/Grafana/AlertNotification.cs
@@ -123,10 +123,6 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
             {
                 Version = Utilities.Version,
                 PluginDownloadURL = "github://api.github.com/lbrlabs",
-                AdditionalSecretOutputs =
-                {
-                    "secureSettings",
-                },
             };
             var merged = CustomResourceOptions.Merge(defaultOptions, options);
             // Override the ID if one was specified for consistency with other language SDKs.
@@ -183,11 +179,7 @@ public sealed class AlertNotificationArgs : global::Pulumi.ResourceArgs
         public InputMap<object> SecureSettings
         {
             get => _secureSettings ?? (_secureSettings = new InputMap<object>());
-            set
-            {
-                var emptySecret = Output.CreateSecret(ImmutableDictionary.Create<string, object>());
-                _secureSettings = Output.All(value, emptySecret).Apply(v => v[0]);
-            }
+            set => _secureSettings = value;
         }
 
         /// <summary>
@@ -261,11 +253,7 @@ public sealed class AlertNotificationState : global::Pulumi.ResourceArgs
         public InputMap<object> SecureSettings
         {
             get => _secureSettings ?? (_secureSettings = new InputMap<object>());
-            set
-            {
-                var emptySecret = Output.CreateSecret(ImmutableDictionary.Create<string, object>());
-                _secureSettings = Output.All(value, emptySecret).Apply(v => v[0]);
-            }
+            set => _secureSettings = value;
         }
 
         /// <summary>

diff --git a/sdk/dotnet/Grafana/ApiKey.cs b/sdk/dotnet/Grafana/ApiKey.cs
@@ -91,10 +91,6 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
             {
                 Version = Utilities.Version,
                 PluginDownloadURL = "github://api.github.com/lbrlabs",
-                AdditionalSecretOutputs =
-                {
-                    "key",
-                },
             };
             var merged = CustomResourceOptions.Merge(defaultOptions, options);
             // Override the ID if one was specified for consistency with other language SDKs.
@@ -151,16 +147,7 @@ public sealed class ApiKeyState : global::Pulumi.ResourceArgs
         public Input<string>? Expiration { get; set; }
 
         [Input("key")]
-        private Input<string>? _key;
-        public Input<string>? Key
-        {
-            get => _key;
-            set
-            {
-                var emptySecret = Output.CreateSecret(0);
-                _key = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
-            }
-        }
+        public Input<string>? Key { get; set; }
 
         [Input("name")]
         public Input<string>? Name { get; set; }

diff --git a/sdk/dotnet/Grafana/CloudApiKey.cs b/sdk/dotnet/Grafana/CloudApiKey.cs
@@ -89,10 +89,6 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
             {
                 Version = Utilities.Version,
                 PluginDownloadURL = "github://api.github.com/lbrlabs",
-                AdditionalSecretOutputs =
-                {
-                    "key",
-                },
             };
             var merged = CustomResourceOptions.Merge(defaultOptions, options);
             // Override the ID if one was specified for consistency with other language SDKs.
@@ -148,21 +144,11 @@ public sealed class CloudApiKeyState : global::Pulumi.ResourceArgs
         [Input("cloudOrgSlug")]
         public Input<string>? CloudOrgSlug { get; set; }
 
-        [Input("key")]
-        private Input<string>? _key;
-
         /// <summary>
         /// The generated API key.
         /// </summary>
-        public Input<string>? Key
-        {
-            get => _key;
-            set
-            {
-                var emptySecret = Output.CreateSecret(0);
-                _key = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
-            }
-        }
+        [Input("key")]
+        public Input<string>? Key { get; set; }
 
         /// <summary>
         /// Name of the API key.

diff --git a/sdk/dotnet/Grafana/CloudStack.cs b/sdk/dotnet/Grafana/CloudStack.cs
@@ -157,7 +157,8 @@ public partial class CloudStack : global::Pulumi.CustomResource
 
         /// <summary>
         /// Region slug to assign to this stack.
-        /// Changing region will destroy the existing stack and create a new one in the desired region
+        /// Changing region will destroy the existing stack and create a new one in the desired region.
+        /// Available input au (GCP Australia), eu (GCP Belgium), us (GCP US Central), prod-ap-southeast-0 (GCP Singapore), prod-gb-south-0 (GCP UK), prod-ap-south-0 (GCP India), prod-sa-east-0 (GCP Brazil)
         /// </summary>
         [Output("regionSlug")]
         public Output<string?> RegionSlug { get; private set; } = null!;
@@ -266,7 +267,8 @@ public sealed class CloudStackArgs : global::Pulumi.ResourceArgs
 
         /// <summary>
         /// Region slug to assign to this stack.
-        /// Changing region will destroy the existing stack and create a new one in the desired region
+        /// Changing region will destroy the existing stack and create a new one in the desired region.
+        /// Available input au (GCP Australia), eu (GCP Belgium), us (GCP US Central), prod-ap-southeast-0 (GCP Singapore), prod-gb-south-0 (GCP UK), prod-ap-south-0 (GCP India), prod-sa-east-0 (GCP Brazil)
         /// </summary>
         [Input("regionSlug")]
         public Input<string>? RegionSlug { get; set; }
@@ -420,7 +422,8 @@ public sealed class CloudStackState : global::Pulumi.ResourceArgs
 
         /// <summary>
         /// Region slug to assign to this stack.
-        /// Changing region will destroy the existing stack and create a new one in the desired region
+        /// Changing region will destroy the existing stack and create a new one in the desired region.
+        /// Available input au (GCP Australia), eu (GCP Belgium), us (GCP US Central), prod-ap-southeast-0 (GCP Singapore), prod-gb-south-0 (GCP UK), prod-ap-south-0 (GCP India), prod-sa-east-0 (GCP Brazil)
         /// </summary>
         [Input("regionSlug")]
         public Input<string>? RegionSlug { get; set; }

diff --git a/sdk/dotnet/Grafana/ContactPoint.cs b/sdk/dotnet/Grafana/ContactPoint.cs
@@ -13,7 +13,7 @@ namespace Lbrlabs.PulumiPackage.Grafana
     /// <summary>
     /// Manages Grafana Alerting contact points.
     /// 
-    /// * [Official documentation](https://grafana.com/docs/grafana/next/alerting/contact-points)
+    /// * [Official documentation](https://grafana.com/docs/grafana/latest/alerting/contact-points)
     /// * [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/#contact-points)
     /// 
     /// This resource requires Grafana 9.1.0 or later.