From 2bd2568ad8fa935bc5ce202941f3916bbddc8d60 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 09:39:14 -0700 Subject: [PATCH] Move repl/ to internal/repl/ 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/console.go | 2 +- command/console_interactive.go | 2 +- command/console_interactive_solaris.go | 2 +- command/views/output.go | 2 +- internal/moduletest/provider.go | 2 +- {repl => internal/repl}/format.go | 0 {repl => internal/repl}/format_test.go | 0 {repl => internal/repl}/repl.go | 0 {repl => internal/repl}/session.go | 0 {repl => internal/repl}/session_test.go | 0 {repl => internal/repl}/testdata/config-fixture/child/empty.tf | 0 {repl => internal/repl}/testdata/config-fixture/repl_test.tf | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename {repl => internal/repl}/format.go (100%) rename {repl => internal/repl}/format_test.go (100%) rename {repl => internal/repl}/repl.go (100%) rename {repl => internal/repl}/session.go (100%) rename {repl => internal/repl}/session_test.go (100%) rename {repl => internal/repl}/testdata/config-fixture/child/empty.tf (100%) rename {repl => internal/repl}/testdata/config-fixture/repl_test.tf (100%) diff --git a/command/console.go b/command/console.go index d0128bf4b..c6903e5ea 100644 --- a/command/console.go +++ b/command/console.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/helper/wrappedstreams" - "github.com/hashicorp/terraform/repl" + "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/tfdiags" "github.com/mitchellh/cli" diff --git a/command/console_interactive.go b/command/console_interactive.go index 92f3b4efd..3ca356a3e 100644 --- a/command/console_interactive.go +++ b/command/console_interactive.go @@ -10,7 +10,7 @@ import ( "io" "github.com/hashicorp/terraform/internal/helper/wrappedreadline" - "github.com/hashicorp/terraform/repl" + "github.com/hashicorp/terraform/internal/repl" "github.com/chzyer/readline" "github.com/mitchellh/cli" diff --git a/command/console_interactive_solaris.go b/command/console_interactive_solaris.go index ecb025d4f..576195f14 100644 --- a/command/console_interactive_solaris.go +++ b/command/console_interactive_solaris.go @@ -5,7 +5,7 @@ package command import ( "fmt" - "github.com/hashicorp/terraform/repl" + "github.com/hashicorp/terraform/internal/repl" "github.com/mitchellh/cli" ) diff --git a/command/views/output.go b/command/views/output.go index e189898b6..6aec9dea8 100644 --- a/command/views/output.go +++ b/command/views/output.go @@ -12,7 +12,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/repl" + "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/internal/moduletest/provider.go b/internal/moduletest/provider.go index 12aa90f38..05ce3d602 100644 --- a/internal/moduletest/provider.go +++ b/internal/moduletest/provider.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/providers" - "github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/repl/format.go b/internal/repl/format.go similarity index 100% rename from repl/format.go rename to internal/repl/format.go diff --git a/repl/format_test.go b/internal/repl/format_test.go similarity index 100% rename from repl/format_test.go rename to internal/repl/format_test.go diff --git a/repl/repl.go b/internal/repl/repl.go similarity index 100% rename from repl/repl.go rename to internal/repl/repl.go diff --git a/repl/session.go b/internal/repl/session.go similarity index 100% rename from repl/session.go rename to internal/repl/session.go diff --git a/repl/session_test.go b/internal/repl/session_test.go similarity index 100% rename from repl/session_test.go rename to internal/repl/session_test.go diff --git a/repl/testdata/config-fixture/child/empty.tf b/internal/repl/testdata/config-fixture/child/empty.tf similarity index 100% rename from repl/testdata/config-fixture/child/empty.tf rename to internal/repl/testdata/config-fixture/child/empty.tf diff --git a/repl/testdata/config-fixture/repl_test.tf b/internal/repl/testdata/config-fixture/repl_test.tf similarity index 100% rename from repl/testdata/config-fixture/repl_test.tf rename to internal/repl/testdata/config-fixture/repl_test.tf