diff --git a/go.mod b/go.mod index 235a6dfc7..fa7f690c4 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.20.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 + github.com/hashicorp/terraform-plugin-testing v1.13.3 github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c github.com/oapi-codegen/runtime v1.1.2 github.com/stretchr/testify v1.11.0 diff --git a/go.sum b/go.sum index ccc107a1d..a75eb60ec 100644 --- a/go.sum +++ b/go.sum @@ -621,6 +621,8 @@ github.com/hashicorp/terraform-plugin-mux v0.20.0 h1:3QpBnI9uCuL0Yy2Rq/kR9cOdmOF github.com/hashicorp/terraform-plugin-mux v0.20.0/go.mod h1:wSIZwJjSYk86NOTX3fKUlThMT4EAV1XpBHz9SAvjQr4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA= +github.com/hashicorp/terraform-plugin-testing v1.13.3 h1:QLi/khB8Z0a5L54AfPrHukFpnwsGL8cwwswj4RZduCo= +github.com/hashicorp/terraform-plugin-testing v1.13.3/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE= github.com/hashicorp/terraform-registry-address v0.2.5 h1:2GTftHqmUhVOeuu9CW3kwDkRe4pcBDq0uuK5VJngU1M= github.com/hashicorp/terraform-registry-address v0.2.5/go.mod h1:PpzXWINwB5kuVS5CA7m1+eO2f1jKb5ZDIxrOPfpnGkg= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= diff --git a/internal/acctest/checks/resource_list.go b/internal/acctest/checks/resource_list.go index c488c1677..c6439fb4a 100644 --- a/internal/acctest/checks/resource_list.go +++ b/internal/acctest/checks/resource_list.go @@ -3,7 +3,7 @@ package checks import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestCheckResourceListAttr(name, key string, values []string) resource.TestCheckFunc { diff --git a/internal/acctest/checks/user_auth.go b/internal/acctest/checks/user_auth.go index 5200ebf0a..adeae7c2f 100644 --- a/internal/acctest/checks/user_auth.go +++ b/internal/acctest/checks/user_auth.go @@ -6,7 +6,7 @@ import ( "io" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func CheckUserCanAuthenticate(username string, password string) func(*terraform.State) error { diff --git a/internal/apm/agent_configuration/resource_test.go b/internal/apm/agent_configuration/resource_test.go index 4f9e0a828..0f292a2dc 100644 --- a/internal/apm/agent_configuration/resource_test.go +++ b/internal/apm/agent_configuration/resource_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - tf_acctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + tf_acctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccResourceAgentConfiguration(t *testing.T) { diff --git a/internal/elasticsearch/cluster/cluster_info_data_source_test.go b/internal/elasticsearch/cluster/cluster_info_data_source_test.go index 80b256bab..f8a981917 100644 --- a/internal/elasticsearch/cluster/cluster_info_data_source_test.go +++ b/internal/elasticsearch/cluster/cluster_info_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceClusterInfo(t *testing.T) { diff --git a/internal/elasticsearch/cluster/script_test.go b/internal/elasticsearch/cluster/script_test.go index eb31cf320..f2d98cee5 100644 --- a/internal/elasticsearch/cluster/script_test.go +++ b/internal/elasticsearch/cluster/script_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/stretchr/testify/require" ) diff --git a/internal/elasticsearch/cluster/settings_test.go b/internal/elasticsearch/cluster/settings_test.go index 1c604e60c..1edade951 100644 --- a/internal/elasticsearch/cluster/settings_test.go +++ b/internal/elasticsearch/cluster/settings_test.go @@ -7,8 +7,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceClusterSettings(t *testing.T) { diff --git a/internal/elasticsearch/cluster/slm_test.go b/internal/elasticsearch/cluster/slm_test.go index ba1c46d38..49bb1bd11 100644 --- a/internal/elasticsearch/cluster/slm_test.go +++ b/internal/elasticsearch/cluster/slm_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSLM(t *testing.T) { diff --git a/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go b/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go index 5aaa64f1c..9db617264 100644 --- a/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go +++ b/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSnapRepoMissing(t *testing.T) { diff --git a/internal/elasticsearch/cluster/snapshot_repository_test.go b/internal/elasticsearch/cluster/snapshot_repository_test.go index 87352cf1a..a51262eef 100644 --- a/internal/elasticsearch/cluster/snapshot_repository_test.go +++ b/internal/elasticsearch/cluster/snapshot_repository_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSnapRepoFs(t *testing.T) { diff --git a/internal/elasticsearch/index/component_template_test.go b/internal/elasticsearch/index/component_template_test.go index 70dfb3ed2..ca8b603cf 100644 --- a/internal/elasticsearch/index/component_template_test.go +++ b/internal/elasticsearch/index/component_template_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceComponentTemplate(t *testing.T) { diff --git a/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go b/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go index 708ad1600..1575ab95b 100644 --- a/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go +++ b/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go @@ -11,9 +11,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/index/data_stream_lifecycle" "github.com/elastic/terraform-provider-elasticstack/internal/models" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceDataStreamLifecycle(t *testing.T) { diff --git a/internal/elasticsearch/index/data_stream_test.go b/internal/elasticsearch/index/data_stream_test.go index 27c5e0511..7b7b63e43 100644 --- a/internal/elasticsearch/index/data_stream_test.go +++ b/internal/elasticsearch/index/data_stream_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceDataStream(t *testing.T) { diff --git a/internal/elasticsearch/index/ilm_test.go b/internal/elasticsearch/index/ilm_test.go index e22d55047..2e9d8e84f 100644 --- a/internal/elasticsearch/index/ilm_test.go +++ b/internal/elasticsearch/index/ilm_test.go @@ -9,9 +9,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/index" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var totalShardsPerNodeVersionLimit = version.Must(version.NewVersion("7.16.0")) diff --git a/internal/elasticsearch/index/index/acc_test.go b/internal/elasticsearch/index/index/acc_test.go index 1862ff9e5..f0bfacff8 100644 --- a/internal/elasticsearch/index/index/acc_test.go +++ b/internal/elasticsearch/index/index/acc_test.go @@ -7,9 +7,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceIndex(t *testing.T) { diff --git a/internal/elasticsearch/index/indices/data_source_test.go b/internal/elasticsearch/index/indices/data_source_test.go index 43614364e..3d12c5c50 100644 --- a/internal/elasticsearch/index/indices/data_source_test.go +++ b/internal/elasticsearch/index/indices/data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIndicesDataSource(t *testing.T) { diff --git a/internal/elasticsearch/index/template_data_source_test.go b/internal/elasticsearch/index/template_data_source_test.go index 6cc4aa0cf..63f4f3e72 100644 --- a/internal/elasticsearch/index/template_data_source_test.go +++ b/internal/elasticsearch/index/template_data_source_test.go @@ -7,8 +7,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/index" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIndexTemplateDataSource(t *testing.T) { diff --git a/internal/elasticsearch/index/template_test.go b/internal/elasticsearch/index/template_test.go index 7e0ffd8f2..19951ab59 100644 --- a/internal/elasticsearch/index/template_test.go +++ b/internal/elasticsearch/index/template_test.go @@ -8,9 +8,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients" "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/index" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceIndexTemplate(t *testing.T) { diff --git a/internal/elasticsearch/ingest/commons_test.go b/internal/elasticsearch/ingest/commons_test.go index e75215885..6a47243c0 100644 --- a/internal/elasticsearch/ingest/commons_test.go +++ b/internal/elasticsearch/ingest/commons_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/elastic/terraform-provider-elasticstack/internal/utils" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // check if the provided json string equal to the generated one diff --git a/internal/elasticsearch/ingest/pipeline_test.go b/internal/elasticsearch/ingest/pipeline_test.go index 6dac7fa5e..b5db8de67 100644 --- a/internal/elasticsearch/ingest/pipeline_test.go +++ b/internal/elasticsearch/ingest/pipeline_test.go @@ -6,9 +6,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceIngestPipeline(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_append_data_source_test.go b/internal/elasticsearch/ingest/processor_append_data_source_test.go index 4dbb95cda..2d31a881e 100644 --- a/internal/elasticsearch/ingest/processor_append_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_append_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorAppend(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_bytes_data_source_test.go b/internal/elasticsearch/ingest/processor_bytes_data_source_test.go index aacc9cb93..e996865e5 100644 --- a/internal/elasticsearch/ingest/processor_bytes_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_bytes_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorBytes(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_circle_data_source_test.go b/internal/elasticsearch/ingest/processor_circle_data_source_test.go index 7c3afdb02..bf80fde5d 100644 --- a/internal/elasticsearch/ingest/processor_circle_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_circle_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorCircle(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_community_id_data_source_test.go b/internal/elasticsearch/ingest/processor_community_id_data_source_test.go index 3593d04cc..e173a0e65 100644 --- a/internal/elasticsearch/ingest/processor_community_id_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_community_id_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorCommunityId(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_convert_data_source_test.go b/internal/elasticsearch/ingest/processor_convert_data_source_test.go index 821cb4ccc..498762b1d 100644 --- a/internal/elasticsearch/ingest/processor_convert_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_convert_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorConvert(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_csv_data_source_test.go b/internal/elasticsearch/ingest/processor_csv_data_source_test.go index b71862845..72b7c8b94 100644 --- a/internal/elasticsearch/ingest/processor_csv_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_csv_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorCSV(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_date_data_source_test.go b/internal/elasticsearch/ingest/processor_date_data_source_test.go index eeec82f95..b04e3bd80 100644 --- a/internal/elasticsearch/ingest/processor_date_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_date_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorDate(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go b/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go index e1445cb27..13bf0f70e 100644 --- a/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorDateIndexName(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_dissect_data_source_test.go b/internal/elasticsearch/ingest/processor_dissect_data_source_test.go index 34d94cc0e..237f093ad 100644 --- a/internal/elasticsearch/ingest/processor_dissect_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_dissect_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorDissect(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go b/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go index 6062a90c0..68975f735 100644 --- a/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorDotExpander(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_drop_data_source_test.go b/internal/elasticsearch/ingest/processor_drop_data_source_test.go index 52f388856..2806d67fe 100644 --- a/internal/elasticsearch/ingest/processor_drop_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_drop_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorDrop(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_fail_data_source_test.go b/internal/elasticsearch/ingest/processor_fail_data_source_test.go index 58c9d56c2..81d0723e8 100644 --- a/internal/elasticsearch/ingest/processor_fail_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_fail_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorFail(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go b/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go index 9430db472..2ceceb6e9 100644 --- a/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorFingerprint(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_foreach_data_source_test.go b/internal/elasticsearch/ingest/processor_foreach_data_source_test.go index 39e29ac28..3e0e99145 100644 --- a/internal/elasticsearch/ingest/processor_foreach_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_foreach_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorForeach(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_geoip_data_source_test.go b/internal/elasticsearch/ingest/processor_geoip_data_source_test.go index f1701116b..8e401c3ee 100644 --- a/internal/elasticsearch/ingest/processor_geoip_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_geoip_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorGeoip(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_grok_data_source_test.go b/internal/elasticsearch/ingest/processor_grok_data_source_test.go index a27f2dd10..288f5b297 100644 --- a/internal/elasticsearch/ingest/processor_grok_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_grok_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorGrok(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_gsub_data_source_test.go b/internal/elasticsearch/ingest/processor_gsub_data_source_test.go index 3f67c93c1..227e28720 100644 --- a/internal/elasticsearch/ingest/processor_gsub_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_gsub_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorGsub(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go b/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go index 947d668e9..0c53e8bf7 100644 --- a/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorHtmlStrip(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_join_data_source_test.go b/internal/elasticsearch/ingest/processor_join_data_source_test.go index eaf305786..2ce23b037 100644 --- a/internal/elasticsearch/ingest/processor_join_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_join_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorJoin(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_json_data_source_test.go b/internal/elasticsearch/ingest/processor_json_data_source_test.go index e2561bb2e..e598161d1 100644 --- a/internal/elasticsearch/ingest/processor_json_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_json_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorJson(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_kv_data_source_test.go b/internal/elasticsearch/ingest/processor_kv_data_source_test.go index e6a0b545c..7d683bba5 100644 --- a/internal/elasticsearch/ingest/processor_kv_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_kv_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorKV(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go b/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go index d3f1bef0e..fc54cc139 100644 --- a/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorLowercase(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go b/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go index 9da8f33ba..feadb3eb1 100644 --- a/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorNetworkDirection(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go b/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go index 5a18c6568..2f5c0714d 100644 --- a/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorPipeline(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go b/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go index 89824bc5b..2209b3e35 100644 --- a/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorRegisteredDomain(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_remove_data_source_test.go b/internal/elasticsearch/ingest/processor_remove_data_source_test.go index ee9383466..fd4417d37 100644 --- a/internal/elasticsearch/ingest/processor_remove_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_remove_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorRemove(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_rename_data_source_test.go b/internal/elasticsearch/ingest/processor_rename_data_source_test.go index 0f246c484..9c11b9307 100644 --- a/internal/elasticsearch/ingest/processor_rename_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_rename_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorRename(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_reroute_data_source_test.go b/internal/elasticsearch/ingest/processor_reroute_data_source_test.go index 135793195..49ccfb098 100644 --- a/internal/elasticsearch/ingest/processor_reroute_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_reroute_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorReroute(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_script_data_source_test.go b/internal/elasticsearch/ingest/processor_script_data_source_test.go index ca4973646..b01d08bb2 100644 --- a/internal/elasticsearch/ingest/processor_script_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_script_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorScript(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_set_data_source_test.go b/internal/elasticsearch/ingest/processor_set_data_source_test.go index 221596685..ddf81dcb9 100644 --- a/internal/elasticsearch/ingest/processor_set_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_set_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorSet(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go b/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go index a71da658a..f5dcbc593 100644 --- a/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorSetSecurityUser(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_sort_data_source_test.go b/internal/elasticsearch/ingest/processor_sort_data_source_test.go index 59cc21db4..0a7776ca1 100644 --- a/internal/elasticsearch/ingest/processor_sort_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_sort_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorSort(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_split_data_source_test.go b/internal/elasticsearch/ingest/processor_split_data_source_test.go index 5de811a5c..210fedd7d 100644 --- a/internal/elasticsearch/ingest/processor_split_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_split_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorSplit(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_trim_data_source_test.go b/internal/elasticsearch/ingest/processor_trim_data_source_test.go index 5d8232846..ebcab360b 100644 --- a/internal/elasticsearch/ingest/processor_trim_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_trim_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorTrim(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go b/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go index afcfacaca..b6c0f1e9d 100644 --- a/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorUppercase(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go b/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go index 63076128d..56e4a01a3 100644 --- a/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorUriParts(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go b/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go index e40687a19..0d2266db3 100644 --- a/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorUrldecode(t *testing.T) { diff --git a/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go b/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go index b9dde3701..d6f02376d 100644 --- a/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go +++ b/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIngestProcessorUserAgent(t *testing.T) { diff --git a/internal/elasticsearch/logstash/pipeline_test.go b/internal/elasticsearch/logstash/pipeline_test.go index 8cf0346f4..bcbbd4eab 100644 --- a/internal/elasticsearch/logstash/pipeline_test.go +++ b/internal/elasticsearch/logstash/pipeline_test.go @@ -7,9 +7,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestResourceLogstashPipeline(t *testing.T) { diff --git a/internal/elasticsearch/security/api_key/acc_test.go b/internal/elasticsearch/security/api_key/acc_test.go index be998ea3f..e1ed158bd 100644 --- a/internal/elasticsearch/security/api_key/acc_test.go +++ b/internal/elasticsearch/security/api_key/acc_test.go @@ -18,9 +18,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/models" "github.com/elastic/terraform-provider-elasticstack/internal/utils" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSecurityApiKey(t *testing.T) { @@ -258,9 +258,8 @@ func TestAccResourceSecurityApiKeyFromSDK(t *testing.T) { VersionConstraint: "0.11.9", }, }, - ProtoV6ProviderFactories: acctest.Providers, - SkipFunc: versionutils.CheckIfVersionIsUnsupported(api_key.MinVersion), - Config: testAccResourceSecurityApiKeyWithoutExpiration(apiKeyName), + SkipFunc: versionutils.CheckIfVersionIsUnsupported(api_key.MinVersion), + Config: testAccResourceSecurityApiKeyWithoutExpiration(apiKeyName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("elasticstack_elasticsearch_security_api_key.test", "name", apiKeyName), resource.TestCheckResourceAttrSet("elasticstack_elasticsearch_security_api_key.test", "role_descriptors"), diff --git a/internal/elasticsearch/security/role_data_source_test.go b/internal/elasticsearch/security/role_data_source_test.go index 0af0d4841..fb8fbab16 100644 --- a/internal/elasticsearch/security/role_data_source_test.go +++ b/internal/elasticsearch/security/role_data_source_test.go @@ -8,7 +8,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/security" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSecurityRole(t *testing.T) { diff --git a/internal/elasticsearch/security/role_mapping_data_source_test.go b/internal/elasticsearch/security/role_mapping_data_source_test.go index 154aec605..026257a15 100644 --- a/internal/elasticsearch/security/role_mapping_data_source_test.go +++ b/internal/elasticsearch/security/role_mapping_data_source_test.go @@ -5,7 +5,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/acctest/checks" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSecurityRoleMapping(t *testing.T) { diff --git a/internal/elasticsearch/security/role_mapping_test.go b/internal/elasticsearch/security/role_mapping_test.go index dcde6ebff..83c06e162 100644 --- a/internal/elasticsearch/security/role_mapping_test.go +++ b/internal/elasticsearch/security/role_mapping_test.go @@ -8,9 +8,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/acctest/checks" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestResourceRoleMapping(t *testing.T) { diff --git a/internal/elasticsearch/security/role_test.go b/internal/elasticsearch/security/role_test.go index 788764582..6824dd960 100644 --- a/internal/elasticsearch/security/role_test.go +++ b/internal/elasticsearch/security/role_test.go @@ -8,9 +8,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients" "github.com/elastic/terraform-provider-elasticstack/internal/elasticsearch/security" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSecurityRole(t *testing.T) { diff --git a/internal/elasticsearch/security/system_user/acc_test.go b/internal/elasticsearch/security/system_user/acc_test.go index 60c33b09e..4eba4b17b 100644 --- a/internal/elasticsearch/security/system_user/acc_test.go +++ b/internal/elasticsearch/security/system_user/acc_test.go @@ -6,7 +6,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/acctest/checks" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccResourceSecuritySystemUser(t *testing.T) { diff --git a/internal/elasticsearch/security/user_data_source_test.go b/internal/elasticsearch/security/user_data_source_test.go index 58d16c1d4..0a94cb61b 100644 --- a/internal/elasticsearch/security/user_data_source_test.go +++ b/internal/elasticsearch/security/user_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSecurityUser(t *testing.T) { diff --git a/internal/elasticsearch/security/user_test.go b/internal/elasticsearch/security/user_test.go index 9311d3ca1..13cbd1c11 100644 --- a/internal/elasticsearch/security/user_test.go +++ b/internal/elasticsearch/security/user_test.go @@ -10,9 +10,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/acctest/checks" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSecurityUser(t *testing.T) { @@ -45,7 +45,7 @@ func TestAccImportedUserDoesNotResetPassword(t *testing.T) { initialPassword := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum) userUpdatedPassword := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum) - resource.ParallelTest(t, resource.TestCase{ + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, CheckDestroy: checkResourceSecurityUserDestroy, ProtoV6ProviderFactories: acctest.Providers, diff --git a/internal/elasticsearch/transform/transform_test.go b/internal/elasticsearch/transform/transform_test.go index 8983906d0..45d457205 100644 --- a/internal/elasticsearch/transform/transform_test.go +++ b/internal/elasticsearch/transform/transform_test.go @@ -8,9 +8,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minSupportedDestAliasesVersion = version.Must(version.NewSemver("8.8.0")) diff --git a/internal/elasticsearch/watcher/watch_test.go b/internal/elasticsearch/watcher/watch_test.go index 8736d44ae..992431582 100644 --- a/internal/elasticsearch/watcher/watch_test.go +++ b/internal/elasticsearch/watcher/watch_test.go @@ -7,9 +7,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/clients" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestResourceWatch(t *testing.T) { diff --git a/internal/fleet/agent_policy/resource_test.go b/internal/fleet/agent_policy/resource_test.go index e45ab4812..8f90217f4 100644 --- a/internal/fleet/agent_policy/resource_test.go +++ b/internal/fleet/agent_policy/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/utils" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minVersionAgentPolicy = version.Must(version.NewVersion("8.6.0")) diff --git a/internal/fleet/enrollment_tokens/data_source_test.go b/internal/fleet/enrollment_tokens/data_source_test.go index e4ad91346..c4c5793a9 100644 --- a/internal/fleet/enrollment_tokens/data_source_test.go +++ b/internal/fleet/enrollment_tokens/data_source_test.go @@ -11,8 +11,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/utils" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minVersionEnrollmentTokens = version.Must(version.NewVersion("8.6.0")) diff --git a/internal/fleet/integration/resource_test.go b/internal/fleet/integration/resource_test.go index 18a505d5a..01c9424f6 100644 --- a/internal/fleet/integration/resource_test.go +++ b/internal/fleet/integration/resource_test.go @@ -11,8 +11,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients/fleet" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/stretchr/testify/require" ) diff --git a/internal/fleet/integration_ds/data_source_test.go b/internal/fleet/integration_ds/data_source_test.go index ab5d50734..d554627cd 100644 --- a/internal/fleet/integration_ds/data_source_test.go +++ b/internal/fleet/integration_ds/data_source_test.go @@ -7,8 +7,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minVersionIntegrationDataSource = version.Must(version.NewVersion("8.6.0")) diff --git a/internal/fleet/integration_policy/resource_test.go b/internal/fleet/integration_policy/resource_test.go index f2c4aeaa2..70c9375d3 100644 --- a/internal/fleet/integration_policy/resource_test.go +++ b/internal/fleet/integration_policy/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/stretchr/testify/require" ) diff --git a/internal/fleet/output/resource_test.go b/internal/fleet/output/resource_test.go index cfdb5e66d..47d324567 100644 --- a/internal/fleet/output/resource_test.go +++ b/internal/fleet/output/resource_test.go @@ -11,9 +11,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/utils" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minVersionOutput = version.Must(version.NewVersion("8.6.0")) diff --git a/internal/fleet/server_host/resource_test.go b/internal/fleet/server_host/resource_test.go index 904aad671..6c372e7dd 100644 --- a/internal/fleet/server_host/resource_test.go +++ b/internal/fleet/server_host/resource_test.go @@ -11,9 +11,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/utils" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var minVersionFleetServerHost = version.Must(version.NewVersion("8.6.0")) diff --git a/internal/kibana/alerting_test.go b/internal/kibana/alerting_test.go index 3ba648f49..06e9de4bb 100644 --- a/internal/kibana/alerting_test.go +++ b/internal/kibana/alerting_test.go @@ -10,9 +10,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceAlertingRule(t *testing.T) { diff --git a/internal/kibana/connector_data_source_test.go b/internal/kibana/connector_data_source_test.go index 4b24e866f..157911ddc 100644 --- a/internal/kibana/connector_data_source_test.go +++ b/internal/kibana/connector_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceKibanaConnector(t *testing.T) { diff --git a/internal/kibana/connector_test.go b/internal/kibana/connector_test.go index 172b75b78..9005a125d 100644 --- a/internal/kibana/connector_test.go +++ b/internal/kibana/connector_test.go @@ -13,9 +13,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/google/uuid" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceKibanaConnectorCasesWebhook(t *testing.T) { diff --git a/internal/kibana/data_view/acc_test.go b/internal/kibana/data_view/acc_test.go index c6c77612e..3d2c1fed2 100644 --- a/internal/kibana/data_view/acc_test.go +++ b/internal/kibana/data_view/acc_test.go @@ -7,8 +7,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var minDataViewAPISupport = version.Must(version.NewVersion("8.1.0")) diff --git a/internal/kibana/import_saved_objects/acc_test.go b/internal/kibana/import_saved_objects/acc_test.go index 3ee48f346..594b39b99 100644 --- a/internal/kibana/import_saved_objects/acc_test.go +++ b/internal/kibana/import_saved_objects/acc_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccResourceImportSavedObjects(t *testing.T) { diff --git a/internal/kibana/role_data_source_test.go b/internal/kibana/role_data_source_test.go index d54414186..cd8290a7e 100644 --- a/internal/kibana/role_data_source_test.go +++ b/internal/kibana/role_data_source_test.go @@ -7,7 +7,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest/checks" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceKibanaSecurityRole(t *testing.T) { diff --git a/internal/kibana/role_test.go b/internal/kibana/role_test.go index 4b48087d8..f91d484e2 100644 --- a/internal/kibana/role_test.go +++ b/internal/kibana/role_test.go @@ -9,9 +9,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceKibanaSecurityRole(t *testing.T) { diff --git a/internal/kibana/slo_test.go b/internal/kibana/slo_test.go index 94ab9b762..23a287c1a 100644 --- a/internal/kibana/slo_test.go +++ b/internal/kibana/slo_test.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/go-version" "github.com/stretchr/testify/require" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var sloTimesliceMetricsMinVersion = version.Must(version.NewVersion("8.12.0")) @@ -190,8 +190,7 @@ func TestAccResourceSloGroupBy(t *testing.T) { VersionConstraint: "0.11.11", }, }, - ProtoV6ProviderFactories: acctest.Providers, - SkipFunc: versionutils.CheckIfVersionIsUnsupported(kibanaresource.SLOSupportsMultipleGroupByMinVersion), + SkipFunc: versionutils.CheckIfVersionIsUnsupported(kibanaresource.SLOSupportsMultipleGroupByMinVersion), Config: getSLOConfig(sloVars{ name: sloName, indicatorType: "metric_custom_indicator", diff --git a/internal/kibana/space_test.go b/internal/kibana/space_test.go index 2f3a2cb51..e0a93a9f7 100644 --- a/internal/kibana/space_test.go +++ b/internal/kibana/space_test.go @@ -8,9 +8,9 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/clients" "github.com/elastic/terraform-provider-elasticstack/internal/kibana" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccResourceSpace(t *testing.T) { diff --git a/internal/kibana/spaces/data_source_test.go b/internal/kibana/spaces/data_source_test.go index efc1cc246..e67d9a20c 100644 --- a/internal/kibana/spaces/data_source_test.go +++ b/internal/kibana/spaces/data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/elastic/terraform-provider-elasticstack/internal/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSpacesDataSource(t *testing.T) { diff --git a/internal/kibana/synthetics/acc_pl_test.go b/internal/kibana/synthetics/acc_pl_test.go index 012b04cfd..bdc607841 100644 --- a/internal/kibana/synthetics/acc_pl_test.go +++ b/internal/kibana/synthetics/acc_pl_test.go @@ -10,7 +10,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) const ( diff --git a/internal/kibana/synthetics/acc_test.go b/internal/kibana/synthetics/acc_test.go index 346fafbcd..ddde5a150 100644 --- a/internal/kibana/synthetics/acc_test.go +++ b/internal/kibana/synthetics/acc_test.go @@ -7,8 +7,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var ( diff --git a/internal/kibana/synthetics/parameter/resource_test.go b/internal/kibana/synthetics/parameter/resource_test.go index 3a4ff0920..516fe3fdd 100644 --- a/internal/kibana/synthetics/parameter/resource_test.go +++ b/internal/kibana/synthetics/parameter/resource_test.go @@ -6,7 +6,7 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/acctest" "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) const ( diff --git a/provider/factory_test.go b/provider/factory_test.go index 3b2e89fbc..9a6372810 100644 --- a/provider/factory_test.go +++ b/provider/factory_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-go/tfprotov6" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestMuxServer(t *testing.T) { diff --git a/provider/provider_test.go b/provider/provider_test.go index 112e5e1ca..d66aac1ed 100644 --- a/provider/provider_test.go +++ b/provider/provider_test.go @@ -12,8 +12,8 @@ import ( "github.com/elastic/terraform-provider-elasticstack/internal/versionutils" "github.com/elastic/terraform-provider-elasticstack/provider" "github.com/hashicorp/go-version" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var minVersionForFleet = version.Must(version.NewVersion("8.6.0"))