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

Adapt user-facing usages of terraform in internal/providercache (#119)

Browse Source
This commit is contained in:
Marcin Wyszynski 2023-08-23 12:24:02 +02:00 committed by GitHub
parent 5fa28ede2c
commit a9a78c000d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/command/init_test.go
View File

@ -2616,7 +2616,7 @@ func TestInit_invalidBuiltInProviders(t *testing.T) {
if subStr := "Cannot use terraform.io/builtin/terraform: built-in"; !strings.Contains(errStr, subStr) {
t.Errorf("error output should mention the terraform provider\nwant substr: %s\ngot:\n%s", subStr, errStr)
}
if subStr := "Cannot use terraform.io/builtin/nonexist: this Terraform release"; !strings.Contains(errStr, subStr) {
if subStr := "Cannot use terraform.io/builtin/nonexist: this OpenTF release"; !strings.Contains(errStr, subStr) {
t.Errorf("error output should mention the 'nonexist' provider\nwant substr: %s\ngot:\n%s", subStr, errStr)
}
}

10
internal/providercache/installer.go
View File

@ -228,7 +228,7 @@ func (i *Installer) EnsureProviderVersions(ctx context.Context, locks *depsfile.
err = fmt.Errorf("built-in providers do not support explicit version constraints")
}
} else {
err = fmt.Errorf("this Terraform release has no built-in provider named %q", provider.Type)
err = fmt.Errorf("this OpenTF release has no built-in provider named %q", provider.Type)
}
if err != nil {
errs[provider] = err
@ -250,7 +250,7 @@ func (i *Installer) EnsureProviderVersions(ctx context.Context, locks *depsfile.
if lock := locks.Provider(provider); lock != nil {
if !acceptableVersions.Has(lock.Version()) {
err := fmt.Errorf(
"locked provider %s %s does not match configured version constraint %s; must use terraform init -upgrade to allow selection of new versions",
"locked provider %s %s does not match configured version constraint %s; must use opentf init -upgrade to allow selection of new versions",
provider, lock.Version(), getproviders.VersionConstraintsString(versionConstraints),
)
errs[provider] = err
@ -464,7 +464,7 @@ NeedProvider:
// did show up there.
new := i.targetDir.ProviderVersion(provider, version)
if new == nil {
err := fmt.Errorf("after linking %s from provider cache at %s it is still not detected in the target directory; this is a bug in Terraform", provider, i.globalCacheDir.baseDir)
err := fmt.Errorf("after linking %s from provider cache at %s it is still not detected in the target directory; this is a bug in OpenTF", provider, i.globalCacheDir.baseDir)
errs[provider] = err
if cb := evts.LinkFromCacheFailure; cb != nil {
cb(provider, version, err)
@ -585,7 +585,7 @@ NeedProvider:
}
new := installTo.ProviderVersion(provider, version)
if new == nil {
err := fmt.Errorf("after installing %s it is still not detected in %s; this is a bug in Terraform", provider, installTo.BasePath())
err := fmt.Errorf("after installing %s it is still not detected in %s; this is a bug in OpenTF", provider, installTo.BasePath())
errs[provider] = err
if cb := evts.FetchPackageFailure; cb != nil {
cb(provider, version, err)
@ -622,7 +622,7 @@ NeedProvider:
// cache directory.
new = linkTo.ProviderVersion(provider, version)
if new == nil {
err := fmt.Errorf("after installing %s it is still not detected in %s; this is a bug in Terraform", provider, linkTo.BasePath())
err := fmt.Errorf("after installing %s it is still not detected in %s; this is a bug in OpenTF", provider, linkTo.BasePath())
errs[provider] = err
if cb := evts.FetchPackageFailure; cb != nil {
cb(provider, version, err)

8
internal/providercache/installer_test.go
View File

@ -1669,7 +1669,7 @@ func TestEnsureProviderVersions(t *testing.T) {
terraformProvider: nil,
},
WantErr: `some providers could not be installed:
- terraform.io/builtin/terraform: this Terraform release has no built-in provider named "terraform"`,
- terraform.io/builtin/terraform: this OpenTF release has no built-in provider named "terraform"`,
WantEvents: func(inst *Installer, dir *Dir) map[addrs.Provider][]*testInstallerEventLogItem {
return map[addrs.Provider][]*testInstallerEventLogItem{
noProvider: {
@ -1684,7 +1684,7 @@ func TestEnsureProviderVersions(t *testing.T) {
{
Event: "BuiltInProviderFailure",
Provider: terraformProvider,
Args: `this Terraform release has no built-in provider named "terraform"`,
Args: `this OpenTF release has no built-in provider named "terraform"`,
},
},
}
@ -1775,7 +1775,7 @@ func TestEnsureProviderVersions(t *testing.T) {
}
},
WantErr: `some providers could not be installed:
- example.com/foo/beep: locked provider example.com/foo/beep 1.0.0 does not match configured version constraint >= 2.0.0; must use terraform init -upgrade to allow selection of new versions`,
- example.com/foo/beep: locked provider example.com/foo/beep 1.0.0 does not match configured version constraint >= 2.0.0; must use opentf init -upgrade to allow selection of new versions`,
WantEvents: func(inst *Installer, dir *Dir) map[addrs.Provider][]*testInstallerEventLogItem {
return map[addrs.Provider][]*testInstallerEventLogItem{
noProvider: {
@ -1798,7 +1798,7 @@ func TestEnsureProviderVersions(t *testing.T) {
{
Event: "QueryPackagesFailure",
Provider: beepProvider,
Args: `locked provider example.com/foo/beep 1.0.0 does not match configured version constraint >= 2.0.0; must use terraform init -upgrade to allow selection of new versions`,
Args: `locked provider example.com/foo/beep 1.0.0 does not match configured version constraint >= 2.0.0; must use opentf init -upgrade to allow selection of new versions`,
},
},
}