Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize Provider: convert the fork to a patch #329

Merged
merged 1 commit into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "upstream"]
path = upstream
url = https://github.com/hashicorp/terraform-provider-vault.git
ignore = dirty
1,670 changes: 1,670 additions & 0 deletions patches/0001-fork.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 0 additions & 2 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
23 changes: 12 additions & 11 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions upstream
Submodule upstream added at 116860
Loading