IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update user-facing references to Terraform internal/initwd (#95)

Browse Source
This commit is contained in:
Marcin Wyszynski 2023-08-23 10:20:53 +02:00 committed by GitHub
parent 58cf4b1ca1
commit 2e236adf7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/initwd/module_install.go
View File

@ -218,7 +218,7 @@ func (i *ModuleInstaller) moduleInstallWalker(ctx context.Context, manifest mods
Severity: hcl.DiagError, Severity: hcl.DiagError,
Summary: "Failed to remove local module cache", Summary: "Failed to remove local module cache",
Detail: fmt.Sprintf( Detail: fmt.Sprintf(
"Terraform tried to remove %s in order to reinstall this module, but encountered an error: %s", "OpenTF tried to remove %s in order to reinstall this module, but encountered an error: %s",
instPath, err, instPath, err,
), ),
}) })
@ -463,7 +463,7 @@ func (i *ModuleInstaller) installRegistryModule(ctx context.Context, req *config
diags = diags.Append(&hcl.Diagnostic{ diags = diags.Append(&hcl.Diagnostic{
Severity: hcl.DiagError, Severity: hcl.DiagError,
Summary: "Invalid response from remote module registry", Summary: "Invalid response from remote module registry",
Detail: fmt.Sprintf("The registry at %s returned an invalid response when Terraform requested available versions for module %q (%s:%d).", hostname, req.Name, req.CallRange.Filename, req.CallRange.Start.Line), Detail: fmt.Sprintf("The registry at %s returned an invalid response when OpenTF requested available versions for module %q (%s:%d).", hostname, req.Name, req.CallRange.Filename, req.CallRange.Start.Line),
Subject: req.CallRange.Ptr(), Subject: req.CallRange.Ptr(),
}) })
return nil, nil, diags return nil, nil, diags
@ -482,7 +482,7 @@ func (i *ModuleInstaller) installRegistryModule(ctx context.Context, req *config
diags = diags.Append(&hcl.Diagnostic{ diags = diags.Append(&hcl.Diagnostic{
Severity: hcl.DiagWarning, Severity: hcl.DiagWarning,
Summary: "Invalid response from remote module registry", Summary: "Invalid response from remote module registry",
Detail: fmt.Sprintf("The registry at %s returned an invalid version string %q for module %q (%s:%d), which Terraform ignored.", hostname, mv.Version, req.Name, req.CallRange.Filename, req.CallRange.Start.Line), Detail: fmt.Sprintf("The registry at %s returned an invalid version string %q for module %q (%s:%d), which OpenTF ignored.", hostname, mv.Version, req.Name, req.CallRange.Filename, req.CallRange.Start.Line),
Subject: req.CallRange.Ptr(), Subject: req.CallRange.Ptr(),
}) })
continue continue
@ -658,7 +658,7 @@ func (i *ModuleInstaller) installRegistryModule(ctx context.Context, req *config
diags = diags.Append(&hcl.Diagnostic{ diags = diags.Append(&hcl.Diagnostic{
Severity: hcl.DiagError, Severity: hcl.DiagError,
Summary: "Unreadable module directory", Summary: "Unreadable module directory",
Detail: fmt.Sprintf("The directory %s could not be read. This is a bug in Terraform and should be reported.", modDir), Detail: fmt.Sprintf("The directory %s could not be read. This is a bug in OpenTF and should be reported.", modDir),
}) })
} else if vDiags := mod.CheckCoreVersionRequirements(req.Path, req.SourceAddr); vDiags.HasErrors() { } else if vDiags := mod.CheckCoreVersionRequirements(req.Path, req.SourceAddr); vDiags.HasErrors() {
// If the core version requirements are not met, we drop any other // If the core version requirements are not met, we drop any other
@ -759,7 +759,7 @@ func (i *ModuleInstaller) installGoGetterModule(ctx context.Context, req *config
diags = diags.Append(&hcl.Diagnostic{ diags = diags.Append(&hcl.Diagnostic{
Severity: hcl.DiagError, Severity: hcl.DiagError,
Summary: "Unreadable module directory", Summary: "Unreadable module directory",
Detail: fmt.Sprintf("The directory %s could not be read. This is a bug in Terraform and should be reported.", modDir), Detail: fmt.Sprintf("The directory %s could not be read. This is a bug in OpenTF and should be reported.", modDir),
}) })
} else if vDiags := mod.CheckCoreVersionRequirements(req.Path, req.SourceAddr); vDiags.HasErrors() { } else if vDiags := mod.CheckCoreVersionRequirements(req.Path, req.SourceAddr); vDiags.HasErrors() {
// If the core version requirements are not met, we drop any other // If the core version requirements are not met, we drop any other
@ -891,7 +891,7 @@ func maybeImproveLocalInstallError(req *configs.ModuleRequest, diags hcl.Diagnos
// treats relative paths as local, so if it seems like that's // treats relative paths as local, so if it seems like that's
// what the user was doing then we'll add an additional note // what the user was doing then we'll add an additional note
// about it. // about it.
suggestion = "\n\nTerraform treats absolute filesystem paths as external modules which establish a new module package. To treat this directory as part of the same package as its caller, use a local path starting with either \"./\" or \"../\"." suggestion = "\n\nOpenTF treats absolute filesystem paths as external modules which establish a new module package. To treat this directory as part of the same package as its caller, use a local path starting with either \"./\" or \"../\"."
} }
newDiags = newDiags.Append(&hcl.Diagnostic{ newDiags = newDiags.Append(&hcl.Diagnostic{
Severity: hcl.DiagError, Severity: hcl.DiagError,