Merge pull request #102 from pulumi/stack72/v1.11.0

Author: stack72

CHANGELOG.md

@@ -1,5 +1,5 @@
 ## HEAD (Unreleased)
-_(none)_
+* Upgrade to v1.11.1 of the Postgresql Terraform Provider
 
 ---
 

provider/cmd/pulumi-resource-postgresql/schema.json

@@ -9,4 +9,4 @@ require (
 	github.com/terraform-providers/terraform-provider-postgresql v1.7.1
 )
 
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
+replace github.com/terraform-providers/terraform-provider-postgresql => github.com/cyrilgdn/terraform-provider-postgresql v1.11.1

provider/go.mod

@@ -123,6 +123,14 @@ func Provider() tfbridge.ProviderInfo {
 			"postgresql_grant":     {Tok: makeResource(mainMod, "Grant")},
 			"postgresql_role":      {Tok: makeResource(mainMod, "Role")},
 			"postgresql_schema":    {Tok: makeResource(mainMod, "Schema")},
+			"postgresql_grant_role": {
+				Tok: makeResource(mainMod, "GrantRole"),
+				Fields: map[string]*tfbridge.SchemaInfo{
+					"grant_role": {
+						CSharpName: "GrantRoleName",
+					},
+				},
+			},
 		},
 		DataSources: map[string]*tfbridge.DataSourceInfo{},
 		JavaScript: &tfbridge.JavaScriptInfo{

provider/go.sum

@@ -53,6 +53,8 @@ public static class Config
         /// </summary>
         public static int? Port { get; set; } = __config.GetInt32("port") ?? Utilities.GetEnvInt32("PGPORT") ?? 5432;
 
+        public static string? Scheme { get; set; } = __config.Get("scheme");
+
         public static string? SslMode { get; set; } = __config.Get("sslMode");
 
         /// <summary>

provider/resources.go

@@ -40,6 +40,13 @@ public partial class Extension : Pulumi.CustomResource
         [Output("database")]
         public Output<string> Database { get; private set; } = null!;
 
+        /// <summary>
+        /// When true, will also drop all the objects that depend on the extension, and in turn all objects that depend on those
+        /// objects
+        /// </summary>
+        [Output("dropCascade")]
+        public Output<bool?> DropCascade { get; private set; } = null!;
+
         /// <summary>
         /// The name of the extension.
         /// </summary>
@@ -110,6 +117,13 @@ public sealed class ExtensionArgs : Pulumi.ResourceArgs
         [Input("database")]
         public Input<string>? Database { get; set; }
 
+        /// <summary>
+        /// When true, will also drop all the objects that depend on the extension, and in turn all objects that depend on those
+        /// objects
+        /// </summary>
+        [Input("dropCascade")]
+        public Input<bool>? DropCascade { get; set; }
+
         /// <summary>
         /// The name of the extension.
         /// </summary>
@@ -141,6 +155,13 @@ public sealed class ExtensionState : Pulumi.ResourceArgs
         [Input("database")]
         public Input<string>? Database { get; set; }
 
+        /// <summary>
+        /// When true, will also drop all the objects that depend on the extension, and in turn all objects that depend on those
+        /// objects
+        /// </summary>
+        [Input("dropCascade")]
+        public Input<bool>? DropCascade { get; set; }
+
         /// <summary>
         /// The name of the extension.
         /// </summary>

sdk/dotnet/Config/Config.cs

@@ -41,6 +41,31 @@ namespace Pulumi.PostgreSql
     /// 
     /// }
     /// ```
+    /// 
+    /// ## Examples
+    /// 
+    /// Revoke default accesses for public schema:
+    /// 
+    /// ```csharp
+    /// using Pulumi;
+    /// using PostgreSql = Pulumi.PostgreSql;
+    /// 
+    /// class MyStack : Stack
+    /// {
+    ///     public MyStack()
+    ///     {
+    ///         var revokePublic = new PostgreSql.Grant("revokePublic", new PostgreSql.GrantArgs
+    ///         {
+    ///             Database = "test_db",
+    ///             ObjectType = "schema",
+    ///             Privileges = {},
+    ///             Role = "public",
+    ///             Schema = "public",
+    ///         });
+    ///     }
+    /// 
+    /// }
+    /// ```
     /// </summary>
     [PostgreSqlResourceType("postgresql:index/grant:Grant")]
     public partial class Grant : Pulumi.CustomResource
@@ -52,25 +77,25 @@ public partial class Grant : Pulumi.CustomResource
         public Output<string> Database { get; private set; } = null!;
 
         /// <summary>
-        /// The PostgreSQL object type to grant the privileges on (one of: database, table, sequence,function).
+        /// The PostgreSQL object type to grant the privileges on (one of: database, schema, table, sequence,function).
         /// </summary>
         [Output("objectType")]
         public Output<string> ObjectType { get; private set; } = null!;
 
         /// <summary>
-        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE.
+        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE. An empty list could be provided to revoke all privileges for this role.
         /// </summary>
         [Output("privileges")]
         public Output<ImmutableArray<string>> Privileges { get; private set; } = null!;
 
         /// <summary>
-        /// The name of the role to grant privileges on.
+        /// The name of the role to grant privileges on, Set it to "public" for all roles.
         /// </summary>
         [Output("role")]
         public Output<string> Role { get; private set; } = null!;
 
         /// <summary>
-        /// The database schema to grant privileges on for this role.
+        /// The database schema to grant privileges on for this role (Required except if object_type is "database")
         /// </summary>
         [Output("schema")]
         public Output<string?> Schema { get; private set; } = null!;
@@ -134,7 +159,7 @@ public sealed class GrantArgs : Pulumi.ResourceArgs
         public Input<string> Database { get; set; } = null!;
 
         /// <summary>
-        /// The PostgreSQL object type to grant the privileges on (one of: database, table, sequence,function).
+        /// The PostgreSQL object type to grant the privileges on (one of: database, schema, table, sequence,function).
         /// </summary>
         [Input("objectType", required: true)]
         public Input<string> ObjectType { get; set; } = null!;
@@ -143,7 +168,7 @@ public sealed class GrantArgs : Pulumi.ResourceArgs
         private InputList<string>? _privileges;
 
         /// <summary>
-        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE.
+        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE. An empty list could be provided to revoke all privileges for this role.
         /// </summary>
         public InputList<string> Privileges
         {
@@ -152,13 +177,13 @@ public InputList<string> Privileges
         }
 
         /// <summary>
-        /// The name of the role to grant privileges on.
+        /// The name of the role to grant privileges on, Set it to "public" for all roles.
         /// </summary>
         [Input("role", required: true)]
         public Input<string> Role { get; set; } = null!;
 
         /// <summary>
-        /// The database schema to grant privileges on for this role.
+        /// The database schema to grant privileges on for this role (Required except if object_type is "database")
         /// </summary>
         [Input("schema")]
         public Input<string>? Schema { get; set; }
@@ -183,7 +208,7 @@ public sealed class GrantState : Pulumi.ResourceArgs
         public Input<string>? Database { get; set; }
 
         /// <summary>
-        /// The PostgreSQL object type to grant the privileges on (one of: database, table, sequence,function).
+        /// The PostgreSQL object type to grant the privileges on (one of: database, schema, table, sequence,function).
         /// </summary>
         [Input("objectType")]
         public Input<string>? ObjectType { get; set; }
@@ -192,7 +217,7 @@ public sealed class GrantState : Pulumi.ResourceArgs
         private InputList<string>? _privileges;
 
         /// <summary>
-        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE.
+        /// The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE. An empty list could be provided to revoke all privileges for this role.
         /// </summary>
         public InputList<string> Privileges
         {
@@ -201,13 +226,13 @@ public InputList<string> Privileges
         }
 
         /// <summary>
-        /// The name of the role to grant privileges on.
+        /// The name of the role to grant privileges on, Set it to "public" for all roles.
         /// </summary>
         [Input("role")]
         public Input<string>? Role { get; set; }
 
         /// <summary>
-        /// The database schema to grant privileges on for this role.
+        /// The database schema to grant privileges on for this role (Required except if object_type is "database")
         /// </summary>
         [Input("schema")]
         public Input<string>? Schema { get; set; }

sdk/dotnet/Extension.cs

@@ -0,0 +1,156 @@
+// *** 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.PostgreSql
+{
+    /// <summary>
+    /// The ``postgresql.GrantRole`` resource creates and manages membership in a role to one or more other roles in a non-authoritative way.
+    /// 
+    /// When using ``postgresql.GrantRole`` resource it is likely because the PostgreSQL role you are modifying was created outside of this provider.
+    /// 
+    /// &gt; **Note:** This resource needs PostgreSQL version 9 or above.
+    /// 
+    /// &gt; **Note:** `postgresql.GrantRole` **cannot** be used in conjunction with `postgresql.Role` or they will fight over what your role grants should be.
+    /// 
+    /// ## Usage
+    /// 
+    /// ```csharp
+    /// using Pulumi;
+    /// using PostgreSql = Pulumi.PostgreSql;
+    /// 
+    /// class MyStack : Stack
+    /// {
+    ///     public MyStack()
+    ///     {
+    ///         var grantRoot = new PostgreSql.GrantRole("grantRoot", new PostgreSql.GrantRoleArgs
+    ///         {
+    ///             GrantRole = "application",
+    ///             Role = "root",
+    ///             WithAdminOption = true,
+    ///         });
+    ///     }
+    /// 
+    /// }
+    /// ```
+    /// </summary>
+    [PostgreSqlResourceType("postgresql:index/grantRole:GrantRole")]
+    public partial class GrantRole : Pulumi.CustomResource
+    {
+        /// <summary>
+        /// The name of the role that is added to `role`.
+        /// </summary>
+        [Output("grantRole")]
+        public Output<string> GrantRoleName { get; private set; } = null!;
+
+        /// <summary>
+        /// The name of the role that is granted a new membership.
+        /// </summary>
+        [Output("role")]
+        public Output<string> Role { get; private set; } = null!;
+
+        /// <summary>
+        /// Giving ability to grant membership to others or not for `role`. (Default: false)
+        /// </summary>
+        [Output("withAdminOption")]
+        public Output<bool?> WithAdminOption { get; private set; } = null!;
+
+
+        /// <summary>
+        /// Create a GrantRole resource with the given unique name, arguments, and options.
+        /// </summary>
+        ///
+        /// <param name="name">The unique name of the resource</param>
+        /// <param name="args">The arguments used to populate this resource's properties</param>
+        /// <param name="options">A bag of options that control this resource's behavior</param>
+        public GrantRole(string name, GrantRoleArgs args, CustomResourceOptions? options = null)
+            : base("postgresql:index/grantRole:GrantRole", name, args ?? new GrantRoleArgs(), MakeResourceOptions(options, ""))
+        {
+        }
+
+        private GrantRole(string name, Input<string> id, GrantRoleState? state = null, CustomResourceOptions? options = null)
+            : base("postgresql:index/grantRole:GrantRole", name, state, MakeResourceOptions(options, id))
+        {
+        }
+
+        private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options, Input<string>? id)
+        {
+            var defaultOptions = new CustomResourceOptions
+            {
+                Version = Utilities.Version,
+            };
+            var merged = CustomResourceOptions.Merge(defaultOptions, options);
+            // Override the ID if one was specified for consistency with other language SDKs.
+            merged.Id = id ?? merged.Id;
+            return merged;
+        }
+        /// <summary>
+        /// Get an existing GrantRole resource's state with the given name, ID, and optional extra
+        /// properties used to qualify the lookup.
+        /// </summary>
+        ///
+        /// <param name="name">The unique name of the resulting resource.</param>
+        /// <param name="id">The unique provider ID of the resource to lookup.</param>
+        /// <param name="state">Any extra arguments used during the lookup.</param>
+        /// <param name="options">A bag of options that control this resource's behavior</param>
+        public static GrantRole Get(string name, Input<string> id, GrantRoleState? state = null, CustomResourceOptions? options = null)
+        {
+            return new GrantRole(name, id, state, options);
+        }
+    }
+
+    public sealed class GrantRoleArgs : Pulumi.ResourceArgs
+    {
+        /// <summary>
+        /// The name of the role that is added to `role`.
+        /// </summary>
+        [Input("grantRole", required: true)]
+        public Input<string> GrantRoleName { get; set; } = null!;
+
+        /// <summary>
+        /// The name of the role that is granted a new membership.
+        /// </summary>
+        [Input("role", required: true)]
+        public Input<string> Role { get; set; } = null!;
+
+        /// <summary>
+        /// Giving ability to grant membership to others or not for `role`. (Default: false)
+        /// </summary>
+        [Input("withAdminOption")]
+        public Input<bool>? WithAdminOption { get; set; }
+
+        public GrantRoleArgs()
+        {
+        }
+    }
+
+    public sealed class GrantRoleState : Pulumi.ResourceArgs
+    {
+        /// <summary>
+        /// The name of the role that is added to `role`.
+        /// </summary>
+        [Input("grantRole")]
+        public Input<string>? GrantRoleName { get; set; }
+
+        /// <summary>
+        /// The name of the role that is granted a new membership.
+        /// </summary>
+        [Input("role")]
+        public Input<string>? Role { get; set; }
+
+        /// <summary>
+        /// Giving ability to grant membership to others or not for `role`. (Default: false)
+        /// </summary>
+        [Input("withAdminOption")]
+        public Input<bool>? WithAdminOption { get; set; }
+
+        public GrantRoleState()
+        {
+        }
+    }
+}

sdk/dotnet/Grant.cs

@@ -99,6 +99,9 @@ public sealed class ProviderArgs : Pulumi.ResourceArgs
         [Input("port", json: true)]
         public Input<int>? Port { get; set; }
 
+        [Input("scheme")]
+        public Input<string>? Scheme { get; set; }
+
         [Input("sslMode")]
         public Input<string>? SslMode { get; set; }