Skip to content

Commit 6c32245

Browse files
authored
Move core provider factory functionality to the provider package. (hashicorp#1884)
Currently, it is not possible to test meta.NewProviderMeta since it depends the vault.Provider(), which creates a cyclical dependency. It also makes sense that the provider factory would be in the lower level 'provider' package. * Update NewProvider(), make arg names more distinct
1 parent f9ab0c6 commit 6c32245

File tree

155 files changed

+479
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+479
-444
lines changed

cmd/coverage/main.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import (
1212
"os"
1313
"sort"
1414

15-
"github.com/hashicorp/terraform-provider-vault/vault"
1615
"github.com/hashicorp/vault/sdk/framework"
16+
17+
"github.com/hashicorp/terraform-provider-vault/internal/provider"
18+
"github.com/hashicorp/terraform-provider-vault/vault"
1719
)
1820

1921
var pathToOpenAPIDoc = flag.String("openapi-doc", "", "path/to/openapi.json")
@@ -89,7 +91,7 @@ func main() {
8991
}
9092
}
9193

92-
func checkRegistry(registryType string, registry map[string]*vault.Description, vaultPaths map[string]map[string]bool) {
94+
func checkRegistry(registryType string, registry map[string]*provider.Description, vaultPaths map[string]map[string]bool) {
9395
for _, desc := range registry {
9496
for _, path := range desc.PathInventory {
9597
if path == vault.GenericPath || path == vault.UnknownPath {

generated/datasources/transform/decode/role_name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const roleNameEndpoint = "/transform/decode/{role_name}"
2221

2322
func RoleNameDataSource() *schema.Resource {
2423
return &schema.Resource{
25-
Read: vault.ReadWrapper(readRoleNameResource),
24+
Read: provider.ReadWrapper(readRoleNameResource),
2625
Schema: map[string]*schema.Schema{
2726
"path": {
2827
Type: schema.TypeString,

generated/datasources/transform/encode/role_name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const roleNameEndpoint = "/transform/encode/{role_name}"
2221

2322
func RoleNameDataSource() *schema.Resource {
2423
return &schema.Resource{
25-
Read: vault.ReadWrapper(readRoleNameResource),
24+
Read: provider.ReadWrapper(readRoleNameResource),
2625
Schema: map[string]*schema.Schema{
2726
"path": {
2827
Type: schema.TypeString,

generated/resources/transform/alphabet/name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const nameEndpoint = "/transform/alphabet/{name}"
@@ -46,7 +45,7 @@ func NameResource() *schema.Resource {
4645
return &schema.Resource{
4746
Create: createNameResource,
4847
Update: updateNameResource,
49-
Read: vault.ReadWrapper(readNameResource),
48+
Read: provider.ReadWrapper(readNameResource),
5049
Exists: resourceNameExists,
5150
Delete: deleteNameResource,
5251
Importer: &schema.ResourceImporter{

generated/resources/transform/role/name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const nameEndpoint = "/transform/role/{name}"
@@ -47,7 +46,7 @@ func NameResource() *schema.Resource {
4746
return &schema.Resource{
4847
Create: createNameResource,
4948
Update: updateNameResource,
50-
Read: vault.ReadWrapper(readNameResource),
49+
Read: provider.ReadWrapper(readNameResource),
5150
Exists: resourceNameExists,
5251
Delete: deleteNameResource,
5352
Importer: &schema.ResourceImporter{

generated/resources/transform/template/name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const (
@@ -89,7 +88,7 @@ Only applicable to FPE transformations.`,
8988
return &schema.Resource{
9089
Create: createNameResource,
9190
Update: updateNameResource,
92-
Read: vault.ReadWrapper(readNameResource),
91+
Read: provider.ReadWrapper(readNameResource),
9392
Exists: resourceNameExists,
9493
Delete: deleteNameResource,
9594
Importer: &schema.ResourceImporter{

generated/resources/transform/transformation/name.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/hashicorp/terraform-provider-vault/internal/provider"
1717
"github.com/hashicorp/terraform-provider-vault/util"
18-
"github.com/hashicorp/terraform-provider-vault/vault"
1918
)
2019

2120
const nameEndpoint = "/transform/transformation/{name}"
@@ -81,7 +80,7 @@ func NameResource() *schema.Resource {
8180
return &schema.Resource{
8281
Create: createNameResource,
8382
Update: updateNameResource,
84-
Read: vault.ReadWrapper(readNameResource),
83+
Read: provider.ReadWrapper(readNameResource),
8584
Exists: resourceNameExists,
8685
Delete: deleteNameResource,
8786
Importer: &schema.ResourceImporter{

0 commit comments

Comments
 (0)