Update dependencies and remove external provider workaround from migration tests

Author: pascal-hofmann

ec/acc/deployment_elasticsearch_kesytore_test.go

@@ -131,17 +131,6 @@ func TestAccDeploymentElasticsearchKeystore_UpgradeFrom0_4_1(t *testing.T) {
 		)
 	}
 
-	// Required because of a bug - see https://discuss.hashicorp.com/t/acceptance-testing-sdk-framework-upgrade-issue/44166/2
-	externalProviderConfig := `
-terraform {
-  required_providers {
-    ec = {
-      source = "elastic/ec"
-      version = "0.4.1"
-    }
-  }
-}`
-
 	resource.ParallelTest(t, resource.TestCase{
 		Steps: []resource.TestStep{
 			{
@@ -151,7 +140,7 @@ terraform {
 						Source:            "elastic/ec",
 					},
 				},
-				Config: cfgF(startCfg) + externalProviderConfig,
+				Config: cfgF(startCfg),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(firstResName, "setting_name", "xpack.notification.slack.account.hello.secure_url"),
 					resource.TestCheckResourceAttr(firstResName, "value", "hella"),

ec/acc/deployment_traffic_filter_association_test.go

@@ -81,16 +81,6 @@ func TestAccDeploymentTrafficFilterAssociation_UpgradeFrom0_4_1(t *testing.T) {
 	cfg := fixtureAccDeploymentTrafficFilterResourceAssociationBasic(t, startCfg, randomName, getRegion(), defaultTemplate)
 	ignoreChangesCfg := fixtureAccDeploymentTrafficFilterResourceAssociationBasic(t, ignoreChangesCfgFile, randomName, getRegion(), defaultTemplate)
 
-	// Required because of a bug - see https://discuss.hashicorp.com/t/acceptance-testing-sdk-framework-upgrade-issue/44166/2
-	externalProviderConfig := `
-terraform {
-  required_providers {
-    ec = {
-      source = "elastic/ec"
-      version = "0.4.1"
-    }
-  }
-}`
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccDeploymentTrafficFilterDestroy,
@@ -105,7 +95,7 @@ terraform {
 				// Expects a non-empty plan since "ec_deployment.traffic_filter"
 				// will have changes due to the traffic filter association.
 				ExpectNonEmptyPlan: true,
-				Config:             cfg + externalProviderConfig,
+				Config:             cfg,
 				Check: checkBasicDeploymentTrafficFilterAssociationResource(
 					resName, resAssocName, randomName,
 					resource.TestCheckResourceAttr(resName, "include_by_default", "false"),

ec/acc/deployment_traffic_filter_test.go

@@ -119,16 +119,6 @@ func TestAccDeploymentTrafficFilter_UpgradeFrom0_4_1(t *testing.T) {
 	startCfg := "testdata/deployment_traffic_filter_basic.tf"
 	cfg := fixtureAccDeploymentTrafficFilterResourceBasic(t, startCfg, randomName, getRegion())
 
-	// Required because of a bug - see https://discuss.hashicorp.com/t/acceptance-testing-sdk-framework-upgrade-issue/44166/2
-	externalProviderConfig := `
-terraform {
-  required_providers {
-    ec = {
-      source = "elastic/ec"
-      version = "0.4.1"
-    }
-  }
-}`
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccDeploymentTrafficFilterDestroy,
@@ -140,7 +130,7 @@ terraform {
 						Source:            "elastic/ec",
 					},
 				},
-				Config: cfg + externalProviderConfig,
+				Config: cfg,
 				Check: checkBasicDeploymentTrafficFilterResource(resName, randomName,
 					resource.TestCheckResourceAttr(resName, "include_by_default", "false"),
 					resource.TestCheckResourceAttr(resName, "type", "ip"),

ec/ecdatasource/deploymentdatasource/datasource.go

@@ -37,8 +37,6 @@ import (
 
 var _ datasource.DataSource = &DataSource{}
 var _ datasource.DataSourceWithConfigure = &DataSource{}
-var _ datasource.DataSourceWithGetSchema = &DataSource{}
-var _ datasource.DataSourceWithMetadata = &DataSource{}
 
 type DataSource struct {
 	client *api.API

ec/ecdatasource/deploymentsdatasource/datasource.go

@@ -37,8 +37,6 @@ import (
 
 var _ datasource.DataSource = &DataSource{}
 var _ datasource.DataSourceWithConfigure = &DataSource{}
-var _ datasource.DataSourceWithGetSchema = &DataSource{}
-var _ datasource.DataSourceWithMetadata = &DataSource{}
 
 type DataSource struct {
 	client *api.API

ec/ecdatasource/stackdatasource/datasource.go

@@ -36,8 +36,6 @@ import (
 
 var _ datasource.DataSource = &DataSource{}
 var _ datasource.DataSourceWithConfigure = &DataSource{}
-var _ datasource.DataSourceWithGetSchema = &DataSource{}
-var _ datasource.DataSourceWithMetadata = &DataSource{}
 
 type DataSource struct {
 	client *api.API

ec/ecresource/elasticsearchkeystoreresource/schema.go

@@ -33,9 +33,6 @@ import (
 // Ensure provider defined types fully satisfy framework interfaces
 var _ resource.Resource = &Resource{}
 var _ resource.ResourceWithConfigure = &Resource{}
-var _ resource.ResourceWithGetSchema = &Resource{}
-
-var _ resource.ResourceWithMetadata = &Resource{}
 
 func (r *Resource) GetSchema(ctx context.Context) (tfsdk.Schema, diag.Diagnostics) {
 	return tfsdk.Schema{

ec/ecresource/trafficfilterassocresource/schema.go

@@ -33,9 +33,7 @@ import (
 // Ensure provider defined types fully satisfy framework interfaces
 var _ resource.Resource = &Resource{}
 var _ resource.ResourceWithConfigure = &Resource{}
-var _ resource.ResourceWithGetSchema = &Resource{}
 var _ resource.ResourceWithImportState = &Resource{}
-var _ resource.ResourceWithMetadata = &Resource{}
 
 const entityTypeDeployment = "deployment"
 

ec/ecresource/trafficfilterresource/schema.go

@@ -36,9 +36,7 @@ import (
 // Ensure provider defined types fully satisfy framework interfaces
 var _ resource.Resource = &Resource{}
 var _ resource.ResourceWithConfigure = &Resource{}
-var _ resource.ResourceWithGetSchema = &Resource{}
 var _ resource.ResourceWithImportState = &Resource{}
-var _ resource.ResourceWithMetadata = &Resource{}
 
 func (r *Resource) GetSchema(_ context.Context) (tfsdk.Schema, diag.Diagnostics) {
 	return tfsdk.Schema{

ec/provider.go

@@ -149,8 +149,6 @@ func ProviderWithClient(client *api.API, version string) provider.Provider {
 
 var _ provider.Provider = (*Provider)(nil)
 var _ provider.ProviderWithMetadata = (*Provider)(nil)
-var _ provider.ProviderWithDataSources = (*Provider)(nil)
-var _ provider.ProviderWithResources = (*Provider)(nil)
 
 type Provider struct {
 	version string