Merge pull request #27692 from alexwlchan/abolish-the-heirarchy

Correct the spelling of heirarchy/hierarchy throughout

CHANGELOG.md

@@ -30,7 +30,7 @@ ENHANCEMENTS:
 * cli: The family of error messages with the summary "Invalid for_each argument" will now include some additional context about which external values contributed to the result. ([#26747](https://github.com/hashicorp/terraform/issues/26747))
 * cli: Terraform now uses UTF-8 and full VT mode even when running on Windows. Previously Terraform was using the "classic" Windows console API, which was far more limited in what formatting sequences it supported and which characters it could render. ([#27487](https://github.com/hashicorp/terraform/issues/27487))
 * cli: Improved support for Windows console UI on Windows 10, including bold colors and underline for HCL diagnostics. ([#26588](https://github.com/hashicorp/terraform/issues/26588))
-* cli: Diagnostic messages now have a vertical line along their left margin, which we hope will achieve a better visual heirarchy for sighted users and thus make it easier to see where the errors and warnings start and end in relation to other content that might be printed alongside. ([#27343](https://github.com/hashicorp/terraform/issues/27343))
+* cli: Diagnostic messages now have a vertical line along their left margin, which we hope will achieve a better visual hierarchy for sighted users and thus make it easier to see where the errors and warnings start and end in relation to other content that might be printed alongside. ([#27343](https://github.com/hashicorp/terraform/issues/27343))
 * cli: Typing an invalid top-level command, like `terraform destory` instead of `destroy`, will now print out a specific error message about the command being invalid, rather than just printing out the usual help directory. ([#26967](https://github.com/hashicorp/terraform/issues/26967))
 * cli: Plugin crashes will now be reported with more detail, pointing out the plugin name and the method call along with the stack trace ([#26694](https://github.com/hashicorp/terraform/issues/26694))
 * cli: Values in files for undeclared variables (ex. `tfvars`) are no longer deprecated, but will continue to produce a warning. The number of warnings produced has been reduced from 3 full warnings before a summary to two. To provide "global" values across configurations, use `TF_VAR...` environment variables. To reduce the verbosity of the warnings, use the existing `-compact-warnings` option. [GH-27795]

command/format/diagnostic.go

@@ -38,7 +38,7 @@ func Diagnostic(diag tfdiags.Diagnostic, sources map[string][]byte, color *color
 
 	// these leftRule* variables are markers for the beginning of the lines
 	// containing the diagnostic that are intended to help sighted users
-	// better understand the information heirarchy when diagnostics appear
+	// better understand the information hierarchy when diagnostics appear
 	// alongside other information or alongside other diagnostics.
 	//
 	// Without this, it seems (based on folks sharing incomplete messages when

internal/getproviders/didyoumean.go

@@ -49,7 +49,7 @@ func MissingProviderSuggestion(ctx context.Context, addr addrs.Provider, source
 	// for a legacy provider whose type name matches the type of the given
 	// provider. This should then find a suitable answer for any provider
 	// that was originally auto-installable in v0.12 and earlier but moved
-	// into a non-default namespace as part of introducing the heirarchical
+	// into a non-default namespace as part of introducing the hierarchical
 	// provider namespace.
 	//
 	// To achieve that, we need to find the direct registry client in

internal/getproviders/filesystem_search.go

@@ -23,7 +23,7 @@ func SearchLocalDirectory(baseDir string) (map[addrs.Provider]PackageMetaList, e
 	ret := make(map[addrs.Provider]PackageMetaList)
 
 	// We don't support symlinks at intermediate points inside the directory
-	// heirarchy because that could potentially cause our walk to get into
+	// hierarchy because that could potentially cause our walk to get into
 	// an infinite loop, but as a measure of pragmatism we'll allow the
 	// top-level location itself to be a symlink, so that a user can
 	// potentially keep their plugins in a non-standard location but use a
@@ -69,7 +69,7 @@ func SearchLocalDirectory(baseDir string) (map[addrs.Provider]PackageMetaList, e
 
 			if (info.Mode() & os.ModeSymlink) != 0 {
 				// We don't allow symlinks for intermediate steps in the
-				// heirarchy because otherwise this walk would risk getting
+				// hierarchy because otherwise this walk would risk getting
 				// itself into an infinite loop, but if we do find one then
 				// we'll warn about it to help with debugging.
 				log.Printf("[WARN] Provider plugin search ignored symlink %s: only the base directory %s may be a symlink", fullPath, originalBaseDir)

internal/legacy/terraform/resource_address.go

@@ -419,7 +419,7 @@ func (addr *ResourceAddress) ModuleInstanceAddr() addrs.ModuleInstance {
 // Contains returns true if and only if the given node is contained within
 // the receiver.
 //
-// Containment is defined in terms of the module and resource heirarchy:
+// Containment is defined in terms of the module and resource hierarchy:
 // a resource is contained within its module and any ancestor modules,
 // an indexed resource instance is contained with the unindexed resource, etc.
 func (addr *ResourceAddress) Contains(other *ResourceAddress) bool {

provider_source.go

@@ -153,7 +153,7 @@ func implicitProviderSource(services *disco.Disco) getproviders.Source {
 	// conventions for each platform:
 	//
 	//   XDG (Unix): lowercase of the first string, "terraform"
-	//   Windows:    two-level heirarchy of first two strings, "HashiCorp\Terraform"
+	//   Windows:    two-level hierarchy of first two strings, "HashiCorp\Terraform"
 	//   OS X:       reverse-DNS unique identifier, "io.terraform".
 	sysSpecificDirs := userdirs.ForApp("Terraform", "HashiCorp", "io.terraform")
 	for _, dir := range sysSpecificDirs.DataSearchPaths("plugins") {

states/statefile/version3_upgrade.go

@@ -66,7 +66,7 @@ func upgradeStateV3ToV4(old *stateV3) (*stateV4, error) {
 		}
 
 		// In a v3 state file, a "resource state" is actually an instance
-		// state, so we need to fill in a missing level of heirarchy here
+		// state, so we need to fill in a missing level of hierarchy here
 		// by lazily creating resource states as we encounter them.
 		// We'll track them in here, keyed on the string representation of
 		// the resource address.

tools/terraform-bundle/CHANGELOG.md

@@ -8,4 +8,4 @@ BUG FIXES:
 > This is a list of changes relative to terraform-bundle tagged v0.12.
 
 Breaking Changes: 
-* Terraform v0.13.0 has introduced a new heirarchical namespace for providers. Terraform v0.13 requires a new directory layout in order to discover locally-installed provider plugins, and terraform-bundle has been updated to match. Please see the [README](README.md) to learn more about the new directory layout.
+* Terraform v0.13.0 has introduced a new hierarchical namespace for providers. Terraform v0.13 requires a new directory layout in order to discover locally-installed provider plugins, and terraform-bundle has been updated to match. Please see the [README](README.md) to learn more about the new directory layout.