From 415ab31db82e0e47c3458129cf307aac0bbe7f80 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 09:48:22 -0700 Subject: [PATCH] Move e2e/ to internal/e2e/ This is part of a general effort to move all of Terraform's non-library package surface under internal in order to reinforce that these are for internal use within Terraform only. If you were previously importing packages under this prefix into an external codebase, you could pin to an earlier release tag as an interim solution until you've make a plan to achieve the same functionality some other way. --- command/e2etest/automation_test.go | 2 +- command/e2etest/init_test.go | 2 +- command/e2etest/main_test.go | 2 +- command/e2etest/primary_test.go | 2 +- command/e2etest/provider_dev_test.go | 2 +- command/e2etest/provider_plugin_test.go | 2 +- command/e2etest/providers_mirror_test.go | 2 +- command/e2etest/provisioner_plugin_test.go | 2 +- command/e2etest/provisioner_test.go | 2 +- command/e2etest/remote_state_test.go | 2 +- command/e2etest/unmanaged_test.go | 2 +- command/e2etest/version_test.go | 2 +- {e2e => internal/e2e}/e2e.go | 0 tools/terraform-bundle/e2etest/main_test.go | 2 +- tools/terraform-bundle/e2etest/package_test.go | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename {e2e => internal/e2e}/e2e.go (100%) diff --git a/command/e2etest/automation_test.go b/command/e2etest/automation_test.go index d65afd177..549ede754 100644 --- a/command/e2etest/automation_test.go +++ b/command/e2etest/automation_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" "github.com/hashicorp/terraform/plans" ) diff --git a/command/e2etest/init_test.go b/command/e2etest/init_test.go index 1f0e3fc53..0e793c151 100644 --- a/command/e2etest/init_test.go +++ b/command/e2etest/init_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) func TestInitProviders(t *testing.T) { diff --git a/command/e2etest/main_test.go b/command/e2etest/main_test.go index 64dc8f148..01e20a982 100644 --- a/command/e2etest/main_test.go +++ b/command/e2etest/main_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) var terraformBin string diff --git a/command/e2etest/primary_test.go b/command/e2etest/primary_test.go index ded1ba78a..96125d885 100644 --- a/command/e2etest/primary_test.go +++ b/command/e2etest/primary_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" "github.com/hashicorp/terraform/plans" "github.com/zclconf/go-cty/cty" ) diff --git a/command/e2etest/provider_dev_test.go b/command/e2etest/provider_dev_test.go index 401eb779f..8c52c2909 100644 --- a/command/e2etest/provider_dev_test.go +++ b/command/e2etest/provider_dev_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) // TestProviderDevOverrides is a test for the special dev_overrides setting diff --git a/command/e2etest/provider_plugin_test.go b/command/e2etest/provider_plugin_test.go index 62099fa8c..585818b1b 100644 --- a/command/e2etest/provider_plugin_test.go +++ b/command/e2etest/provider_plugin_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/command/e2etest/providers_mirror_test.go b/command/e2etest/providers_mirror_test.go index 3d229e6b6..cc0b22f86 100644 --- a/command/e2etest/providers_mirror_test.go +++ b/command/e2etest/providers_mirror_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) // The tests in this file are for the "terraform providers mirror" command, diff --git a/command/e2etest/provisioner_plugin_test.go b/command/e2etest/provisioner_plugin_test.go index 285df73ba..4220df574 100644 --- a/command/e2etest/provisioner_plugin_test.go +++ b/command/e2etest/provisioner_plugin_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) // TestProvisionerPlugin is a test that terraform can execute a 3rd party diff --git a/command/e2etest/provisioner_test.go b/command/e2etest/provisioner_test.go index 39bfa3757..928db1788 100644 --- a/command/e2etest/provisioner_test.go +++ b/command/e2etest/provisioner_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) // TestProviderDevOverrides is a test that terraform can execute a 3rd party diff --git a/command/e2etest/remote_state_test.go b/command/e2etest/remote_state_test.go index be8c032bd..2230b0ab1 100644 --- a/command/e2etest/remote_state_test.go +++ b/command/e2etest/remote_state_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) func TestTerraformProviderRead(t *testing.T) { diff --git a/command/e2etest/unmanaged_test.go b/command/e2etest/unmanaged_test.go index b32748ada..4d5c5130d 100644 --- a/command/e2etest/unmanaged_test.go +++ b/command/e2etest/unmanaged_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" "github.com/hashicorp/terraform/internal/grpcwrap" simple "github.com/hashicorp/terraform/internal/provider-simple" proto "github.com/hashicorp/terraform/internal/tfplugin5" diff --git a/command/e2etest/version_test.go b/command/e2etest/version_test.go index 1f19ecf64..048c83020 100644 --- a/command/e2etest/version_test.go +++ b/command/e2etest/version_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" "github.com/hashicorp/terraform/version" ) diff --git a/e2e/e2e.go b/internal/e2e/e2e.go similarity index 100% rename from e2e/e2e.go rename to internal/e2e/e2e.go diff --git a/tools/terraform-bundle/e2etest/main_test.go b/tools/terraform-bundle/e2etest/main_test.go index 30c2ac2f3..f59c670d3 100644 --- a/tools/terraform-bundle/e2etest/main_test.go +++ b/tools/terraform-bundle/e2etest/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) var bundleBin string diff --git a/tools/terraform-bundle/e2etest/package_test.go b/tools/terraform-bundle/e2etest/package_test.go index 6331fe99f..74332fa32 100644 --- a/tools/terraform-bundle/e2etest/package_test.go +++ b/tools/terraform-bundle/e2etest/package_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/e2e" + "github.com/hashicorp/terraform/internal/e2e" ) func TestPackage_empty(t *testing.T) {