Skip to content

Commit 2194ad3

Browse files
pascal-hofmannpascal-hofmann
committed
Migrate data sources to terraform-provider-framework
1 parent cf373db commit 2194ad3

File tree

86 files changed

+2879
-1991
lines changed

Some content is hidden

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

86 files changed

+2879
-1991
lines changed

‎ec/acc/acc_prereq.go‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,38 @@
1818
package acc
1919

2020
import (
21+
"context"
22+
"github.com/hashicorp/terraform-plugin-framework/providerserver"
23+
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
24+
"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
2125
"net/http"
2226
"os"
2327
"testing"
2428

2529
"github.com/elastic/cloud-sdk-go/pkg/api"
2630
"github.com/elastic/cloud-sdk-go/pkg/auth"
2731
"github.com/elastic/terraform-provider-ec/ec"
28-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
2932
)
3033

3134
const (
3235
prefix = "terraform_acc_"
3336
)
3437

35-
var testAccProviderFactory = map[string]func() (*schema.Provider, error){
36-
"ec": providerFactory,
37-
}
38-
39-
func providerFactory() (*schema.Provider, error) {
40-
return ec.Provider(), nil
38+
var testAccProviderFactory = protoV5ProviderFactories()
39+
40+
func protoV5ProviderFactories() map[string]func() (tfprotov5.ProviderServer, error) {
41+
return map[string]func() (tfprotov5.ProviderServer, error){
42+
"ec": func() (tfprotov5.ProviderServer, error) {
43+
return tf5muxserver.NewMuxServer(context.Background(),
44+
func() tfprotov5.ProviderServer {
45+
return ec.LegacyProvider().GRPCProvider()
46+
},
47+
func() tfprotov5.ProviderServer {
48+
return providerserver.NewProtocol5(ec.New())()
49+
},
50+
)
51+
},
52+
}
4153
}
4254

4355
func testAccPreCheck(t *testing.T) {

‎ec/acc/datasource_deployment_basic_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ func TestAccDatasourceDeployment_basic(t *testing.T) {
3838
var namePrefix = secondRandomName[:22]
3939

4040
resource.ParallelTest(t, resource.TestCase{
41-
PreCheck: func() { testAccPreCheck(t) },
42-
ProviderFactories: testAccProviderFactory,
43-
CheckDestroy: testAccDeploymentDestroy,
41+
PreCheck: func() { testAccPreCheck(t) },
42+
ProtoV5ProviderFactories: testAccProviderFactory,
43+
CheckDestroy: testAccDeploymentDestroy,
4444
Steps: []resource.TestStep{
4545
{
4646
Config: cfg,

‎ec/acc/datasource_stack_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func TestAccDatasourceStack_latest(t *testing.T) {
3131
cfg := fixtureAccStackDataSource(t, depCfg, getRegion())
3232

3333
resource.ParallelTest(t, resource.TestCase{
34-
PreCheck: func() { testAccPreCheck(t) },
35-
ProviderFactories: testAccProviderFactory,
34+
PreCheck: func() { testAccPreCheck(t) },
35+
ProtoV5ProviderFactories: testAccProviderFactory,
3636
Steps: []resource.TestStep{
3737
{
3838
Config: cfg,
@@ -53,8 +53,8 @@ func TestAccDatasourceStack_regex(t *testing.T) {
5353
cfg := fixtureAccStackDataSource(t, depCfg, getRegion())
5454

5555
resource.ParallelTest(t, resource.TestCase{
56-
PreCheck: func() { testAccPreCheck(t) },
57-
ProviderFactories: testAccProviderFactory,
56+
PreCheck: func() { testAccPreCheck(t) },
57+
ProtoV5ProviderFactories: testAccProviderFactory,
5858
Steps: []resource.TestStep{
5959
{
6060
Config: cfg,

‎ec/acc/datasource_tags_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ func TestAccDatasource_basic_tags(t *testing.T) {
4343
cfg := fixtureAccTagsDataSource(t, depCfg, randomName, getRegion(), defaultTemplate, testID)
4444

4545
resource.ParallelTest(t, resource.TestCase{
46-
PreCheck: func() { testAccPreCheck(t) },
47-
ProviderFactories: testAccProviderFactory,
48-
CheckDestroy: testAccDeploymentDestroy,
46+
PreCheck: func() { testAccPreCheck(t) },
47+
ProtoV5ProviderFactories: testAccProviderFactory,
48+
CheckDestroy: testAccDeploymentDestroy,
4949
Steps: []resource.TestStep{
5050
{
5151
Config: cfg,

‎ec/acc/deployment_autoscaling_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ func TestAccDeployment_autoscaling(t *testing.T) {
3737
}
3838

3939
resource.ParallelTest(t, resource.TestCase{
40-
PreCheck: func() { testAccPreCheck(t) },
41-
ProviderFactories: testAccProviderFactory,
42-
CheckDestroy: testAccDeploymentDestroy,
40+
PreCheck: func() { testAccPreCheck(t) },
41+
ProtoV5ProviderFactories: testAccProviderFactory,
42+
CheckDestroy: testAccDeploymentDestroy,
4343
Steps: []resource.TestStep{
4444
{
4545
Config: cfgF(startCfg),

‎ec/acc/deployment_basic_defaults_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestAccDeployment_basic_defaults(t *testing.T) {
4242
thirdConfigCfg := fixtureAccDeploymentResourceBasicDefaults(t, thirdCfg, randomName, getRegion(), defaultTemplate)
4343

4444
resource.ParallelTest(t, resource.TestCase{
45-
PreCheck: func() { testAccPreCheck(t) },
46-
ProviderFactories: testAccProviderFactory,
47-
CheckDestroy: testAccDeploymentDestroy,
45+
PreCheck: func() { testAccPreCheck(t) },
46+
ProtoV5ProviderFactories: testAccProviderFactory,
47+
CheckDestroy: testAccDeploymentDestroy,
4848
Steps: []resource.TestStep{
4949
{
5050
Config: cfg,
@@ -161,9 +161,9 @@ func TestAccDeployment_basic_defaults_hw(t *testing.T) {
161161
hotWarmCfg := fixtureAccDeploymentResourceBasicDefaults(t, secondCfg, randomName, getRegion(), hotWarmTemplate)
162162

163163
resource.ParallelTest(t, resource.TestCase{
164-
PreCheck: func() { testAccPreCheck(t) },
165-
ProviderFactories: testAccProviderFactory,
166-
CheckDestroy: testAccDeploymentDestroy,
164+
PreCheck: func() { testAccPreCheck(t) },
165+
ProtoV5ProviderFactories: testAccProviderFactory,
166+
CheckDestroy: testAccDeploymentDestroy,
167167
Steps: []resource.TestStep{
168168
{
169169
Config: cfg,

‎ec/acc/deployment_basic_tags_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestAccDeployment_basic_tags(t *testing.T) {
4242
fourthConfigCfg := fixtureAccDeploymentResourceBasicDefaults(t, fourthCfg, randomName, getRegion(), defaultTemplate)
4343

4444
resource.ParallelTest(t, resource.TestCase{
45-
PreCheck: func() { testAccPreCheck(t) },
46-
ProviderFactories: testAccProviderFactory,
47-
CheckDestroy: testAccDeploymentDestroy,
45+
PreCheck: func() { testAccPreCheck(t) },
46+
ProtoV5ProviderFactories: testAccProviderFactory,
47+
CheckDestroy: testAccDeploymentDestroy,
4848
Steps: []resource.TestStep{
4949
{
5050
// Create a deployment with tags.

‎ec/acc/deployment_basic_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestAccDeployment_basic_tf(t *testing.T) {
4242
}
4343

4444
resource.ParallelTest(t, resource.TestCase{
45-
PreCheck: func() { testAccPreCheck(t) },
46-
ProviderFactories: testAccProviderFactory,
47-
CheckDestroy: testAccDeploymentDestroy,
45+
PreCheck: func() { testAccPreCheck(t) },
46+
ProtoV5ProviderFactories: testAccProviderFactory,
47+
CheckDestroy: testAccDeploymentDestroy,
4848
Steps: []resource.TestStep{
4949
{
5050
Config: cfg,
@@ -98,9 +98,9 @@ func TestAccDeployment_basic_config(t *testing.T) {
9898
}
9999

100100
resource.ParallelTest(t, resource.TestCase{
101-
PreCheck: func() { testAccPreCheck(t) },
102-
ProviderFactories: testAccProviderFactory,
103-
CheckDestroy: testAccDeploymentDestroy,
101+
PreCheck: func() { testAccPreCheck(t) },
102+
ProtoV5ProviderFactories: testAccProviderFactory,
103+
CheckDestroy: testAccDeploymentDestroy,
104104
Steps: []resource.TestStep{
105105
{
106106
Config: settingsConfigCfg,

‎ec/acc/deployment_ccs_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ func TestAccDeployment_ccs(t *testing.T) {
4343
secondConfigCfg := fixtureAccDeploymentResourceBasicDefaults(t, secondCfg, ccsRandomName, getRegion(), ccsTemplate)
4444

4545
resource.ParallelTest(t, resource.TestCase{
46-
PreCheck: func() { testAccPreCheck(t) },
47-
ProviderFactories: testAccProviderFactory,
48-
CheckDestroy: testAccDeploymentDestroy,
46+
PreCheck: func() { testAccPreCheck(t) },
47+
ProtoV5ProviderFactories: testAccProviderFactory,
48+
CheckDestroy: testAccDeploymentDestroy,
4949
Steps: []resource.TestStep{
5050
{
5151
// Create a CCS deployment with the default settings.

‎ec/acc/deployment_compute_optimized_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func TestAccDeployment_computeOptimized(t *testing.T) {
3333
secondConfigCfg := fixtureAccDeploymentResourceBasicDefaults(t, secondCfg, randomName, getRegion(), computeOpTemplate)
3434

3535
resource.ParallelTest(t, resource.TestCase{
36-
PreCheck: func() { testAccPreCheck(t) },
37-
ProviderFactories: testAccProviderFactory,
38-
CheckDestroy: testAccDeploymentDestroy,
36+
PreCheck: func() { testAccPreCheck(t) },
37+
ProtoV5ProviderFactories: testAccProviderFactory,
38+
CheckDestroy: testAccDeploymentDestroy,
3939
Steps: []resource.TestStep{
4040
{
4141
// Create a Compute Optimized deployment with the default settings.

0 commit comments

Comments
 (0)