From 26e5320a78569b48f2719b14482d8abeff6f9cc3 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 11:38:39 -0700 Subject: [PATCH] Move experiments/ to internal/experiments/ 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. --- configs/experiments.go | 2 +- configs/experiments_test.go | 2 +- configs/module.go | 2 +- {experiments => internal/experiments}/doc.go | 0 {experiments => internal/experiments}/errors.go | 0 {experiments => internal/experiments}/experiment.go | 0 {experiments => internal/experiments}/set.go | 0 {experiments => internal/experiments}/testing.go | 0 lang/functions.go | 2 +- lang/functions_test.go | 2 +- lang/scope.go | 2 +- 11 files changed, 6 insertions(+), 6 deletions(-) rename {experiments => internal/experiments}/doc.go (100%) rename {experiments => internal/experiments}/errors.go (100%) rename {experiments => internal/experiments}/experiment.go (100%) rename {experiments => internal/experiments}/set.go (100%) rename {experiments => internal/experiments}/testing.go (100%) diff --git a/configs/experiments.go b/configs/experiments.go index 83557a85e..956187318 100644 --- a/configs/experiments.go +++ b/configs/experiments.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" "github.com/hashicorp/terraform/version" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/experiments_test.go b/configs/experiments_test.go index 20c8bac68..36e84f140 100644 --- a/configs/experiments_test.go +++ b/configs/experiments_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" ) func TestExperimentsConfig(t *testing.T) { diff --git a/configs/module.go b/configs/module.go index 126eebbdb..a66ea228e 100644 --- a/configs/module.go +++ b/configs/module.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" ) // Module is a container for a set of configuration constructs that are diff --git a/experiments/doc.go b/internal/experiments/doc.go similarity index 100% rename from experiments/doc.go rename to internal/experiments/doc.go diff --git a/experiments/errors.go b/internal/experiments/errors.go similarity index 100% rename from experiments/errors.go rename to internal/experiments/errors.go diff --git a/experiments/experiment.go b/internal/experiments/experiment.go similarity index 100% rename from experiments/experiment.go rename to internal/experiments/experiment.go diff --git a/experiments/set.go b/internal/experiments/set.go similarity index 100% rename from experiments/set.go rename to internal/experiments/set.go diff --git a/experiments/testing.go b/internal/experiments/testing.go similarity index 100% rename from experiments/testing.go rename to internal/experiments/testing.go diff --git a/lang/functions.go b/lang/functions.go index 21be9a7f1..66c05742b 100644 --- a/lang/functions.go +++ b/lang/functions.go @@ -9,7 +9,7 @@ import ( "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" "github.com/hashicorp/terraform/lang/funcs" ) diff --git a/lang/functions_test.go b/lang/functions_test.go index c33bc3672..a577eefb3 100644 --- a/lang/functions_test.go +++ b/lang/functions_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" homedir "github.com/mitchellh/go-homedir" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/scope.go b/lang/scope.go index 3a34e9ca2..94ec9d3bf 100644 --- a/lang/scope.go +++ b/lang/scope.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty/function" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/experiments" + "github.com/hashicorp/terraform/internal/experiments" ) // Scope is the main type in this package, allowing dynamic evaluation of