Skip to content

Commit 7849b63

Browse files
author
aq17
committed
use patch instead of fork
1 parent 40cb78a commit 7849b63

File tree

5 files changed

+100
-12
lines changed

5 files changed

+100
-12
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "upstream"]
2+
path = upstream
3+
url = https://github.com/cyrilgdn/terraform-provider-postgresql.git
4+
ignore = dirty

patches/0001-fork.patch

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
diff --git b/.idea/.gitignore a/.idea/.gitignore
2+
new file mode 100644
3+
index 0000000..13566b8
4+
--- /dev/null
5+
+++ a/.idea/.gitignore
6+
@@ -0,0 +1,8 @@
7+
+# Default ignored files
8+
+/shelf/
9+
+/workspace.xml
10+
+# Editor-based HTTP Client requests
11+
+/httpRequests/
12+
+# Datasource local storage ignored files
13+
+/dataSources/
14+
+/dataSources.local.xml
15+
diff --git b/.idea/modules.xml a/.idea/modules.xml
16+
new file mode 100644
17+
index 0000000..c671309
18+
--- /dev/null
19+
+++ a/.idea/modules.xml
20+
@@ -0,0 +1,8 @@
21+
+<?xml version="1.0" encoding="UTF-8"?>
22+
+<project version="4">
23+
+ <component name="ProjectModuleManager">
24+
+ <modules>
25+
+ <module fileurl="file://$PROJECT_DIR$/.idea/terraform-provider-postgresql.iml" filepath="$PROJECT_DIR$/.idea/terraform-provider-postgresql.iml" />
26+
+ </modules>
27+
+ </component>
28+
+</project>
29+
\ No newline at end of file
30+
diff --git b/.idea/terraform-provider-postgresql.iml a/.idea/terraform-provider-postgresql.iml
31+
new file mode 100644
32+
index 0000000..5e764c4
33+
--- /dev/null
34+
+++ a/.idea/terraform-provider-postgresql.iml
35+
@@ -0,0 +1,9 @@
36+
+<?xml version="1.0" encoding="UTF-8"?>
37+
+<module type="WEB_MODULE" version="4">
38+
+ <component name="Go" enabled="true" />
39+
+ <component name="NewModuleRootManager">
40+
+ <content url="file://$MODULE_DIR$" />
41+
+ <orderEntry type="inheritedJdk" />
42+
+ <orderEntry type="sourceFolder" forTests="false" />
43+
+ </component>
44+
+</module>
45+
\ No newline at end of file
46+
diff --git b/.idea/vcs.xml a/.idea/vcs.xml
47+
new file mode 100644
48+
index 0000000..94a25f7
49+
--- /dev/null
50+
+++ a/.idea/vcs.xml
51+
@@ -0,0 +1,6 @@
52+
+<?xml version="1.0" encoding="UTF-8"?>
53+
+<project version="4">
54+
+ <component name="VcsDirectoryMappings">
55+
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
56+
+ </component>
57+
+</project>
58+
\ No newline at end of file
59+
diff --git b/go.mod a/go.mod
60+
index ee3e530..a12d9af 100644
61+
--- b/go.mod
62+
+++ a/go.mod
63+
@@ -1,4 +1,4 @@
64+
-module github.com/terraform-providers/terraform-provider-postgresql
65+
+module github.com/cyrilgdn/terraform-provider-postgresql
66+
67+
go 1.17
68+
69+
diff --git b/main.go a/main.go
70+
index 7125ff2..d9f1406 100644
71+
--- b/main.go
72+
+++ a/main.go
73+
@@ -1,8 +1,8 @@
74+
package main
75+
76+
import (
77+
+ "github.com/cyrilgdn/terraform-provider-postgresql/postgresql"
78+
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
79+
- "github.com/terraform-providers/terraform-provider-postgresql/postgresql"
80+
)
81+
82+
func main() {

provider/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.19
44

55
require (
66
github.com/cyrilgdn/terraform-provider-postgresql v0.0.0
7-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.28.0
8-
github.com/pulumi/pulumi/sdk/v3 v3.38.0
7+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1
8+
github.com/pulumi/pulumi/sdk/v3 v3.57.0
99
)
1010

1111
require (
@@ -160,7 +160,7 @@ require (
160160
github.com/posener/complete v1.2.1 // indirect
161161
github.com/pulumi/pulumi-java/pkg v0.5.3 // indirect
162162
github.com/pulumi/pulumi-yaml v0.5.4 // indirect
163-
github.com/pulumi/pulumi/pkg/v3 v3.38.0 // indirect
163+
github.com/pulumi/pulumi/pkg/v3 v3.57.0 // indirect
164164
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e // indirect
165165
github.com/rivo/uniseg v0.2.0 // indirect
166166
github.com/rjeczalik/notify v0.9.2 // indirect
@@ -225,6 +225,6 @@ require (
225225
)
226226

227227
replace (
228-
github.com/cyrilgdn/terraform-provider-postgresql => github.com/pulumi/terraform-provider-postgresql v1.12.1-0.20220823180737-87ee25e1c9ef
228+
github.com/cyrilgdn/terraform-provider-postgresql => ../upstream
229229
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220725190814-23001ad6ec03
230230
)

provider/resources.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@ func Provider() tfbridge.ProviderInfo {
6767
p := shimv2.NewProvider(postgresql.Provider())
6868

6969
prov := tfbridge.ProviderInfo{
70-
P: p,
71-
Name: "postgresql",
72-
Description: "A Pulumi package for creating and managing postgresql cloud resources.",
73-
Keywords: []string{"pulumi", "postgresql"},
74-
License: "Apache-2.0",
75-
Homepage: "https://pulumi.io",
76-
Repository: "https://github.com/pulumi/pulumi-postgresql",
77-
GitHubOrg: "cyrilgdn",
70+
P: p,
71+
Name: "postgresql",
72+
Description: "A Pulumi package for creating and managing postgresql cloud resources.",
73+
Keywords: []string{"pulumi", "postgresql"},
74+
License: "Apache-2.0",
75+
Homepage: "https://pulumi.io",
76+
Repository: "https://github.com/pulumi/pulumi-postgresql",
77+
GitHubOrg: "cyrilgdn",
78+
UpstreamRepoPath: "./upstream",
7879
Config: map[string]*tfbridge.SchemaInfo{
7980
"sslmode": {
8081
Default: &tfbridge.DefaultInfo{

upstream

Submodule upstream added at e039204

0 commit comments

Comments
 (0)