Skip to content

Commit ae3fd30

Browse files
author
Kanji Yomoda
authored
Use proto v5 mux server (#215)
* Use mux server to be able to use terraform-plugin-framework provider * Use tfprotov5 server in tests * Rename sdk v2 provider variable
1 parent 86ba2b2 commit ae3fd30

File tree

64 files changed

+284
-236
lines changed

Some content is hidden

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

64 files changed

+284
-236
lines changed

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require (
3131
github.com/hashicorp/terraform-exec v0.17.3 // indirect
3232
github.com/hashicorp/terraform-json v0.14.0 // indirect
3333
github.com/hashicorp/terraform-plugin-go v0.14.0 // indirect
34+
github.com/hashicorp/terraform-plugin-mux v0.7.0 // indirect
3435
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
3536
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
3637
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ github.com/hashicorp/terraform-plugin-go v0.14.0 h1:ttnSlS8bz3ZPYbMb84DpcPhY4F5D
126126
github.com/hashicorp/terraform-plugin-go v0.14.0/go.mod h1:2nNCBeRLaenyQEi78xrGrs9hMbulveqG/zDMQSvVJTE=
127127
github.com/hashicorp/terraform-plugin-log v0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs=
128128
github.com/hashicorp/terraform-plugin-log v0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4=
129+
github.com/hashicorp/terraform-plugin-mux v0.7.0 h1:wRbSYzg+v2sn5Mdee0UKm4YTt4wJG0LfSwtgNuBkglY=
130+
github.com/hashicorp/terraform-plugin-mux v0.7.0/go.mod h1:Ae30Mc5lz4d1awtiCbHP0YyvgBeiQ00Q1nAq0U3lb+I=
129131
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 h1:FtCLTiTcykdsURXPt/ku7fYXm3y19nbzbZcUxHx9RbI=
130132
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0/go.mod h1:80wf5oad1tW+oLnbXS4UTYmDCrl7BuN1Q+IA91X1a4Y=
131133
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c h1:D8aRO6+mTqHfLsK/BC3j5OAoogv1WLRWzY1AaTo3rBg=

‎internal/acctest/acctest.go‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
package acctest
22

33
import (
4+
"context"
5+
"log"
46
"os"
57
"testing"
68

79
"github.com/elastic/terraform-provider-elasticstack/provider"
10+
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
811
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
912
)
1013

11-
var Providers map[string]func() (*schema.Provider, error)
14+
var Providers map[string]func() (tfprotov5.ProviderServer, error)
1215
var Provider *schema.Provider
1316

1417
func init() {
15-
Provider = provider.New("dev")()
16-
Providers = map[string]func() (*schema.Provider, error){
17-
"elasticstack": func() (*schema.Provider, error) {
18-
return Provider, nil
18+
providerServerFactory, sdkv2Provider, err := provider.ProtoV5ProviderServerFactory(context.Background(), "dev")
19+
if err != nil {
20+
log.Fatal(err)
21+
}
22+
Provider = sdkv2Provider
23+
Providers = map[string]func() (tfprotov5.ProviderServer, error){
24+
"elasticstack": func() (tfprotov5.ProviderServer, error) {
25+
return providerServerFactory(), nil
1926
},
2027
}
2128
}

‎internal/elasticsearch/cluster/script_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ func TestAccResourceScript(t *testing.T) {
1515
scriptID := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
1616

1717
resource.Test(t, resource.TestCase{
18-
PreCheck: func() { acctest.PreCheck(t) },
19-
CheckDestroy: checkScriptDestroy,
20-
ProviderFactories: acctest.Providers,
18+
PreCheck: func() { acctest.PreCheck(t) },
19+
CheckDestroy: checkScriptDestroy,
20+
ProtoV5ProviderFactories: acctest.Providers,
2121
Steps: []resource.TestStep{
2222
{
2323
Config: testAccScriptCreate(scriptID),
@@ -45,9 +45,9 @@ func TestAccResourceScriptSearchTemplate(t *testing.T) {
4545
scriptID := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
4646

4747
resource.Test(t, resource.TestCase{
48-
PreCheck: func() { acctest.PreCheck(t) },
49-
CheckDestroy: checkScriptDestroy,
50-
ProviderFactories: acctest.Providers,
48+
PreCheck: func() { acctest.PreCheck(t) },
49+
CheckDestroy: checkScriptDestroy,
50+
ProtoV5ProviderFactories: acctest.Providers,
5151
Steps: []resource.TestStep{
5252
{
5353
Config: testAccSearchTemplateCreate(scriptID),

‎internal/elasticsearch/cluster/settings_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
func TestAccResourceClusterSettings(t *testing.T) {
1515
resource.Test(t, resource.TestCase{
16-
PreCheck: func() { acctest.PreCheck(t) },
17-
CheckDestroy: checkResourceClusterSettingsDestroy,
18-
ProviderFactories: acctest.Providers,
16+
PreCheck: func() { acctest.PreCheck(t) },
17+
CheckDestroy: checkResourceClusterSettingsDestroy,
18+
ProtoV5ProviderFactories: acctest.Providers,
1919
Steps: []resource.TestStep{
2020
{
2121
Config: testAccResourceClusterSettingsCreate(),

‎internal/elasticsearch/cluster/slm_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ func TestAccResourceSLM(t *testing.T) {
1616
name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
1717

1818
resource.Test(t, resource.TestCase{
19-
PreCheck: func() { acctest.PreCheck(t) },
20-
CheckDestroy: checkSlmDestroy(name),
21-
ProviderFactories: acctest.Providers,
19+
PreCheck: func() { acctest.PreCheck(t) },
20+
CheckDestroy: checkSlmDestroy(name),
21+
ProtoV5ProviderFactories: acctest.Providers,
2222
Steps: []resource.TestStep{
2323
{
2424
Config: testAccSlmCreate(name),

‎internal/elasticsearch/cluster/snapshot_repository_data_source_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ func TestAccDataSourceSnapRepoFs(t *testing.T) {
1313
name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
1414

1515
resource.Test(t, resource.TestCase{
16-
PreCheck: func() { acctest.PreCheck(t) },
17-
ProviderFactories: acctest.Providers,
16+
PreCheck: func() { acctest.PreCheck(t) },
17+
ProtoV5ProviderFactories: acctest.Providers,
1818
Steps: []resource.TestStep{
1919
{
2020
Config: testAccDataSourceSnapRepoFs(name),
@@ -58,8 +58,8 @@ func TestAccDataSourceSnapRepoUrl(t *testing.T) {
5858
name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
5959

6060
resource.Test(t, resource.TestCase{
61-
PreCheck: func() { acctest.PreCheck(t) },
62-
ProviderFactories: acctest.Providers,
61+
PreCheck: func() { acctest.PreCheck(t) },
62+
ProtoV5ProviderFactories: acctest.Providers,
6363
Steps: []resource.TestStep{
6464
{
6565
Config: testAccDataSourceSnapRepoUrl(name),

‎internal/elasticsearch/cluster/snapshot_repository_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ func TestAccResourceSnapRepoFs(t *testing.T) {
1616
name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
1717

1818
resource.Test(t, resource.TestCase{
19-
PreCheck: func() { acctest.PreCheck(t) },
20-
CheckDestroy: checkRepoDestroy(name),
21-
ProviderFactories: acctest.Providers,
19+
PreCheck: func() { acctest.PreCheck(t) },
20+
CheckDestroy: checkRepoDestroy(name),
21+
ProtoV5ProviderFactories: acctest.Providers,
2222
Steps: []resource.TestStep{
2323
{
2424
Config: testAccRepoFsCreate(name),
@@ -49,9 +49,9 @@ func TestAccResourceSnapRepoUrl(t *testing.T) {
4949
name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
5050

5151
resource.Test(t, resource.TestCase{
52-
PreCheck: func() { acctest.PreCheck(t) },
53-
CheckDestroy: checkRepoDestroy(name),
54-
ProviderFactories: acctest.Providers,
52+
PreCheck: func() { acctest.PreCheck(t) },
53+
CheckDestroy: checkRepoDestroy(name),
54+
ProtoV5ProviderFactories: acctest.Providers,
5555
Steps: []resource.TestStep{
5656
{
5757
Config: testAccRepoUrlCreate(name),

‎internal/elasticsearch/index/component_template_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ func TestAccResourceComponentTemplate(t *testing.T) {
1616
templateName := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
1717

1818
resource.Test(t, resource.TestCase{
19-
PreCheck: func() { acctest.PreCheck(t) },
20-
CheckDestroy: checkResourceComponentTemplateDestroy,
21-
ProviderFactories: acctest.Providers,
19+
PreCheck: func() { acctest.PreCheck(t) },
20+
CheckDestroy: checkResourceComponentTemplateDestroy,
21+
ProtoV5ProviderFactories: acctest.Providers,
2222
Steps: []resource.TestStep{
2323
{
2424
Config: testAccResourceComponentTemplateCreate(templateName),

‎internal/elasticsearch/index/data_stream_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ func TestAccResourceDataStream(t *testing.T) {
1616
dsName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlpha)
1717

1818
resource.Test(t, resource.TestCase{
19-
PreCheck: func() { acctest.PreCheck(t) },
20-
CheckDestroy: checkResourceDataStreamDestroy,
21-
ProviderFactories: acctest.Providers,
19+
PreCheck: func() { acctest.PreCheck(t) },
20+
CheckDestroy: checkResourceDataStreamDestroy,
21+
ProtoV5ProviderFactories: acctest.Providers,
2222
Steps: []resource.TestStep{
2323
{
2424
Config: testAccResourceDataStreamCreate(dsName),

0 commit comments

Comments
 (0)