Skip to content

Commit 32fc8c3

Browse files
stack72stack72
authored
Merge pull request #114 from pulumi/stack72/v1.12.0
Upgrade to v1.12.0 of the Postgresql Terraform Provider
2 parents c4eefe8 + 2c990bd commit 32fc8c3

File tree

20 files changed

+244
-407
lines changed

20 files changed

+244
-407
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## HEAD (Unreleased)
2-
_(none)_
2+
* Upgrade to v1.12.0 Postgresql Terraform Provider
33

44
---
55

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

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
],
88
"homepage": "https://pulumi.io",
99
"license": "Apache-2.0",
10-
"attribution": "This Pulumi package is based on the [`postgresql` Terraform Provider](https://github.com/terraform-providers/terraform-provider-postgresql).",
10+
"attribution": "This Pulumi package is based on the [`postgresql` Terraform Provider](https://github.com/cyrilgdn/terraform-provider-postgresql).",
1111
"repository": "https://github.com/pulumi/pulumi-postgresql",
1212
"meta": {
1313
"moduleFormat": "(.*)(?:/[^/]*)"
@@ -434,15 +434,18 @@
434434
"schema": {
435435
"type": "string",
436436
"description": "The database schema to set default privileges for this role\n"
437+
},
438+
"withGrantOption": {
439+
"type": "boolean",
440+
"description": "Permit the grant recipient to grant it to others\n"
437441
}
438442
},
439443
"required": [
440444
"database",
441445
"objectType",
442446
"owner",
443447
"privileges",
444-
"role",
445-
"schema"
448+
"role"
446449
],
447450
"inputProperties": {
448451
"database": {
@@ -471,15 +474,18 @@
471474
"schema": {
472475
"type": "string",
473476
"description": "The database schema to set default privileges for this role\n"
477+
},
478+
"withGrantOption": {
479+
"type": "boolean",
480+
"description": "Permit the grant recipient to grant it to others\n"
474481
}
475482
},
476483
"requiredInputs": [
477484
"database",
478485
"objectType",
479486
"owner",
480487
"privileges",
481-
"role",
482-
"schema"
488+
"role"
483489
],
484490
"stateInputs": {
485491
"description": "Input properties used for looking up and filtering DefaultPrivileg resources.\n",
@@ -510,6 +516,10 @@
510516
"schema": {
511517
"type": "string",
512518
"description": "The database schema to set default privileges for this role\n"
519+
},
520+
"withGrantOption": {
521+
"type": "boolean",
522+
"description": "Permit the grant recipient to grant it to others\n"
513523
}
514524
},
515525
"type": "object"
@@ -545,15 +555,18 @@
545555
"schema": {
546556
"type": "string",
547557
"description": "The database schema to set default privileges for this role.\n"
558+
},
559+
"withGrantOption": {
560+
"type": "boolean",
561+
"description": "Permit the grant recipient to grant it to others\n"
548562
}
549563
},
550564
"required": [
551565
"database",
552566
"objectType",
553567
"owner",
554568
"privileges",
555-
"role",
556-
"schema"
569+
"role"
557570
],
558571
"inputProperties": {
559572
"database": {
@@ -582,15 +595,18 @@
582595
"schema": {
583596
"type": "string",
584597
"description": "The database schema to set default privileges for this role.\n"
598+
},
599+
"withGrantOption": {
600+
"type": "boolean",
601+
"description": "Permit the grant recipient to grant it to others\n"
585602
}
586603
},
587604
"requiredInputs": [
588605
"database",
589606
"objectType",
590607
"owner",
591608
"privileges",
592-
"role",
593-
"schema"
609+
"role"
594610
],
595611
"stateInputs": {
596612
"description": "Input properties used for looking up and filtering DefaultPrivileges resources.\n",
@@ -621,6 +637,10 @@
621637
"schema": {
622638
"type": "string",
623639
"description": "The database schema to set default privileges for this role.\n"
640+
},
641+
"withGrantOption": {
642+
"type": "boolean",
643+
"description": "Permit the grant recipient to grant it to others\n"
624644
}
625645
},
626646
"type": "object"
@@ -914,6 +934,10 @@
914934
"type": "boolean",
915935
"description": "Defines whether the password is stored\nencrypted in the system catalogs. Default value is `true`. NOTE: this value\nis always set (to the conservative and safe value), but may interfere with the\nbehavior of\n[PostgreSQL's `password_encryption` setting](https://www.postgresql.org/docs/current/static/runtime-config-connection.html#GUC-PASSWORD-ENCRYPTION).\n"
916936
},
937+
"idleInTransactionSessionTimeout": {
938+
"type": "integer",
939+
"description": "Terminate any session with an open transaction that has been idle for longer than the specified duration in milliseconds\n"
940+
},
917941
"inherit": {
918942
"type": "boolean",
919943
"description": "Defines whether a role \"inherits\" the privileges of\nroles it is a member of. Default value is `true`.\n"
@@ -997,6 +1021,10 @@
9971021
"type": "boolean",
9981022
"description": "Defines whether the password is stored\nencrypted in the system catalogs. Default value is `true`. NOTE: this value\nis always set (to the conservative and safe value), but may interfere with the\nbehavior of\n[PostgreSQL's `password_encryption` setting](https://www.postgresql.org/docs/current/static/runtime-config-connection.html#GUC-PASSWORD-ENCRYPTION).\n"
9991023
},
1024+
"idleInTransactionSessionTimeout": {
1025+
"type": "integer",
1026+
"description": "Terminate any session with an open transaction that has been idle for longer than the specified duration in milliseconds\n"
1027+
},
10001028
"inherit": {
10011029
"type": "boolean",
10021030
"description": "Defines whether a role \"inherits\" the privileges of\nroles it is a member of. Default value is `true`.\n"
@@ -1079,6 +1107,10 @@
10791107
"type": "boolean",
10801108
"description": "Defines whether the password is stored\nencrypted in the system catalogs. Default value is `true`. NOTE: this value\nis always set (to the conservative and safe value), but may interfere with the\nbehavior of\n[PostgreSQL's `password_encryption` setting](https://www.postgresql.org/docs/current/static/runtime-config-connection.html#GUC-PASSWORD-ENCRYPTION).\n"
10811109
},
1110+
"idleInTransactionSessionTimeout": {
1111+
"type": "integer",
1112+
"description": "Terminate any session with an open transaction that has been idle for longer than the specified duration in milliseconds\n"
1113+
},
10821114
"inherit": {
10831115
"type": "boolean",
10841116
"description": "Defines whether a role \"inherits\" the privileges of\nroles it is a member of. Default value is `true`.\n"
@@ -1265,11 +1297,11 @@
12651297
"disableUnionOutputTypes": true,
12661298
"packageDescription": "A Pulumi package for creating and managing postgresql cloud resources.",
12671299
"packageName": "",
1268-
"readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/terraform-providers/terraform-provider-postgresql)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi/pulumi-postgresql` repo](https://github.com/pulumi/pulumi-postgresql/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-providers/terraform-provider-postgresql` repo](https://github.com/terraform-providers/terraform-provider-postgresql/issues).",
1300+
"readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/cyrilgdn/terraform-provider-postgresql)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi/pulumi-postgresql` repo](https://github.com/pulumi/pulumi-postgresql/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`cyrilgdn/terraform-provider-postgresql` repo](https://github.com/cyrilgdn/terraform-provider-postgresql/issues).",
12691301
"typescriptVersion": ""
12701302
},
12711303
"python": {
1272-
"readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/terraform-providers/terraform-provider-postgresql)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi/pulumi-postgresql` repo](https://github.com/pulumi/pulumi-postgresql/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-providers/terraform-provider-postgresql` repo](https://github.com/terraform-providers/terraform-provider-postgresql/issues).",
1304+
"readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/cyrilgdn/terraform-provider-postgresql)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi/pulumi-postgresql` repo](https://github.com/pulumi/pulumi-postgresql/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`cyrilgdn/terraform-provider-postgresql` repo](https://github.com/cyrilgdn/terraform-provider-postgresql/issues).",
12731305
"requires": {
12741306
"pulumi": "\u003e=2.15.0,\u003c3.0.0"
12751307
}

‎provider/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/pulumi/pulumi-postgresql/provider/v2
33
go 1.16
44

55
require (
6+
github.com/cyrilgdn/terraform-provider-postgresql v0.0.0
67
github.com/hashicorp/terraform-plugin-sdk v1.7.0
78
github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1
89
github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c
9-
github.com/terraform-providers/terraform-provider-postgresql v1.7.1
1010
)
1111

12-
replace github.com/terraform-providers/terraform-provider-postgresql => github.com/cyrilgdn/terraform-provider-postgresql v1.11.2
12+
replace github.com/cyrilgdn/terraform-provider-postgresql => github.com/pulumi/terraform-provider-postgresql v1.12.1-0.20210330162646-5e21079b520e

0 commit comments

Comments
 (0)