diff --git a/internal/command/format/diagnostic_test.go b/internal/command/format/diagnostic_test.go index 8e73a367a9a..3e2bf2b7bb1 100644 --- a/internal/command/format/diagnostic_test.go +++ b/internal/command/format/diagnostic_test.go @@ -18,7 +18,7 @@ import ( "github.com/zclconf/go-cty/cty/function" viewsjson "github.com/terramate-io/opentofulib/internal/command/views/json" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" ) diff --git a/internal/command/format/object_id.go b/internal/command/format/object_id.go index 30fb28335a1..ea4faf3babb 100644 --- a/internal/command/format/object_id.go +++ b/internal/command/format/object_id.go @@ -6,7 +6,7 @@ package format import ( - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/format/object_id_test.go b/internal/command/format/object_id_test.go index 784bdcc93b1..c9820f17687 100644 --- a/internal/command/format/object_id_test.go +++ b/internal/command/format/object_id_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/jsonconfig/expression.go b/internal/command/jsonconfig/expression.go index 8085ea68a82..e510ce8df9a 100644 --- a/internal/command/jsonconfig/expression.go +++ b/internal/command/jsonconfig/expression.go @@ -17,8 +17,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/blocktoattr" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/blocktoattr" ) // expression represents any unparsed expression diff --git a/internal/command/jsonformat/plan_test.go b/internal/command/jsonformat/plan_test.go index 69330d4d22f..4a3c4e2503f 100644 --- a/internal/command/jsonformat/plan_test.go +++ b/internal/command/jsonformat/plan_test.go @@ -21,12 +21,12 @@ import ( "github.com/terramate-io/opentofulib/internal/command/jsonplan" "github.com/terramate-io/opentofulib/internal/command/jsonprovider" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/terminal" "github.com/terramate-io/opentofulib/internal/tofu" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestRenderHuman_EmptyPlan(t *testing.T) { diff --git a/internal/command/jsonfunction/function.go b/internal/command/jsonfunction/function.go index b192dcb4720..fb20ccc72aa 100644 --- a/internal/command/jsonfunction/function.go +++ b/internal/command/jsonfunction/function.go @@ -9,8 +9,8 @@ import ( "encoding/json" "fmt" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/internal/command/jsonstate/state.go b/internal/command/jsonstate/state.go index f1192a952a1..2f485cb4863 100644 --- a/internal/command/jsonstate/state.go +++ b/internal/command/jsonstate/state.go @@ -15,10 +15,10 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/command/jsonchecks" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/states/statefile" "github.com/terramate-io/opentofulib/internal/tofu" + "github.com/terramate-io/opentofulib/lang/marks" ) const ( diff --git a/internal/command/jsonstate/state_test.go b/internal/command/jsonstate/state_test.go index f16a4945f95..b1b6399ce9f 100644 --- a/internal/command/jsonstate/state_test.go +++ b/internal/command/jsonstate/state_test.go @@ -15,10 +15,10 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tofu" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestMarshalOutputs(t *testing.T) { diff --git a/internal/command/metadata_functions.go b/internal/command/metadata_functions.go index d5dd5285e66..18fe17d4aed 100644 --- a/internal/command/metadata_functions.go +++ b/internal/command/metadata_functions.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty/function" "github.com/terramate-io/opentofulib/internal/command/jsonfunction" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) var ( diff --git a/internal/command/views/apply_test.go b/internal/command/views/apply_test.go index bf337c96040..aa8dc7eaf5a 100644 --- a/internal/command/views/apply_test.go +++ b/internal/command/views/apply_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/terramate-io/opentofulib/internal/command/arguments" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/terminal" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/json/diagnostic.go b/internal/command/views/json/diagnostic.go index 7f5f72a0635..93d77191d73 100644 --- a/internal/command/views/json/diagnostic.go +++ b/internal/command/views/json/diagnostic.go @@ -16,8 +16,8 @@ import ( "github.com/terramate-io/hcl/v2/hcled" "github.com/terramate-io/hcl/v2/hclparse" "github.com/terramate-io/hcl/v2/hclsyntax" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/json/diagnostic_test.go b/internal/command/views/json/diagnostic_test.go index 127354f4c86..62438c94bb7 100644 --- a/internal/command/views/json/diagnostic_test.go +++ b/internal/command/views/json/diagnostic_test.go @@ -17,8 +17,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/hcltest" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/json/output_test.go b/internal/command/views/json/output_test.go index f96782625cd..efc2248fbca 100644 --- a/internal/command/views/json/output_test.go +++ b/internal/command/views/json/output_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/states" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/operation_test.go b/internal/command/views/operation_test.go index d74602dcc0f..755b932153e 100644 --- a/internal/command/views/operation_test.go +++ b/internal/command/views/operation_test.go @@ -14,12 +14,12 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/command/arguments" "github.com/terramate-io/opentofulib/internal/encryption" - "github.com/terramate-io/opentofulib/internal/lang/globalref" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/states/statefile" "github.com/terramate-io/opentofulib/internal/terminal" "github.com/terramate-io/opentofulib/internal/tofu" + "github.com/terramate-io/opentofulib/lang/globalref" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/refresh_test.go b/internal/command/views/refresh_test.go index 890cee0b6c3..7904fc31aaa 100644 --- a/internal/command/views/refresh_test.go +++ b/internal/command/views/refresh_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/terramate-io/opentofulib/internal/command/arguments" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/terminal" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/configs/backend.go b/internal/configs/backend.go index 489ef692c07..4a623710ba3 100644 --- a/internal/configs/backend.go +++ b/internal/configs/backend.go @@ -12,7 +12,7 @@ import ( "github.com/terramate-io/hcl/v2/hcldec" "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/configs/checks.go b/internal/configs/checks.go index eb3d72c1ce1..44abfdd3c4a 100644 --- a/internal/configs/checks.go +++ b/internal/configs/checks.go @@ -12,7 +12,7 @@ import ( "github.com/terramate-io/hcl/v2/hclsyntax" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) // CheckRule represents a configuration-defined validation rule, precondition, diff --git a/internal/configs/configschema/marks.go b/internal/configs/configschema/marks.go index ca32b226daa..e3017ebab14 100644 --- a/internal/configs/configschema/marks.go +++ b/internal/configs/configschema/marks.go @@ -8,7 +8,7 @@ package configschema import ( "fmt" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/configs/configschema/marks_test.go b/internal/configs/configschema/marks_test.go index 31ab8374485..8ea46d39b7e 100644 --- a/internal/configs/configschema/marks_test.go +++ b/internal/configs/configschema/marks_test.go @@ -8,7 +8,7 @@ package configschema import ( "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/configs/resource.go b/internal/configs/resource.go index ff15654139e..20303f3d870 100644 --- a/internal/configs/resource.go +++ b/internal/configs/resource.go @@ -16,8 +16,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/hcl2shim" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // Resource represents a "resource" or "data" block in a module or file. diff --git a/internal/configs/static_evaluator.go b/internal/configs/static_evaluator.go index 8f5a109cee6..e78a11ef836 100644 --- a/internal/configs/static_evaluator.go +++ b/internal/configs/static_evaluator.go @@ -10,7 +10,7 @@ import ( "github.com/terramate-io/hcl/v2/gohcl" "github.com/terramate-io/hcl/v2/hcldec" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/configs/static_scope.go b/internal/configs/static_scope.go index b3870b9e4c7..07dabcd1ddd 100644 --- a/internal/configs/static_scope.go +++ b/internal/configs/static_scope.go @@ -15,8 +15,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/didyoumean" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // newStaticScope creates a lang.Scope that's backed by the static view of the module represented by the StaticEvaluator diff --git a/internal/encryption/keyprovider.go b/internal/encryption/keyprovider.go index 0fb7b10d75c..be7635ecf57 100644 --- a/internal/encryption/keyprovider.go +++ b/internal/encryption/keyprovider.go @@ -13,7 +13,7 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/encryption/config" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/gohcl" diff --git a/internal/plans/changes_test.go b/internal/plans/changes_test.go index ae38ab4d5b2..e4ef63c5446 100644 --- a/internal/plans/changes_test.go +++ b/internal/plans/changes_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/plans/objchange/compatible.go b/internal/plans/objchange/compatible.go index f7e1a0ef548..894500dd41e 100644 --- a/internal/plans/objchange/compatible.go +++ b/internal/plans/objchange/compatible.go @@ -13,7 +13,7 @@ import ( "github.com/zclconf/go-cty/cty/convert" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) // AssertObjectCompatible checks whether the given "actual" value is a valid diff --git a/internal/plans/objchange/compatible_test.go b/internal/plans/objchange/compatible_test.go index 1dec154d328..4f8188ab5ad 100644 --- a/internal/plans/objchange/compatible_test.go +++ b/internal/plans/objchange/compatible_test.go @@ -13,8 +13,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestAssertObjectCompatible(t *testing.T) { diff --git a/internal/plans/objchange/lcs_test.go b/internal/plans/objchange/lcs_test.go index 0003050914a..9ab35b9f1db 100644 --- a/internal/plans/objchange/lcs_test.go +++ b/internal/plans/objchange/lcs_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/plans/plan.go b/internal/plans/plan.go index e0dc6ac5dfc..f9d97555c08 100644 --- a/internal/plans/plan.go +++ b/internal/plans/plan.go @@ -13,8 +13,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/globalref" "github.com/terramate-io/opentofulib/internal/states" + "github.com/terramate-io/opentofulib/lang/globalref" ) // Plan is the top-level type representing a planned set of changes. diff --git a/internal/plans/planfile/tfplan.go b/internal/plans/planfile/tfplan.go index a7f2dd7847a..3264659a3b0 100644 --- a/internal/plans/planfile/tfplan.go +++ b/internal/plans/planfile/tfplan.go @@ -15,11 +15,11 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" - "github.com/terramate-io/opentofulib/internal/lang/globalref" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/plans/internal/planproto" "github.com/terramate-io/opentofulib/internal/states" + "github.com/terramate-io/opentofulib/lang/globalref" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/terramate-io/opentofulib/version" ) diff --git a/internal/plans/planfile/tfplan_test.go b/internal/plans/planfile/tfplan_test.go index 27569f98a45..9fc306022a1 100644 --- a/internal/plans/planfile/tfplan_test.go +++ b/internal/plans/planfile/tfplan_test.go @@ -14,10 +14,10 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" - "github.com/terramate-io/opentofulib/internal/lang/globalref" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/states" + "github.com/terramate-io/opentofulib/lang/globalref" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestTFPlanRoundTrip(t *testing.T) { diff --git a/internal/repl/format.go b/internal/repl/format.go index 2718874a926..c2e7ba71079 100644 --- a/internal/repl/format.go +++ b/internal/repl/format.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/repl/format_test.go b/internal/repl/format_test.go index f88f2692b18..b2e0bee6cc5 100644 --- a/internal/repl/format_test.go +++ b/internal/repl/format_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/repl/session.go b/internal/repl/session.go index 411735667df..223dac23c54 100644 --- a/internal/repl/session.go +++ b/internal/repl/session.go @@ -14,10 +14,10 @@ import ( "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/hclsyntax" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" - "github.com/terramate-io/opentofulib/internal/lang/types" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" + "github.com/terramate-io/opentofulib/lang/types" ) // Session represents the state for a single REPL session. diff --git a/internal/states/state_test.go b/internal/states/state_test.go index b39a3ba5370..5c60dd76d6b 100644 --- a/internal/states/state_test.go +++ b/internal/states/state_test.go @@ -14,7 +14,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestState(t *testing.T) { diff --git a/internal/states/statefile/version4.go b/internal/states/statefile/version4.go index 64df44fe640..d05c55588bf 100644 --- a/internal/states/statefile/version4.go +++ b/internal/states/statefile/version4.go @@ -18,9 +18,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/encryption" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func readStateV4(src []byte) (*File, tfdiags.Diagnostics) { diff --git a/internal/tfdiags/rpc_friendly.go b/internal/tfdiags/rpc_friendly.go index 41c4e0aa9b3..1baa691bc67 100644 --- a/internal/tfdiags/rpc_friendly.go +++ b/internal/tfdiags/rpc_friendly.go @@ -67,5 +67,5 @@ func (d rpcFriendlyDiag) ExtraInfo() interface{} { } func init() { - gob.RegisterName("tfdiags.rpcFriendlyDiag", (*rpcFriendlyDiag)(nil)) + gob.Register((*rpcFriendlyDiag)(nil)) } diff --git a/internal/tofu/context_apply2_test.go b/internal/tofu/context_apply2_test.go index c9afa3c8029..93c555b5f4c 100644 --- a/internal/tofu/context_apply2_test.go +++ b/internal/tofu/context_apply2_test.go @@ -21,11 +21,11 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) // Test that the PreApply hook is called with the correct deposed key diff --git a/internal/tofu/context_apply_test.go b/internal/tofu/context_apply_test.go index a703dbd149d..0460425eff0 100644 --- a/internal/tofu/context_apply_test.go +++ b/internal/tofu/context_apply_test.go @@ -30,12 +30,12 @@ import ( "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/configs/hcl2shim" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestContext2Apply_basic(t *testing.T) { diff --git a/internal/tofu/context_eval.go b/internal/tofu/context_eval.go index bfce953442e..7c6b85cc9fb 100644 --- a/internal/tofu/context_eval.go +++ b/internal/tofu/context_eval.go @@ -10,9 +10,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) type EvalOpts struct { diff --git a/internal/tofu/context_functions_test.go b/internal/tofu/context_functions_test.go index 3e37eb25618..807d16efe46 100644 --- a/internal/tofu/context_functions_test.go +++ b/internal/tofu/context_functions_test.go @@ -13,9 +13,9 @@ import ( "github.com/terramate-io/hcl/v2/hclsyntax" "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/internal/tofu/context_plan.go b/internal/tofu/context_plan.go index 640f5cda603..082feca144a 100644 --- a/internal/tofu/context_plan.go +++ b/internal/tofu/context_plan.go @@ -20,11 +20,11 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang/globalref" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/refactoring" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/globalref" ) // PlanOpts are the various options that affect the details of how OpenTofu diff --git a/internal/tofu/context_plan2_test.go b/internal/tofu/context_plan2_test.go index b8bbaad9b17..166360a1174 100644 --- a/internal/tofu/context_plan2_test.go +++ b/internal/tofu/context_plan2_test.go @@ -24,11 +24,11 @@ import ( // "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestContext2Plan_removedDuringRefresh(t *testing.T) { diff --git a/internal/tofu/context_plan_test.go b/internal/tofu/context_plan_test.go index af335120995..fc7e417a4a1 100644 --- a/internal/tofu/context_plan_test.go +++ b/internal/tofu/context_plan_test.go @@ -25,12 +25,12 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/configs/hcl2shim" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestContext2Plan_basic(t *testing.T) { diff --git a/internal/tofu/eval_conditions.go b/internal/tofu/eval_conditions.go index 2d1dd9cc7c6..b8a8bf43480 100644 --- a/internal/tofu/eval_conditions.go +++ b/internal/tofu/eval_conditions.go @@ -18,9 +18,9 @@ import ( "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) // evalCheckRules ensures that all of the given check rules pass against diff --git a/internal/tofu/eval_context.go b/internal/tofu/eval_context.go index b2f58351724..c2838115e25 100644 --- a/internal/tofu/eval_context.go +++ b/internal/tofu/eval_context.go @@ -12,13 +12,13 @@ import ( "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/encryption" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/refactoring" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/eval_context_builtin.go b/internal/tofu/eval_context_builtin.go index 5b4a43f9488..847b8471629 100644 --- a/internal/tofu/eval_context_builtin.go +++ b/internal/tofu/eval_context_builtin.go @@ -20,13 +20,13 @@ import ( "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/encryption" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/refactoring" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" "github.com/terramate-io/opentofulib/version" ) diff --git a/internal/tofu/eval_context_mock.go b/internal/tofu/eval_context_mock.go index 62ab81e2475..f876f30fa1a 100644 --- a/internal/tofu/eval_context_mock.go +++ b/internal/tofu/eval_context_mock.go @@ -13,13 +13,13 @@ import ( "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/encryption" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/refactoring" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/internal/tofu/eval_count_test.go b/internal/tofu/eval_count_test.go index fc4161137c6..33b2191c387 100644 --- a/internal/tofu/eval_count_test.go +++ b/internal/tofu/eval_count_test.go @@ -12,7 +12,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/hcltest" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/eval_for_each.go b/internal/tofu/eval_for_each.go index cfcf3b1a8f4..7521aca6c11 100644 --- a/internal/tofu/eval_for_each.go +++ b/internal/tofu/eval_for_each.go @@ -12,9 +12,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) // evaluateForEachExpression is our standard mechanism for interpreting an diff --git a/internal/tofu/eval_for_each_test.go b/internal/tofu/eval_for_each_test.go index 866c53dd6f9..ed7f050f4a2 100644 --- a/internal/tofu/eval_for_each_test.go +++ b/internal/tofu/eval_for_each_test.go @@ -13,8 +13,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/hcltest" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/eval_import.go b/internal/tofu/eval_import.go index 22319ef63a4..a87d39c9f4f 100644 --- a/internal/tofu/eval_import.go +++ b/internal/tofu/eval_import.go @@ -12,8 +12,8 @@ import ( "github.com/terramate-io/hcl/v2/hclsyntax" "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/gocty" ) diff --git a/internal/tofu/eval_import_test.go b/internal/tofu/eval_import_test.go index ab5cc4d8f05..fa4f083da00 100644 --- a/internal/tofu/eval_import_test.go +++ b/internal/tofu/eval_import_test.go @@ -11,8 +11,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/terramate-io/hcl/v2" "github.com/terramate-io/hcl/v2/hcltest" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/eval_variable.go b/internal/tofu/eval_variable.go index d457d3c4e29..e6e1fdf4e60 100644 --- a/internal/tofu/eval_variable.go +++ b/internal/tofu/eval_variable.go @@ -18,9 +18,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) func prepareFinalInputVariableValue(addr addrs.AbsInputVariableInstance, raw *InputValue, cfg *configs.Variable) (cty.Value, tfdiags.Diagnostics) { diff --git a/internal/tofu/eval_variable_test.go b/internal/tofu/eval_variable_test.go index 4ae6f109266..9df86d20657 100644 --- a/internal/tofu/eval_variable_test.go +++ b/internal/tofu/eval_variable_test.go @@ -15,9 +15,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestPrepareFinalInputVariableValue(t *testing.T) { diff --git a/internal/tofu/evaluate.go b/internal/tofu/evaluate.go index 0ccd8972db8..425da5fc6db 100644 --- a/internal/tofu/evaluate.go +++ b/internal/tofu/evaluate.go @@ -21,11 +21,11 @@ import ( "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/didyoumean" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) // Evaluator provides the necessary contextual data for evaluating expressions diff --git a/internal/tofu/evaluate_test.go b/internal/tofu/evaluate_test.go index 4039fb49eeb..39c4e3f894f 100644 --- a/internal/tofu/evaluate_test.go +++ b/internal/tofu/evaluate_test.go @@ -15,11 +15,11 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestEvaluatorGetTerraformAttr(t *testing.T) { diff --git a/internal/tofu/evaluate_valid_test.go b/internal/tofu/evaluate_valid_test.go index 5f5ffe4a776..2746864aad6 100644 --- a/internal/tofu/evaluate_valid_test.go +++ b/internal/tofu/evaluate_valid_test.go @@ -14,8 +14,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/providers" + "github.com/terramate-io/opentofulib/lang" ) func TestStaticValidateReferences(t *testing.T) { diff --git a/internal/tofu/marks_test.go b/internal/tofu/marks_test.go index 13f910d2d30..8f57f8b0b21 100644 --- a/internal/tofu/marks_test.go +++ b/internal/tofu/marks_test.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestMarksEqual(t *testing.T) { diff --git a/internal/tofu/node_check.go b/internal/tofu/node_check.go index 74c63cb708f..fbf0b47aea6 100644 --- a/internal/tofu/node_check.go +++ b/internal/tofu/node_check.go @@ -14,8 +14,8 @@ import ( "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) var ( diff --git a/internal/tofu/node_local.go b/internal/tofu/node_local.go index 9b918a46da2..0dfa30e847f 100644 --- a/internal/tofu/node_local.go +++ b/internal/tofu/node_local.go @@ -15,8 +15,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // nodeExpandLocal represents a named local value in a configuration module, diff --git a/internal/tofu/node_module_expand.go b/internal/tofu/node_module_expand.go index f56cb749ad1..fc983060926 100644 --- a/internal/tofu/node_module_expand.go +++ b/internal/tofu/node_module_expand.go @@ -11,8 +11,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) type ConcreteModuleNodeFunc func(n *nodeExpandModule) dag.Vertex diff --git a/internal/tofu/node_module_variable.go b/internal/tofu/node_module_variable.go index 6a1aba52e5b..935c7df7f6b 100644 --- a/internal/tofu/node_module_variable.go +++ b/internal/tofu/node_module_variable.go @@ -16,8 +16,8 @@ import ( "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // nodeExpandModuleVariable is the placeholder for an variable that has not yet had diff --git a/internal/tofu/node_output.go b/internal/tofu/node_output.go index 800a5124099..a0ab5bce345 100644 --- a/internal/tofu/node_output.go +++ b/internal/tofu/node_output.go @@ -15,11 +15,11 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" + "github.com/terramate-io/opentofulib/lang/marks" ) // nodeExpandOutput is the placeholder for a non-root module output that has diff --git a/internal/tofu/node_output_test.go b/internal/tofu/node_output_test.go index 93e3b4f650e..985ac99b809 100644 --- a/internal/tofu/node_output_test.go +++ b/internal/tofu/node_output_test.go @@ -15,8 +15,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/states" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestNodeApplyableOutputExecute_knownValue(t *testing.T) { diff --git a/internal/tofu/node_provider_test.go b/internal/tofu/node_provider_test.go index f55373f230a..56eec0fe4e0 100644 --- a/internal/tofu/node_provider_test.go +++ b/internal/tofu/node_provider_test.go @@ -14,9 +14,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/node_resource_abstract.go b/internal/tofu/node_resource_abstract.go index 63263409a1a..5ae4d0b5468 100644 --- a/internal/tofu/node_resource_abstract.go +++ b/internal/tofu/node_resource_abstract.go @@ -15,9 +15,9 @@ import ( "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // ConcreteResourceNodeFunc is a callback type used to convert an diff --git a/internal/tofu/node_resource_validate.go b/internal/tofu/node_resource_validate.go index 4be6e5ebf17..402fec52df6 100644 --- a/internal/tofu/node_resource_validate.go +++ b/internal/tofu/node_resource_validate.go @@ -17,10 +17,10 @@ import ( "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/didyoumean" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // NodeValidatableResource represents a resource that is used for validation diff --git a/internal/tofu/node_resource_validate_test.go b/internal/tofu/node_resource_validate_test.go index 8873d231838..ebd6b6acb5a 100644 --- a/internal/tofu/node_resource_validate_test.go +++ b/internal/tofu/node_resource_validate_test.go @@ -15,10 +15,10 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/provisioners" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/tofu/node_root_variable.go b/internal/tofu/node_root_variable.go index 09aa3fa21fc..3f8ffb37254 100644 --- a/internal/tofu/node_root_variable.go +++ b/internal/tofu/node_root_variable.go @@ -13,8 +13,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // NodeRootVariable represents a root variable input. diff --git a/internal/tofu/node_root_variable_test.go b/internal/tofu/node_root_variable_test.go index ed7940880ec..e3e022479d9 100644 --- a/internal/tofu/node_root_variable_test.go +++ b/internal/tofu/node_root_variable_test.go @@ -15,7 +15,7 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/checks" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) func TestNodeRootVariableExecute(t *testing.T) { diff --git a/internal/tofu/test_context.go b/internal/tofu/test_context.go index b5059a2cf2a..82550581510 100644 --- a/internal/tofu/test_context.go +++ b/internal/tofu/test_context.go @@ -17,12 +17,12 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/moduletest" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // TestContext wraps a Context, and adds in direct values for the current state, diff --git a/internal/tofu/test_context_test.go b/internal/tofu/test_context_test.go index 79d313b0167..74f717370f7 100644 --- a/internal/tofu/test_context_test.go +++ b/internal/tofu/test_context_test.go @@ -15,12 +15,12 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/marks" "github.com/terramate-io/opentofulib/internal/moduletest" "github.com/terramate-io/opentofulib/internal/plans" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/states" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestTestContext_EvaluateAgainstState(t *testing.T) { diff --git a/internal/tofu/transform_reference.go b/internal/tofu/transform_reference.go index a53c214bc37..b9c68104d14 100644 --- a/internal/tofu/transform_reference.go +++ b/internal/tofu/transform_reference.go @@ -15,7 +15,7 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/dag" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) // GraphNodeReferenceable must be implemented by any node that represents diff --git a/internal/tofu/validate_selfref.go b/internal/tofu/validate_selfref.go index e28d56b1612..78f577c59c5 100644 --- a/internal/tofu/validate_selfref.go +++ b/internal/tofu/validate_selfref.go @@ -12,9 +12,9 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang" "github.com/terramate-io/opentofulib/internal/providers" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang" ) // validateSelfRef checks to ensure that expressions within a particular diff --git a/internal/lang/blocktoattr/doc.go b/lang/blocktoattr/doc.go similarity index 100% rename from internal/lang/blocktoattr/doc.go rename to lang/blocktoattr/doc.go diff --git a/internal/lang/blocktoattr/fixup.go b/lang/blocktoattr/fixup.go similarity index 100% rename from internal/lang/blocktoattr/fixup.go rename to lang/blocktoattr/fixup.go diff --git a/internal/lang/blocktoattr/fixup_bench_test.go b/lang/blocktoattr/fixup_bench_test.go similarity index 100% rename from internal/lang/blocktoattr/fixup_bench_test.go rename to lang/blocktoattr/fixup_bench_test.go diff --git a/internal/lang/blocktoattr/fixup_test.go b/lang/blocktoattr/fixup_test.go similarity index 100% rename from internal/lang/blocktoattr/fixup_test.go rename to lang/blocktoattr/fixup_test.go diff --git a/internal/lang/blocktoattr/functions.go b/lang/blocktoattr/functions.go similarity index 100% rename from internal/lang/blocktoattr/functions.go rename to lang/blocktoattr/functions.go diff --git a/internal/lang/blocktoattr/schema.go b/lang/blocktoattr/schema.go similarity index 100% rename from internal/lang/blocktoattr/schema.go rename to lang/blocktoattr/schema.go diff --git a/internal/lang/blocktoattr/variables.go b/lang/blocktoattr/variables.go similarity index 100% rename from internal/lang/blocktoattr/variables.go rename to lang/blocktoattr/variables.go diff --git a/internal/lang/blocktoattr/variables_test.go b/lang/blocktoattr/variables_test.go similarity index 100% rename from internal/lang/blocktoattr/variables_test.go rename to lang/blocktoattr/variables_test.go diff --git a/internal/lang/data.go b/lang/data.go similarity index 100% rename from internal/lang/data.go rename to lang/data.go diff --git a/internal/lang/data_test.go b/lang/data_test.go similarity index 100% rename from internal/lang/data_test.go rename to lang/data_test.go diff --git a/internal/lang/doc.go b/lang/doc.go similarity index 100% rename from internal/lang/doc.go rename to lang/doc.go diff --git a/internal/lang/eval.go b/lang/eval.go similarity index 99% rename from internal/lang/eval.go rename to lang/eval.go index cd6095bacfc..49d5528d600 100644 --- a/internal/lang/eval.go +++ b/lang/eval.go @@ -21,8 +21,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" "github.com/terramate-io/opentofulib/internal/instances" - "github.com/terramate-io/opentofulib/internal/lang/blocktoattr" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/blocktoattr" ) // ExpandBlock expands any "dynamic" blocks present in the given body. The diff --git a/internal/lang/eval_test.go b/lang/eval_test.go similarity index 100% rename from internal/lang/eval_test.go rename to lang/eval_test.go diff --git a/internal/lang/funcs/cidr.go b/lang/funcs/cidr.go similarity index 100% rename from internal/lang/funcs/cidr.go rename to lang/funcs/cidr.go diff --git a/internal/lang/funcs/cidr_test.go b/lang/funcs/cidr_test.go similarity index 100% rename from internal/lang/funcs/cidr_test.go rename to lang/funcs/cidr_test.go diff --git a/internal/lang/funcs/collection.go b/lang/funcs/collection.go similarity index 100% rename from internal/lang/funcs/collection.go rename to lang/funcs/collection.go diff --git a/internal/lang/funcs/collection_test.go b/lang/funcs/collection_test.go similarity index 99% rename from internal/lang/funcs/collection_test.go rename to lang/funcs/collection_test.go index 0defb370b61..d383a822725 100644 --- a/internal/lang/funcs/collection_test.go +++ b/lang/funcs/collection_test.go @@ -10,7 +10,7 @@ import ( "math" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/conversion.go b/lang/funcs/conversion.go similarity index 97% rename from internal/lang/funcs/conversion.go rename to lang/funcs/conversion.go index 2047657eaaf..ac0e736dadf 100644 --- a/internal/lang/funcs/conversion.go +++ b/lang/funcs/conversion.go @@ -8,8 +8,8 @@ package funcs import ( "strconv" - "github.com/terramate-io/opentofulib/internal/lang/marks" - "github.com/terramate-io/opentofulib/internal/lang/types" + "github.com/terramate-io/opentofulib/lang/marks" + "github.com/terramate-io/opentofulib/lang/types" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" diff --git a/internal/lang/funcs/conversion_test.go b/lang/funcs/conversion_test.go similarity index 98% rename from internal/lang/funcs/conversion_test.go rename to lang/funcs/conversion_test.go index a8858a6bbce..ba7598c84d1 100644 --- a/internal/lang/funcs/conversion_test.go +++ b/lang/funcs/conversion_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/crypto.go b/lang/funcs/crypto.go similarity index 100% rename from internal/lang/funcs/crypto.go rename to lang/funcs/crypto.go diff --git a/internal/lang/funcs/crypto_test.go b/lang/funcs/crypto_test.go similarity index 100% rename from internal/lang/funcs/crypto_test.go rename to lang/funcs/crypto_test.go diff --git a/internal/lang/funcs/datetime.go b/lang/funcs/datetime.go similarity index 100% rename from internal/lang/funcs/datetime.go rename to lang/funcs/datetime.go diff --git a/internal/lang/funcs/datetime_test.go b/lang/funcs/datetime_test.go similarity index 100% rename from internal/lang/funcs/datetime_test.go rename to lang/funcs/datetime_test.go diff --git a/internal/lang/funcs/descriptions.go b/lang/funcs/descriptions.go similarity index 100% rename from internal/lang/funcs/descriptions.go rename to lang/funcs/descriptions.go diff --git a/internal/lang/funcs/encoding.go b/lang/funcs/encoding.go similarity index 100% rename from internal/lang/funcs/encoding.go rename to lang/funcs/encoding.go diff --git a/internal/lang/funcs/encoding_test.go b/lang/funcs/encoding_test.go similarity index 99% rename from internal/lang/funcs/encoding_test.go rename to lang/funcs/encoding_test.go index 0f01b6ca3d2..8f9e1cb4f4c 100644 --- a/internal/lang/funcs/encoding_test.go +++ b/lang/funcs/encoding_test.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestBase64Decode(t *testing.T) { diff --git a/internal/lang/funcs/filesystem.go b/lang/funcs/filesystem.go similarity index 100% rename from internal/lang/funcs/filesystem.go rename to lang/funcs/filesystem.go diff --git a/internal/lang/funcs/filesystem_test.go b/lang/funcs/filesystem_test.go similarity index 99% rename from internal/lang/funcs/filesystem_test.go rename to lang/funcs/filesystem_test.go index afb77af00a5..5476da6953f 100644 --- a/internal/lang/funcs/filesystem_test.go +++ b/lang/funcs/filesystem_test.go @@ -17,7 +17,7 @@ import ( "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) func TestFile(t *testing.T) { diff --git a/internal/lang/funcs/number.go b/lang/funcs/number.go similarity index 100% rename from internal/lang/funcs/number.go rename to lang/funcs/number.go diff --git a/internal/lang/funcs/number_test.go b/lang/funcs/number_test.go similarity index 99% rename from internal/lang/funcs/number_test.go rename to lang/funcs/number_test.go index a4ce4cae553..a29f8d17f67 100644 --- a/internal/lang/funcs/number_test.go +++ b/lang/funcs/number_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/redact.go b/lang/funcs/redact.go similarity index 89% rename from internal/lang/funcs/redact.go rename to lang/funcs/redact.go index 8610993a6eb..d0252239e35 100644 --- a/internal/lang/funcs/redact.go +++ b/lang/funcs/redact.go @@ -8,7 +8,7 @@ package funcs import ( "fmt" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/redact_test.go b/lang/funcs/redact_test.go similarity index 95% rename from internal/lang/funcs/redact_test.go rename to lang/funcs/redact_test.go index 9e600408053..5a42e50547f 100644 --- a/internal/lang/funcs/redact_test.go +++ b/lang/funcs/redact_test.go @@ -8,7 +8,7 @@ package funcs import ( "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/refinements.go b/lang/funcs/refinements.go similarity index 100% rename from internal/lang/funcs/refinements.go rename to lang/funcs/refinements.go diff --git a/internal/lang/funcs/render_template.go b/lang/funcs/render_template.go similarity index 100% rename from internal/lang/funcs/render_template.go rename to lang/funcs/render_template.go diff --git a/internal/lang/funcs/render_template_test.go b/lang/funcs/render_template_test.go similarity index 98% rename from internal/lang/funcs/render_template_test.go rename to lang/funcs/render_template_test.go index 6369a4a0930..5228d219485 100644 --- a/internal/lang/funcs/render_template_test.go +++ b/lang/funcs/render_template_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/terramate-io/hcl/v2" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/internal/lang/funcs/sensitive.go b/lang/funcs/sensitive.go similarity index 97% rename from internal/lang/funcs/sensitive.go rename to lang/funcs/sensitive.go index 1567304b111..9168f376dfb 100644 --- a/internal/lang/funcs/sensitive.go +++ b/lang/funcs/sensitive.go @@ -6,7 +6,7 @@ package funcs import ( - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/internal/lang/funcs/sensitive_test.go b/lang/funcs/sensitive_test.go similarity index 98% rename from internal/lang/funcs/sensitive_test.go rename to lang/funcs/sensitive_test.go index f9bed1691c7..3af08d6b9cd 100644 --- a/internal/lang/funcs/sensitive_test.go +++ b/lang/funcs/sensitive_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/lang/funcs/string.go b/lang/funcs/string.go similarity index 100% rename from internal/lang/funcs/string.go rename to lang/funcs/string.go diff --git a/internal/lang/funcs/string_test.go b/lang/funcs/string_test.go similarity index 99% rename from internal/lang/funcs/string_test.go rename to lang/funcs/string_test.go index 6abe9311672..92bcb05c703 100644 --- a/internal/lang/funcs/string_test.go +++ b/lang/funcs/string_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/internal/lang/funcs/testdata/bare.tmpl b/lang/funcs/testdata/bare.tmpl similarity index 100% rename from internal/lang/funcs/testdata/bare.tmpl rename to lang/funcs/testdata/bare.tmpl diff --git a/internal/lang/funcs/testdata/func.tmpl b/lang/funcs/testdata/func.tmpl similarity index 100% rename from internal/lang/funcs/testdata/func.tmpl rename to lang/funcs/testdata/func.tmpl diff --git a/internal/lang/funcs/testdata/hello.tmpl b/lang/funcs/testdata/hello.tmpl similarity index 100% rename from internal/lang/funcs/testdata/hello.tmpl rename to lang/funcs/testdata/hello.tmpl diff --git a/internal/lang/funcs/testdata/hello.txt b/lang/funcs/testdata/hello.txt similarity index 100% rename from internal/lang/funcs/testdata/hello.txt rename to lang/funcs/testdata/hello.txt diff --git a/internal/lang/funcs/testdata/icon.png b/lang/funcs/testdata/icon.png similarity index 100% rename from internal/lang/funcs/testdata/icon.png rename to lang/funcs/testdata/icon.png diff --git a/internal/lang/funcs/testdata/list.tmpl b/lang/funcs/testdata/list.tmpl similarity index 100% rename from internal/lang/funcs/testdata/list.tmpl rename to lang/funcs/testdata/list.tmpl diff --git a/internal/lang/funcs/testdata/recursive.tmpl b/lang/funcs/testdata/recursive.tmpl similarity index 100% rename from internal/lang/funcs/testdata/recursive.tmpl rename to lang/funcs/testdata/recursive.tmpl diff --git a/internal/lang/funcs/testdata/unreadable/foobar b/lang/funcs/testdata/unreadable/foobar similarity index 100% rename from internal/lang/funcs/testdata/unreadable/foobar rename to lang/funcs/testdata/unreadable/foobar diff --git a/internal/lang/functions.go b/lang/functions.go similarity index 99% rename from internal/lang/functions.go rename to lang/functions.go index a14db08546d..e217bebfd6a 100644 --- a/internal/lang/functions.go +++ b/lang/functions.go @@ -16,7 +16,7 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/experiments" - "github.com/terramate-io/opentofulib/internal/lang/funcs" + "github.com/terramate-io/opentofulib/lang/funcs" ) var impureFunctions = []string{ diff --git a/internal/lang/functions_descriptions_test.go b/lang/functions_descriptions_test.go similarity index 94% rename from internal/lang/functions_descriptions_test.go rename to lang/functions_descriptions_test.go index 13646334191..3c0b7b4bd88 100644 --- a/internal/lang/functions_descriptions_test.go +++ b/lang/functions_descriptions_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/terramate-io/opentofulib/internal/lang/funcs" + "github.com/terramate-io/opentofulib/lang/funcs" ) func TestFunctionDescriptions(t *testing.T) { diff --git a/internal/lang/functions_test.go b/lang/functions_test.go similarity index 99% rename from internal/lang/functions_test.go rename to lang/functions_test.go index 2d065be7bb1..5b3397d60db 100644 --- a/internal/lang/functions_test.go +++ b/lang/functions_test.go @@ -19,7 +19,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/terramate-io/opentofulib/internal/experiments" - "github.com/terramate-io/opentofulib/internal/lang/marks" + "github.com/terramate-io/opentofulib/lang/marks" ) // TestFunctions tests that functions are callable through the functionality diff --git a/internal/lang/globalref/analyzer.go b/lang/globalref/analyzer.go similarity index 100% rename from internal/lang/globalref/analyzer.go rename to lang/globalref/analyzer.go diff --git a/internal/lang/globalref/analyzer_contributing_resources.go b/lang/globalref/analyzer_contributing_resources.go similarity index 100% rename from internal/lang/globalref/analyzer_contributing_resources.go rename to lang/globalref/analyzer_contributing_resources.go diff --git a/internal/lang/globalref/analyzer_contributing_resources_test.go b/lang/globalref/analyzer_contributing_resources_test.go similarity index 100% rename from internal/lang/globalref/analyzer_contributing_resources_test.go rename to lang/globalref/analyzer_contributing_resources_test.go diff --git a/internal/lang/globalref/analyzer_meta_references.go b/lang/globalref/analyzer_meta_references.go similarity index 99% rename from internal/lang/globalref/analyzer_meta_references.go rename to lang/globalref/analyzer_meta_references.go index 2687f8b789f..b2c5890cc97 100644 --- a/internal/lang/globalref/analyzer_meta_references.go +++ b/lang/globalref/analyzer_meta_references.go @@ -13,7 +13,7 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) // MetaReferences inspects the configuration to find the references contained diff --git a/internal/lang/globalref/analyzer_meta_references_shortcuts.go b/lang/globalref/analyzer_meta_references_shortcuts.go similarity index 98% rename from internal/lang/globalref/analyzer_meta_references_shortcuts.go rename to lang/globalref/analyzer_meta_references_shortcuts.go index 0dacf4d414c..509ca31a71c 100644 --- a/internal/lang/globalref/analyzer_meta_references_shortcuts.go +++ b/lang/globalref/analyzer_meta_references_shortcuts.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/terramate-io/opentofulib/internal/addrs" - "github.com/terramate-io/opentofulib/internal/lang" + "github.com/terramate-io/opentofulib/lang" ) // ReferencesFromOutputValue returns all of the direct references from the diff --git a/internal/lang/globalref/analyzer_meta_references_test.go b/lang/globalref/analyzer_meta_references_test.go similarity index 100% rename from internal/lang/globalref/analyzer_meta_references_test.go rename to lang/globalref/analyzer_meta_references_test.go diff --git a/internal/lang/globalref/analyzer_test.go b/lang/globalref/analyzer_test.go similarity index 100% rename from internal/lang/globalref/analyzer_test.go rename to lang/globalref/analyzer_test.go diff --git a/internal/lang/globalref/doc.go b/lang/globalref/doc.go similarity index 100% rename from internal/lang/globalref/doc.go rename to lang/globalref/doc.go diff --git a/internal/lang/globalref/reference.go b/lang/globalref/reference.go similarity index 100% rename from internal/lang/globalref/reference.go rename to lang/globalref/reference.go diff --git a/internal/lang/globalref/testdata/assorted/assorted-root.tf b/lang/globalref/testdata/assorted/assorted-root.tf similarity index 100% rename from internal/lang/globalref/testdata/assorted/assorted-root.tf rename to lang/globalref/testdata/assorted/assorted-root.tf diff --git a/internal/lang/globalref/testdata/assorted/child/assorted-child.tf b/lang/globalref/testdata/assorted/child/assorted-child.tf similarity index 100% rename from internal/lang/globalref/testdata/assorted/child/assorted-child.tf rename to lang/globalref/testdata/assorted/child/assorted-child.tf diff --git a/internal/lang/globalref/testdata/contributing-resources/compute/contributing-resources-compute.tf b/lang/globalref/testdata/contributing-resources/compute/contributing-resources-compute.tf similarity index 100% rename from internal/lang/globalref/testdata/contributing-resources/compute/contributing-resources-compute.tf rename to lang/globalref/testdata/contributing-resources/compute/contributing-resources-compute.tf diff --git a/internal/lang/globalref/testdata/contributing-resources/contributing-resources-root.tf b/lang/globalref/testdata/contributing-resources/contributing-resources-root.tf similarity index 100% rename from internal/lang/globalref/testdata/contributing-resources/contributing-resources-root.tf rename to lang/globalref/testdata/contributing-resources/contributing-resources-root.tf diff --git a/internal/lang/globalref/testdata/contributing-resources/network/contributing-resources-network.tf b/lang/globalref/testdata/contributing-resources/network/contributing-resources-network.tf similarity index 100% rename from internal/lang/globalref/testdata/contributing-resources/network/contributing-resources-network.tf rename to lang/globalref/testdata/contributing-resources/network/contributing-resources-network.tf diff --git a/internal/lang/marks/marks.go b/lang/marks/marks.go similarity index 100% rename from internal/lang/marks/marks.go rename to lang/marks/marks.go diff --git a/lang/public.go b/lang/public.go deleted file mode 100644 index 2bb26ee159c..00000000000 --- a/lang/public.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Terramate GmbH -// SPDX-License-Identifier: MPL-2.0 - -package lang - -import "github.com/terramate-io/opentofulib/internal/lang" - -// Scope is an alias for the internal lang.Scope. -type Scope = lang.Scope diff --git a/internal/lang/references.go b/lang/references.go similarity index 98% rename from internal/lang/references.go rename to lang/references.go index 6a91bc0e328..8b306ef356a 100644 --- a/internal/lang/references.go +++ b/lang/references.go @@ -10,8 +10,8 @@ import ( "github.com/terramate-io/opentofulib/internal/addrs" "github.com/terramate-io/opentofulib/internal/configs/configschema" - "github.com/terramate-io/opentofulib/internal/lang/blocktoattr" "github.com/terramate-io/opentofulib/internal/tfdiags" + "github.com/terramate-io/opentofulib/lang/blocktoattr" ) // References finds all of the references in the given set of traversals, diff --git a/internal/lang/scope.go b/lang/scope.go similarity index 100% rename from internal/lang/scope.go rename to lang/scope.go diff --git a/internal/lang/testdata/functions-test/hello.tmpl b/lang/testdata/functions-test/hello.tmpl similarity index 100% rename from internal/lang/testdata/functions-test/hello.tmpl rename to lang/testdata/functions-test/hello.tmpl diff --git a/internal/lang/testdata/functions-test/hello.txt b/lang/testdata/functions-test/hello.txt similarity index 100% rename from internal/lang/testdata/functions-test/hello.txt rename to lang/testdata/functions-test/hello.txt diff --git a/internal/lang/testdata/functions-test/subdirectory/hello.tmpl b/lang/testdata/functions-test/subdirectory/hello.tmpl similarity index 100% rename from internal/lang/testdata/functions-test/subdirectory/hello.tmpl rename to lang/testdata/functions-test/subdirectory/hello.tmpl diff --git a/internal/lang/testdata/functions-test/subdirectory/hello.txt b/lang/testdata/functions-test/subdirectory/hello.txt similarity index 100% rename from internal/lang/testdata/functions-test/subdirectory/hello.txt rename to lang/testdata/functions-test/subdirectory/hello.txt diff --git a/internal/lang/types/type_type.go b/lang/types/type_type.go similarity index 100% rename from internal/lang/types/type_type.go rename to lang/types/type_type.go diff --git a/internal/lang/types/types.go b/lang/types/types.go similarity index 100% rename from internal/lang/types/types.go rename to lang/types/types.go