From 593cf7b4d5c973294aef4b9fb52b72f471413f28 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Fri, 2 Oct 2020 09:13:20 -0700 Subject: [PATCH] didyoumean: move from "helper" to "internal" This new-ish package ended up under "helper" during the 0.12 cycle for want of some other place to put it, but in retrospect that was an odd choice because the "helper/" tree is otherwise a bunch of legacy code from when the SDK lived in this repository. Here we move it over into the "internal" directory just to distance it from the guidance of not using "helper/" packages in new projects; didyoumean is a package we actively use as part of error message hints. --- configs/configschema/validate_traversal.go | 2 +- {helper => internal}/didyoumean/name_suggestion.go | 0 {helper => internal}/didyoumean/name_suggestion_test.go | 0 terraform/evaluate_valid.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {helper => internal}/didyoumean/name_suggestion.go (100%) rename {helper => internal}/didyoumean/name_suggestion_test.go (100%) diff --git a/configs/configschema/validate_traversal.go b/configs/configschema/validate_traversal.go index 9fc2de38c..83368412f 100644 --- a/configs/configschema/validate_traversal.go +++ b/configs/configschema/validate_traversal.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/helper/didyoumean" + "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/helper/didyoumean/name_suggestion.go b/internal/didyoumean/name_suggestion.go similarity index 100% rename from helper/didyoumean/name_suggestion.go rename to internal/didyoumean/name_suggestion.go diff --git a/helper/didyoumean/name_suggestion_test.go b/internal/didyoumean/name_suggestion_test.go similarity index 100% rename from helper/didyoumean/name_suggestion_test.go rename to internal/didyoumean/name_suggestion_test.go diff --git a/terraform/evaluate_valid.go b/terraform/evaluate_valid.go index 86475a605..0746ce507 100644 --- a/terraform/evaluate_valid.go +++ b/terraform/evaluate_valid.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/helper/didyoumean" + "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/tfdiags" )