From a8594a28dd2280df491b4f4b3404a3183636efb6 Mon Sep 17 00:00:00 2001 From: Venelin Date: Tue, 10 Dec 2024 16:29:36 +0000 Subject: [PATCH] Move SDKv2 pulcheck test library to internal/ --- pkg/internal/tests/cross-tests/configure.go | 2 +- pkg/internal/tests/cross-tests/create.go | 2 +- pkg/internal/tests/cross-tests/diff_check.go | 2 +- pkg/internal/tests/cross-tests/upgrade_state_check.go | 2 +- pkg/{ => internal}/tests/pulcheck/pulcheck.go | 0 pkg/pf/tests/pulumi_test.go | 2 +- pkg/tests/acc_secrets_test.go | 2 +- pkg/tests/configure_test.go | 2 +- pkg/tests/create_test.go | 2 +- pkg/tests/custom_timeout_test.go | 2 +- pkg/tests/detailed_diff_set_test.go | 2 +- pkg/tests/detailed_diff_test.go | 2 +- pkg/tests/import_test.go | 2 +- pkg/tests/plan_state_edit_test.go | 2 +- pkg/tests/refresh_test.go | 2 +- pkg/tests/schema_pulumi_test.go | 2 +- pkg/tests/state_func_test.go | 2 +- pkg/tests/tfcheck/exec.go | 2 +- pkg/tests/tfcheck/tfcheck.go | 2 +- pkg/tests/type_checker_test.go | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename pkg/{ => internal}/tests/pulcheck/pulcheck.go (100%) diff --git a/pkg/internal/tests/cross-tests/configure.go b/pkg/internal/tests/cross-tests/configure.go index 1b2f07397..7e54bf642 100644 --- a/pkg/internal/tests/cross-tests/configure.go +++ b/pkg/internal/tests/cross-tests/configure.go @@ -25,7 +25,7 @@ import ( "gopkg.in/yaml.v3" crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" diff --git a/pkg/internal/tests/cross-tests/create.go b/pkg/internal/tests/cross-tests/create.go index 4d218bc7e..3774205ae 100644 --- a/pkg/internal/tests/cross-tests/create.go +++ b/pkg/internal/tests/cross-tests/create.go @@ -26,7 +26,7 @@ import ( "github.com/zclconf/go-cty/cty" crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" ) diff --git a/pkg/internal/tests/cross-tests/diff_check.go b/pkg/internal/tests/cross-tests/diff_check.go index 7a7972c01..603419177 100644 --- a/pkg/internal/tests/cross-tests/diff_check.go +++ b/pkg/internal/tests/cross-tests/diff_check.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) type diffTestCase struct { diff --git a/pkg/internal/tests/cross-tests/upgrade_state_check.go b/pkg/internal/tests/cross-tests/upgrade_state_check.go index f20b96634..98c5e7c4f 100644 --- a/pkg/internal/tests/cross-tests/upgrade_state_check.go +++ b/pkg/internal/tests/cross-tests/upgrade_state_check.go @@ -30,7 +30,7 @@ import ( "gotest.tools/v3/assert" crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) type upgradeStateTestCase struct { diff --git a/pkg/tests/pulcheck/pulcheck.go b/pkg/internal/tests/pulcheck/pulcheck.go similarity index 100% rename from pkg/tests/pulcheck/pulcheck.go rename to pkg/internal/tests/pulcheck/pulcheck.go diff --git a/pkg/pf/tests/pulumi_test.go b/pkg/pf/tests/pulumi_test.go index f014b8452..72d0b87bd 100644 --- a/pkg/pf/tests/pulumi_test.go +++ b/pkg/pf/tests/pulumi_test.go @@ -23,8 +23,8 @@ import ( "github.com/pulumi/providertest/pulumitest" "github.com/stretchr/testify/require" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" pf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens" sdkv2shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" diff --git a/pkg/tests/acc_secrets_test.go b/pkg/tests/acc_secrets_test.go index 0c3752644..0bfc259ed 100644 --- a/pkg/tests/acc_secrets_test.go +++ b/pkg/tests/acc_secrets_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" ) diff --git a/pkg/tests/configure_test.go b/pkg/tests/configure_test.go index f8a0efbf8..3c51856fb 100644 --- a/pkg/tests/configure_test.go +++ b/pkg/tests/configure_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" ) diff --git a/pkg/tests/create_test.go b/pkg/tests/create_test.go index 395aa720a..6d905d3c2 100644 --- a/pkg/tests/create_test.go +++ b/pkg/tests/create_test.go @@ -16,7 +16,7 @@ import ( "github.com/zclconf/go-cty/cty" crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" ) diff --git a/pkg/tests/custom_timeout_test.go b/pkg/tests/custom_timeout_test.go index 98f1d252c..07948db7f 100644 --- a/pkg/tests/custom_timeout_test.go +++ b/pkg/tests/custom_timeout_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" ) diff --git a/pkg/tests/detailed_diff_set_test.go b/pkg/tests/detailed_diff_set_test.go index d5d3521aa..acbb24ed4 100644 --- a/pkg/tests/detailed_diff_set_test.go +++ b/pkg/tests/detailed_diff_set_test.go @@ -15,7 +15,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" ) diff --git a/pkg/tests/detailed_diff_test.go b/pkg/tests/detailed_diff_test.go index 02ec3d26d..686a4006b 100644 --- a/pkg/tests/detailed_diff_test.go +++ b/pkg/tests/detailed_diff_test.go @@ -15,7 +15,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" ) diff --git a/pkg/tests/import_test.go b/pkg/tests/import_test.go index 0fef78674..4b356cea4 100644 --- a/pkg/tests/import_test.go +++ b/pkg/tests/import_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) func TestFullyComputedNestedAttribute(t *testing.T) { diff --git a/pkg/tests/plan_state_edit_test.go b/pkg/tests/plan_state_edit_test.go index 7e1686b9b..0b3dc6e7e 100644 --- a/pkg/tests/plan_state_edit_test.go +++ b/pkg/tests/plan_state_edit_test.go @@ -10,7 +10,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/assert" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" ) diff --git a/pkg/tests/refresh_test.go b/pkg/tests/refresh_test.go index d90079180..bf95a2390 100644 --- a/pkg/tests/refresh_test.go +++ b/pkg/tests/refresh_test.go @@ -11,7 +11,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/auto/optrefresh" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) func TestCollectionsNullEmptyRefreshClean(t *testing.T) { diff --git a/pkg/tests/schema_pulumi_test.go b/pkg/tests/schema_pulumi_test.go index 903d48476..ca2b8d485 100644 --- a/pkg/tests/schema_pulumi_test.go +++ b/pkg/tests/schema_pulumi_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pkg/tests/state_func_test.go b/pkg/tests/state_func_test.go index a295d2ebf..debcee802 100644 --- a/pkg/tests/state_func_test.go +++ b/pkg/tests/state_func_test.go @@ -12,7 +12,7 @@ import ( "github.com/zclconf/go-cty/cty" crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) // TestStateFunc ensures that resources with a StateFunc set on their schema are correctly diff --git a/pkg/tests/tfcheck/exec.go b/pkg/tests/tfcheck/exec.go index 15b008377..14ce1ac00 100644 --- a/pkg/tests/tfcheck/exec.go +++ b/pkg/tests/tfcheck/exec.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) func (d *TFDriver) execTf(t pulcheck.T, args ...string) ([]byte, error) { diff --git a/pkg/tests/tfcheck/tfcheck.go b/pkg/tests/tfcheck/tfcheck.go index 7fdaea58f..2f18fb656 100644 --- a/pkg/tests/tfcheck/tfcheck.go +++ b/pkg/tests/tfcheck/tfcheck.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) type TFDriver struct { diff --git a/pkg/tests/type_checker_test.go b/pkg/tests/type_checker_test.go index be680f183..b0d3076bf 100644 --- a/pkg/tests/type_checker_test.go +++ b/pkg/tests/type_checker_test.go @@ -9,7 +9,7 @@ import ( "github.com/pulumi/providertest/pulumitest/opttest" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck" ) func TestTypeChecker(t *testing.T) {