Skip to content

Commit 8a79970

Browse files
Update to terraform-plugin-framework 0.12 and fix import order
1 parent a5de6e9 commit 8a79970

File tree

130 files changed

+579
-330
lines changed

Some content is hidden

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

130 files changed

+579
-330
lines changed

ec/acc/acc_prereq.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929

3030
"github.com/elastic/cloud-sdk-go/pkg/api"
3131
"github.com/elastic/cloud-sdk-go/pkg/auth"
32+
3233
"github.com/elastic/terraform-provider-ec/ec"
3334
)
3435

ec/acc/deployment_checks_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ package acc
2020
import (
2121
"fmt"
2222

23+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
24+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
25+
2326
"github.com/elastic/cloud-sdk-go/pkg/api"
2427
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi"
2528
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/deputil"
26-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
27-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2829
)
2930

3031
func testAccCheckDeploymentExists(name string) resource.TestCheckFunc {

ec/acc/deployment_destroy_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ package acc
2020
import (
2121
"fmt"
2222

23+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
24+
2325
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi"
2426
"github.com/elastic/cloud-sdk-go/pkg/multierror"
25-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2627
)
2728

2829
func testAccDeploymentDestroy(s *terraform.State) error {

ec/acc/deployment_elasticsearch_kesytore_destroy_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ package acc
2020
import (
2121
"fmt"
2222

23+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
24+
2325
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/eskeystoreapi"
2426
"github.com/elastic/cloud-sdk-go/pkg/multierror"
25-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2627
)
2728

2829
func testAccDeploymentElasticsearchKeystoreDestroy(s *terraform.State) error {

ec/acc/deployment_elasticsearch_kesytore_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import (
2121
"fmt"
2222
"testing"
2323

24-
"github.com/elastic/cloud-sdk-go/pkg/multierror"
2524
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
2625
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
2726
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
27+
28+
"github.com/elastic/cloud-sdk-go/pkg/multierror"
2829
)
2930

3031
func TestAccDeploymentElasticsearchKeystore_full(t *testing.T) {

ec/acc/deployment_extension_bundle_file_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ import (
2727
"path/filepath"
2828
"testing"
2929

30-
"github.com/elastic/cloud-sdk-go/pkg/client/extensions"
3130
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
3231
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
3332
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
33+
34+
"github.com/elastic/cloud-sdk-go/pkg/client/extensions"
3435
)
3536

3637
func TestAccDeploymentExtension_bundleFile(t *testing.T) {

ec/acc/deployment_extension_destroy_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ package acc
2020
import (
2121
"fmt"
2222

23+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
24+
2325
"github.com/elastic/cloud-sdk-go/pkg/api/apierror"
2426
"github.com/elastic/cloud-sdk-go/pkg/client/extensions"
25-
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2627
)
2728

2829
func testAccExtensionDestroy(s *terraform.State) error {

ec/acc/deployment_failed_upgrade_retry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"regexp"
2424
"testing"
2525

26-
semver "github.com/blang/semver/v4"
26+
"github.com/blang/semver/v4"
2727
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
2828
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
2929
)

ec/acc/deployment_sweep_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ import (
2323
"sync"
2424
"time"
2525

26+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
27+
2628
"github.com/elastic/cloud-sdk-go/pkg/api"
2729
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi"
2830
"github.com/elastic/cloud-sdk-go/pkg/models"
2931
"github.com/elastic/cloud-sdk-go/pkg/multierror"
3032
"github.com/elastic/cloud-sdk-go/pkg/plan"
3133
"github.com/elastic/cloud-sdk-go/pkg/plan/planutil"
3234
"github.com/elastic/cloud-sdk-go/pkg/util/ec"
33-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
3435
)
3536

3637
func init() {

ec/acc/deployment_traffic_filter_checks_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ package acc
2020
import (
2121
"fmt"
2222

23-
"github.com/elastic/cloud-sdk-go/pkg/api"
24-
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/trafficfilterapi"
2523
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
2624
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
25+
26+
"github.com/elastic/cloud-sdk-go/pkg/api"
27+
"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/trafficfilterapi"
2728
)
2829

2930
func testAccCheckDeploymentTrafficFilterExists(name string) resource.TestCheckFunc {

0 commit comments

Comments
 (0)