diff --git a/statecheck/compare_value_collection_test.go b/statecheck/compare_value_collection_test.go index 31cdc9ec0..b0d97068c 100644 --- a/statecheck/compare_value_collection_test.go +++ b/statecheck/compare_value_collection_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/compare" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -25,10 +24,8 @@ func TestCompareValueCollection_CheckState_Bool_Error_NotCollection(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -61,10 +58,8 @@ func TestCompareValueCollection_CheckState_Float_Error_NotCollection(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -97,10 +92,8 @@ func TestCompareValueCollection_CheckState_Int_Error_NotCollection(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -133,10 +126,8 @@ func TestCompareValueCollection_CheckState_List_ValuesSame_ErrorDiffer(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -172,10 +163,8 @@ func TestCompareValueCollection_CheckState_EmptyCollectionPath(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -210,10 +199,8 @@ func TestCompareValueCollection_CheckState_List_ValuesSame(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -248,10 +235,8 @@ func TestCompareValueCollection_CheckState_List_ValuesDiffer_ErrorSame(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -287,10 +272,8 @@ func TestCompareValueCollection_CheckState_List_ValuesDiffer(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -325,10 +308,8 @@ func TestCompareValueCollection_CheckState_ListNestedBlock_ValuesSame_ErrorDiffe t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -367,10 +348,8 @@ func TestCompareValueCollection_CheckState_ListNestedBlock_ValuesSame(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -408,10 +387,8 @@ func TestCompareValueCollection_CheckState_ListNestedBlock_ValuesDiffer_ErrorSam t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -450,10 +427,8 @@ func TestCompareValueCollection_CheckState_ListNestedBlock_ValuesDiffer(t *testi t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -491,10 +466,8 @@ func TestCompareValueCollection_CheckState_Map_ValuesSame_ErrorDiffer(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -530,10 +503,8 @@ func TestCompareValueCollection_CheckState_Map_ValuesSame(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -568,10 +539,8 @@ func TestCompareValueCollection_CheckState_Map_ValuesDiffer_ErrorSame(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -607,10 +576,8 @@ func TestCompareValueCollection_CheckState_Map_ValuesDiffer(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -645,10 +612,8 @@ func TestCompareValueCollection_CheckState_Set_ValuesSame_ErrorDiffer(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -684,10 +649,8 @@ func TestCompareValueCollection_CheckState_Set_ValuesSame(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -722,10 +685,8 @@ func TestCompareValueCollection_CheckState_Set_ValuesDiffer_ErrorSame(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -761,10 +722,8 @@ func TestCompareValueCollection_CheckState_Set_ValuesDiffer(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -799,10 +758,8 @@ func TestCompareValueCollection_CheckState_SetNestedBlock_ValuesSame_ErrorDiffer t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -841,10 +798,8 @@ func TestCompareValueCollection_CheckState_SetNestedBlock_ValuesSame(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -882,10 +837,8 @@ func TestCompareValueCollection_CheckState_SetNestedBlock_ValuesDiffer_ErrorSame t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -924,10 +877,8 @@ func TestCompareValueCollection_CheckState_SetNestedBlock_ValuesDiffer(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -965,10 +916,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1011,10 +960,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1056,10 +1003,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1100,10 +1045,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferAttr t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1159,10 +1102,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferNest t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1217,10 +1158,8 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferNest t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1274,10 +1213,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorAttribute(t t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1334,10 +1271,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorNestedBlock t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1393,10 +1328,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorNestedNeste t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1451,10 +1384,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameAttribute(t *test t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1510,10 +1441,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameNestedBlock(t *te t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1568,10 +1497,8 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameNestedNestedBlock t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1625,10 +1552,8 @@ func TestCompareValueCollection_CheckState_String_Error_NotCollection(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { diff --git a/statecheck/compare_value_pairs_test.go b/statecheck/compare_value_pairs_test.go index 4df478832..991c285d7 100644 --- a/statecheck/compare_value_pairs_test.go +++ b/statecheck/compare_value_pairs_test.go @@ -7,10 +7,10 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - + "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-testing/compare" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver" "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" ) @@ -19,10 +19,8 @@ func TestCompareValuePairs_CheckState_ValuesSame_DifferError(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -50,10 +48,8 @@ func TestCompareValuePairs_CheckState_ValuesSame(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -83,10 +79,8 @@ func TestCompareValuePairs_CheckState_ValuesDiffer_SameError(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -116,10 +110,8 @@ func TestCompareValuePairs_CheckState_ValuesDiffer(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { diff --git a/statecheck/compare_value_test.go b/statecheck/compare_value_test.go index 271692425..9f89484ea 100644 --- a/statecheck/compare_value_test.go +++ b/statecheck/compare_value_test.go @@ -7,10 +7,10 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - + "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-testing/compare" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver" "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" ) @@ -21,10 +21,8 @@ func TestCompareValue_CheckState_NoStateValues(t *testing.T) { boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame()) r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -48,10 +46,8 @@ func TestCompareValue_CheckState_ValuesSame_ValueDiffersError(t *testing.T) { boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame()) r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -101,10 +97,8 @@ func TestCompareValue_CheckState_ValuesSame(t *testing.T) { boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame()) r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -141,10 +135,8 @@ func TestCompareValue_CheckState_ValuesDiffer_ValueSameError(t *testing.T) { boolValuesDiffer := statecheck.CompareValue(compare.ValuesDiffer()) r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -194,10 +186,8 @@ func TestCompareValue_CheckState_ValuesDiffer(t *testing.T) { boolValuesDiffer := statecheck.CompareValue(compare.ValuesDiffer()) r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { diff --git a/statecheck/expect_known_output_value_at_path_test.go b/statecheck/expect_known_output_value_at_path_test.go index 0b6013bcd..8750ff1bd 100644 --- a/statecheck/expect_known_output_value_at_path_test.go +++ b/statecheck/expect_known_output_value_at_path_test.go @@ -12,9 +12,10 @@ import ( "github.com/google/go-cmp/cmp" tfjson "github.com/hashicorp/terraform-json" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" @@ -24,10 +25,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ResourceNotFound(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -56,10 +55,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_AttributeValueNull(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -125,10 +122,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_AttributeValueNotNull(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -210,10 +205,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Bool(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -241,10 +234,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Bool_KnownValueWrongType(t *tes t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -273,10 +264,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Bool_KnownValueWrongValue(t *te t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -305,10 +294,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Float64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -337,10 +324,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Float64_KnownValueWrongType(t * t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -369,10 +354,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Float64_KnownValueWrongValue(t t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -401,10 +384,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Int64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -432,10 +413,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Int64_KnownValueWrongValue(t *t t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -464,10 +443,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_List(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -501,10 +478,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_List_KnownValueWrongType(t *tes t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -536,10 +511,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_List_KnownValueWrongValue(t *te t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -574,10 +547,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -612,10 +583,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListPartial_KnownValueWrongValu t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -649,10 +618,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -683,10 +650,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListElements_WrongNum(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -718,10 +683,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -761,10 +724,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListNestedBlockPartial(t *testi t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -801,10 +762,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_ListNestedBlockElements(t *test t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -837,10 +796,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Map(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -874,10 +831,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Map_KnownValueWrongType(t *test t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -909,10 +864,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Map_KnownValueWrongValue(t *tes t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -947,10 +900,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_MapPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -983,10 +934,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_MapPartial_KnownValueWrongValue t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1020,10 +969,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_MapElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1054,10 +1001,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_MapElements_WrongNum(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1095,10 +1040,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Number(t *testing.T) { } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1132,10 +1075,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Number_KnownValueWrongValue(t * } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1164,10 +1105,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Set(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1201,10 +1140,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_Set_KnownValueWrongValue(t *tes t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1239,10 +1176,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1275,10 +1210,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetPartial_KnownValueWrongValue t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1312,10 +1245,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1346,10 +1277,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1389,10 +1318,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetNestedBlockPartial(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1429,10 +1356,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_SetNestedBlockElements(t *testi t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1465,10 +1390,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_String(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1495,10 +1418,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_String_Custom(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1525,10 +1446,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_String_KnownValueWrongType(t *t t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1556,10 +1475,8 @@ func TestExpectKnownOutputValueAtPath_CheckState_String_KnownValueWrongValue(t * t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { diff --git a/statecheck/expect_known_output_value_test.go b/statecheck/expect_known_output_value_test.go index 62d9067fe..22d6eee9a 100644 --- a/statecheck/expect_known_output_value_test.go +++ b/statecheck/expect_known_output_value_test.go @@ -12,9 +12,10 @@ import ( "github.com/google/go-cmp/cmp" tfjson "github.com/hashicorp/terraform-json" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" ) @@ -23,10 +24,8 @@ func TestExpectKnownOutputValue_CheckState_OutputNotFound(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -58,10 +57,8 @@ func TestExpectKnownOutputValue_CheckState_AttributeValueNull(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -86,10 +83,8 @@ func TestExpectKnownOutputValue_CheckState_AttributeValueNotNull(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -185,10 +180,8 @@ func TestExpectKnownOutputValue_CheckState_Bool(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -215,10 +208,8 @@ func TestExpectKnownOutputValue_CheckState_Bool_KnownValueWrongType(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -246,10 +237,8 @@ func TestExpectKnownOutputValue_CheckState_Bool_KnownValueWrongValue(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -277,10 +266,8 @@ func TestExpectKnownOutputValue_CheckState_Float64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -308,10 +295,8 @@ func TestExpectKnownOutputValue_CheckState_Float64_KnownValueWrongType(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -339,10 +324,8 @@ func TestExpectKnownOutputValue_CheckState_Float64_KnownValueWrongValue(t *testi t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -370,10 +353,8 @@ func TestExpectKnownOutputValue_CheckState_Int64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -400,10 +381,8 @@ func TestExpectKnownOutputValue_CheckState_Int64_KnownValueWrongValue(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -431,10 +410,8 @@ func TestExpectKnownOutputValue_CheckState_List(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -467,10 +444,8 @@ func TestExpectKnownOutputValue_CheckState_List_KnownValueWrongType(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -501,10 +476,8 @@ func TestExpectKnownOutputValue_CheckState_List_KnownValueWrongValue(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -538,10 +511,8 @@ func TestExpectKnownOutputValue_CheckState_ListPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -575,10 +546,8 @@ func TestExpectKnownOutputValue_CheckState_ListPartial_KnownValueWrongValue(t *t t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -611,10 +580,8 @@ func TestExpectKnownOutputValue_CheckState_ListElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -644,10 +611,8 @@ func TestExpectKnownOutputValue_CheckState_ListElements_WrongNum(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -678,10 +643,8 @@ func TestExpectKnownOutputValue_CheckState_ListNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -720,10 +683,8 @@ func TestExpectKnownOutputValue_CheckState_ListNestedBlockPartial(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -759,10 +720,8 @@ func TestExpectKnownOutputValue_CheckState_ListNestedBlockElements(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -794,10 +753,8 @@ func TestExpectKnownOutputValue_CheckState_Map(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -830,10 +787,8 @@ func TestExpectKnownOutputValue_CheckState_Map_KnownValueWrongType(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -864,10 +819,8 @@ func TestExpectKnownOutputValue_CheckState_Map_KnownValueWrongValue(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -901,10 +854,8 @@ func TestExpectKnownOutputValue_CheckState_MapPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -936,10 +887,8 @@ func TestExpectKnownOutputValue_CheckState_MapPartial_KnownValueWrongValue(t *te t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -972,10 +921,8 @@ func TestExpectKnownOutputValue_CheckState_MapElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1005,10 +952,8 @@ func TestExpectKnownOutputValue_CheckState_MapElements_WrongNum(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1045,10 +990,8 @@ func TestExpectKnownOutputValue_CheckState_Number(t *testing.T) { } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1081,10 +1024,8 @@ func TestExpectKnownOutputValue_CheckState_Number_KnownValueWrongValue(t *testin } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1112,10 +1053,8 @@ func TestExpectKnownOutputValue_CheckState_Set(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1148,10 +1087,8 @@ func TestExpectKnownOutputValue_CheckState_Set_KnownValueWrongValue(t *testing.T t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1185,10 +1122,8 @@ func TestExpectKnownOutputValue_CheckState_SetPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1220,10 +1155,8 @@ func TestExpectKnownOutputValue_CheckState_SetPartial_KnownValueWrongValue(t *te t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1256,10 +1189,8 @@ func TestExpectKnownOutputValue_CheckState_SetElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1289,10 +1220,8 @@ func TestExpectKnownOutputValue_CheckState_SetNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1331,10 +1260,8 @@ func TestExpectKnownOutputValue_CheckState_SetNestedBlockPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1370,10 +1297,8 @@ func TestExpectKnownOutputValue_CheckState_SetNestedBlockElements(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1405,10 +1330,8 @@ func TestExpectKnownOutputValue_CheckState_String(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1434,10 +1357,8 @@ func TestExpectKnownOutputValue_CheckState_String_Custom(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1463,10 +1384,8 @@ func TestExpectKnownOutputValue_CheckState_String_KnownValueWrongType(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1493,10 +1412,8 @@ func TestExpectKnownOutputValue_CheckState_String_KnownValueWrongValue(t *testin t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { diff --git a/statecheck/expect_known_value_test.go b/statecheck/expect_known_value_test.go index 2eb56d4e4..5d0ef7785 100644 --- a/statecheck/expect_known_value_test.go +++ b/statecheck/expect_known_value_test.go @@ -13,10 +13,10 @@ import ( "github.com/google/go-cmp/cmp" tfjson "github.com/hashicorp/terraform-json" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" r "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" @@ -26,10 +26,8 @@ func TestExpectKnownValue_CheckState_ResourceNotFound(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -54,10 +52,8 @@ func TestExpectKnownValue_CheckState_AttributeValueNull(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -118,10 +114,8 @@ func TestExpectKnownValue_CheckState_AttributeValueNotNull(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -198,10 +192,8 @@ func TestExpectKnownValue_CheckState_Bool(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -225,10 +217,8 @@ func TestExpectKnownValue_CheckState_Bool_KnownValueWrongType(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -253,10 +243,8 @@ func TestExpectKnownValue_CheckState_Bool_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -281,10 +269,8 @@ func TestExpectKnownValue_CheckState_Float64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -309,10 +295,8 @@ func TestExpectKnownValue_CheckState_Float64_KnownValueWrongType(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -337,10 +321,8 @@ func TestExpectKnownValue_CheckState_Float64_KnownValueWrongValue(t *testing.T) t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -365,10 +347,8 @@ func TestExpectKnownValue_CheckState_Int64(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -392,10 +372,8 @@ func TestExpectKnownValue_CheckState_Int64_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -420,10 +398,8 @@ func TestExpectKnownValue_CheckState_List(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -453,10 +429,8 @@ func TestExpectKnownValue_CheckState_List_KnownValueWrongType(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -484,10 +458,8 @@ func TestExpectKnownValue_CheckState_List_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -518,10 +490,8 @@ func TestExpectKnownValue_CheckState_ListPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -552,10 +522,8 @@ func TestExpectKnownValue_CheckState_ListPartial_KnownValueWrongValue(t *testing t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -585,10 +553,8 @@ func TestExpectKnownValue_CheckState_ListElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -615,10 +581,8 @@ func TestExpectKnownValue_CheckState_ListElements_WrongNum(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -646,10 +610,8 @@ func TestExpectKnownValue_CheckState_ListNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -685,10 +647,8 @@ func TestExpectKnownValue_CheckState_ListNestedBlockPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -721,10 +681,8 @@ func TestExpectKnownValue_CheckState_ListNestedBlockElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -753,10 +711,8 @@ func TestExpectKnownValue_CheckState_Map(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -786,10 +742,8 @@ func TestExpectKnownValue_CheckState_Map_KnownValueWrongType(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -817,10 +771,8 @@ func TestExpectKnownValue_CheckState_Map_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -851,10 +803,8 @@ func TestExpectKnownValue_CheckState_MapPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -883,10 +833,8 @@ func TestExpectKnownValue_CheckState_MapPartial_KnownValueWrongValue(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -916,10 +864,8 @@ func TestExpectKnownValue_CheckState_MapElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -946,10 +892,8 @@ func TestExpectKnownValue_CheckState_MapElements_WrongNum(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -983,10 +927,8 @@ func TestExpectKnownValue_CheckState_Number(t *testing.T) { } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1016,10 +958,8 @@ func TestExpectKnownValue_CheckState_Number_KnownValueWrongValue(t *testing.T) { } r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1044,10 +984,8 @@ func TestExpectKnownValue_CheckState_Set(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1077,10 +1015,8 @@ func TestExpectKnownValue_CheckState_Set_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1111,10 +1047,8 @@ func TestExpectKnownValue_CheckState_SetPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1143,10 +1077,8 @@ func TestExpectKnownValue_CheckState_SetPartial_KnownValueWrongValue(t *testing. t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1176,10 +1108,8 @@ func TestExpectKnownValue_CheckState_SetElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1206,10 +1136,8 @@ func TestExpectKnownValue_CheckState_SetNestedBlock(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1245,10 +1173,8 @@ func TestExpectKnownValue_CheckState_SetNestedBlock_Custom(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1284,10 +1210,8 @@ func TestExpectKnownValue_CheckState_SetNestedBlockPartial(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1320,10 +1244,8 @@ func TestExpectKnownValue_CheckState_SetNestedBlockElements(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1352,10 +1274,8 @@ func TestExpectKnownValue_CheckState_String(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1378,10 +1298,8 @@ func TestExpectKnownValue_CheckState_String_Custom(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1434,10 +1352,8 @@ func TestExpectKnownValue_CheckState_String_KnownValueWrongType(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1461,10 +1377,8 @@ func TestExpectKnownValue_CheckState_String_KnownValueWrongValue(t *testing.T) { t.Parallel() r.Test(t, r.TestCase{ - ProviderFactories: map[string]func() (*schema.Provider, error){ - "test": func() (*schema.Provider, error) { //nolint:unparam // required signature - return testProvider(), nil - }, + ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "test": providerserver.NewProviderServer(anTestProvider), }, Steps: []r.TestStep{ { @@ -1540,118 +1454,3 @@ var equateErrorMessage = cmp.Comparer(func(x, y error) bool { return x.Error() == y.Error() }) - -func testProvider() *schema.Provider { - return &schema.Provider{ - ResourcesMap: map[string]*schema.Resource{ - "test_resource": { - CreateContext: func(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics { - d.SetId("test") - - err := d.Set("string_computed_attribute", "computed") - if err != nil { - return diag.Errorf("error setting string_computed_attribute: %s", err) - } - - return nil - }, - UpdateContext: func(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics { - return nil - }, - DeleteContext: func(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics { - return nil - }, - ReadContext: func(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics { - return nil - }, - Schema: map[string]*schema.Schema{ - "bool_attribute": { - Optional: true, - Type: schema.TypeBool, - }, - "float_attribute": { - Optional: true, - Type: schema.TypeFloat, - }, - "int_attribute": { - Optional: true, - Type: schema.TypeInt, - }, - "list_attribute": { - Type: schema.TypeList, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - Optional: true, - }, - "list_nested_block": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "list_nested_block_attribute": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, - "map_attribute": { - Type: schema.TypeMap, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - Optional: true, - }, - "set_attribute": { - Type: schema.TypeSet, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - Optional: true, - }, - "set_nested_block": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "set_nested_block_attribute": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, - "set_nested_nested_block": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "set_nested_block": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "set_nested_block_attribute": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, - }, - }, - }, - "string_attribute": { - Optional: true, - Type: schema.TypeString, - }, - "string_computed_attribute": { - Computed: true, - Type: schema.TypeString, - }, - }, - }, - }, - } -} diff --git a/statecheck/test_provider_test.go b/statecheck/test_provider_test.go new file mode 100644 index 000000000..d29fedee8 --- /dev/null +++ b/statecheck/test_provider_test.go @@ -0,0 +1,110 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package statecheck_test + +import ( + "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-go/tftypes" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testprovider" + "github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/resource" +) + +var anTestProvider = testprovider.Provider{ + Resources: map[string]testprovider.Resource{ + "test_resource": { + SchemaResponse: &resource.SchemaResponse{ + Schema: &tfprotov6.Schema{ + Block: &tfprotov6.SchemaBlock{ + Attributes: []*tfprotov6.SchemaAttribute{ + { + Name: "bool_attribute", + Type: tftypes.Bool, + Optional: true, + }, + { + Name: "float_attribute", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "int_attribute", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "string_attribute", + Type: tftypes.String, + Optional: true, + }, + { + Name: "list_attribute", + Type: tftypes.List{ElementType: tftypes.String}, + Optional: true, + }, + { + Name: "map_attribute", + Type: tftypes.Map{ElementType: tftypes.String}, + Optional: true, + }, + { + Name: "set_attribute", + Type: tftypes.Set{ElementType: tftypes.String}, + Optional: true, + }, + }, + BlockTypes: []*tfprotov6.SchemaNestedBlock{ + { + TypeName: "list_nested_block", + Nesting: 2, + Block: &tfprotov6.SchemaBlock{ + Attributes: []*tfprotov6.SchemaAttribute{ + { + Name: "list_nested_block_attribute", + Type: tftypes.String, + Optional: true, + }, + }, + }, + }, + { + TypeName: "set_nested_block", + Nesting: tfprotov6.SchemaNestedBlockNestingModeList, + Block: &tfprotov6.SchemaBlock{ + Attributes: []*tfprotov6.SchemaAttribute{ + { + Name: "set_nested_block_attribute", + Type: tftypes.String, + Optional: true, + }, + }, + }, + }, + { + TypeName: "set_nested_nested_block", + Nesting: tfprotov6.SchemaNestedBlockNestingModeSet, + Block: &tfprotov6.SchemaBlock{ + BlockTypes: []*tfprotov6.SchemaNestedBlock{ + { + TypeName: "set_nested_block", + Nesting: tfprotov6.SchemaNestedBlockNestingModeSet, + Block: &tfprotov6.SchemaBlock{ + Attributes: []*tfprotov6.SchemaAttribute{ + { + Name: "set_nested_block_attribute", + Type: tftypes.String, + Optional: true, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, +}