Skip to content
This repository was archived by the owner on Jul 5, 2023. It is now read-only.

Commit 7b0c30f

Browse files
committed
plugin: Update tfsdk.NewProtocol6Server usage with new functions
Reference: hashicorp/terraform-plugin-framework#294
1 parent 330769d commit 7b0c30f

4 files changed

+10
-27
lines changed

content/plugin/framework/acctests.mdx

+3-6
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,15 @@ to supply a map of functions that return a
2828
To get a `tfprotov6.ProviderServer` from a
2929
[`tfsdk.Provider`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#Provider),
3030
you need to use the
31-
[`tfsdk.NewProtocol6Server`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#NewProtocol6Server)
31+
[`tfsdk.NewProtocol6ProviderServerWithError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#NewProtocol6ProviderServerWithError)
3232
helper. For example:
3333

3434
```go
3535
resource.Test(t, resource.TestCase{
3636
PreCheck: func() { testAccPreCheck(t) },
3737
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error) {
38-
"example_provider": func() (tfprotov6.ProviderServer, error) {
39-
// newProvider is your function that returns a
40-
// tfsdk.Provider implementation
41-
return tfsdk.NewProtocol6Server(newProvider()), nil
42-
},
38+
// newProvider is your function that returns a tfsdk.Provider
39+
"example_provider": tfsdk.NewProtocol6ProviderServerWithError(newProvider()),
4340
},
4441
CheckDestroy: testAccCheckExampleResourceDestroy,
4542
Steps: []resource.TestStep{

content/plugin/mux/combining-protocol-version-6-providers.mdx

+4-12
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ func main() {
6767
ctx := context.Background()
6868
providers := []func() tfprotov6.ProviderServer{
6969
// Example terraform-plugin-framework providers
70-
func() tfprotov6.ProviderServer {
71-
return tfsdk.NewProtocol6Server(provider1.New("test")())
72-
},
73-
func() tfprotov6.ProviderServer {
74-
return tfsdk.NewProtocol6Server(provider2.New("test")())
75-
},
70+
tfsdk.NewProtocol6ProviderServer(provider1.New("test")())
71+
tfsdk.NewProtocol6ProviderServer(provider2.New("test")())
7672
}
7773

7874
muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
@@ -113,12 +109,8 @@ resource.Test(t, resource.TestCase{
113109
ctx := context.Background()
114110
providers := []func() tfprotov6.ProviderServer{
115111
// Example terraform-plugin-framework providers
116-
func() tfprotov6.ProviderServer {
117-
return tfsdk.NewProtocol6Server(provider1.New("test")())
118-
},
119-
func() tfprotov6.ProviderServer {
120-
return tfsdk.NewProtocol6Server(provider2.New("test")())
121-
},
112+
tfsdk.NewProtocol6ProviderServer(provider1.New("test")())
113+
tfsdk.NewProtocol6ProviderServer(provider2.New("test")())
122114
}
123115

124116
muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)

content/plugin/mux/translating-protocol-version-5-to-6.mdx

+1-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ providers := []func() tfprotov6.ProviderServer{
5757
upgradedSdkProvider.ProviderServer,
5858

5959
// Example terraform-plugin-framework provider
60-
func() tfprotov6.ProviderServer {
61-
return tfsdk.NewProtocol6Server(frameworkprovider.New(version)())
62-
},
60+
tfsdk.NewProtocol6ProviderServer(frameworkprovider.New(version)())
6361
}
6462

6563
muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)

content/plugin/mux/translating-protocol-version-6-to-5.mdx

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ The following example downgrades a `terraform-plugin-framework` provider.
3737
```go
3838
downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
3939
context.Background(),
40-
func() tfprotov6.ProviderServer {
41-
return tfsdk.NewProtocol6Server(frameworkprovider.New(version)())
42-
},
40+
tfsdk.NewProtocol6ProviderServer(frameworkprovider.New(version)())
4341
)
4442
```
4543

@@ -81,9 +79,7 @@ resource.Test(t, resource.TestCase{
8179
ctx := context.Background()
8280
downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
8381
ctx,
84-
func() tfprotov6.ProviderServer {
85-
return tfsdk.NewProtocol6Server(frameworkprovider.New("test")())
86-
},
82+
tfsdk.NewProtocol6ProviderServer(frameworkprovider.New("test")())
8783
)
8884

8985
if err != nil {

0 commit comments

Comments
 (0)