Normalize Provider: convert the fork to a patch (#329)

This allows the provider to work with the provider upgrade cycle of
`upgrade-provider`.

Fixes #270

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "upstream"]
+	path = upstream
+	url = https://github.com/hashicorp/terraform-provider-vault.git
+        ignore = dirty

provider/go.mod

@@ -285,5 +285,5 @@ require (
 replace (
 	github.com/hashicorp/go-getter => github.com/hashicorp/go-getter v1.4.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e
-	github.com/hashicorp/terraform-provider-vault => github.com/pulumi/terraform-provider-vault v1.9.1-0.20231108235540-710122092170
+	github.com/hashicorp/terraform-provider-vault => ../upstream
 )

provider/go.sum

@@ -2466,8 +2466,6 @@ github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abq
 github.com/pulumi/terraform-diff-reader v0.0.2/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
 github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e h1:blSirnXqvm8JXLxwxelsBroUNRhOHakDO7cgJUYTdpQ=
 github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e/go.mod h1:qH/34G25Ugdj5FcM95cSoXzUgIbgfhVLXCcEcYaMwq8=
-github.com/pulumi/terraform-provider-vault v1.9.1-0.20231108235540-710122092170 h1:zpAmrthkSwpXOrardc5gM8zN/E6KOSTCdkdUbG1Ogn4=
-github.com/pulumi/terraform-provider-vault v1.9.1-0.20231108235540-710122092170/go.mod h1:cJPMAqq32ao3lEZKaszPu/lOttyMkuxD24s+Ow2kihE=
 github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

provider/resources.go

@@ -139,17 +139,18 @@ var metadata []byte
 // Provider returns additional overlaid schema and metadata associated with the provider.
 func Provider() tfbridge.ProviderInfo {
 	prov := tfbridge.ProviderInfo{
-		P:            shimv2.NewProvider(schema.NewProvider(vault.Provider()).SchemaProvider()),
-		Name:         "vault",
-		DisplayName:  "HashiCorp Vault",
-		Description:  "A Pulumi package for creating and managing HashiCorp Vault cloud resources.",
-		Keywords:     []string{"pulumi", "vault"},
-		License:      "Apache-2.0",
-		Homepage:     "https://pulumi.io",
-		GitHubOrg:    "hashicorp",
-		Repository:   "https://github.com/pulumi/pulumi-vault",
-		Version:      version.Version,
-		MetadataInfo: tfbridge.NewProviderMetadata(metadata),
+		P:                shimv2.NewProvider(schema.NewProvider(vault.Provider()).SchemaProvider()),
+		Name:             "vault",
+		DisplayName:      "HashiCorp Vault",
+		Description:      "A Pulumi package for creating and managing HashiCorp Vault cloud resources.",
+		Keywords:         []string{"pulumi", "vault"},
+		License:          "Apache-2.0",
+		Homepage:         "https://pulumi.io",
+		GitHubOrg:        "hashicorp",
+		Repository:       "https://github.com/pulumi/pulumi-vault",
+		Version:          version.Version,
+		MetadataInfo:     tfbridge.NewProviderMetadata(metadata),
+		UpstreamRepoPath: "./upstream",
 
 		Config: map[string]*tfbridge.SchemaInfo{
 			"skip_tls_verify": {