jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt TestInit hashes to work on Windows (#3208)

Browse Source 
Signed-off-by: Diogenes Fernandes <diofeher@gmail.com>
This commit is contained in:
Diógenes Fernandes
2025-09-09 11:59:40 -03:00
committed by GitHub
parent 22910f2b01
commit e8eeb1334c
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/command/init_test.go
View File

@@ -1739,21 +1739,21 @@ func TestInit_providerSource(t *testing.T) {
{
Provider: addrs.NewDefaultProvider("test"),
Version: getproviders.MustParseVersion("1.2.3"),
PackageDir: expectedPackageInstallPath("test", "1.2.3", false),
PackageDir: expectedPackageInstallPath("test", "1.2.3"),
},
},
addrs.NewDefaultProvider("test-beta"): {
{
Provider: addrs.NewDefaultProvider("test-beta"),
Version: getproviders.MustParseVersion("1.2.4"),
PackageDir: expectedPackageInstallPath("test-beta", "1.2.4", false),
PackageDir: expectedPackageInstallPath("test-beta", "1.2.4"),
},
},
addrs.NewDefaultProvider("source"): {
{
Provider: addrs.NewDefaultProvider("source"),
Version: getproviders.MustParseVersion("1.2.3"),
PackageDir: expectedPackageInstallPath("source", "1.2.3", false),
PackageDir: expectedPackageInstallPath("source", "1.2.3"),
},
},
}
@@ -1980,7 +1980,7 @@ func TestInit_getUpgradePlugins(t *testing.T) {
{
Provider: addrs.NewDefaultProvider("between"),
Version: getproviders.MustParseVersion("2.3.4"),
PackageDir: expectedPackageInstallPath("between", "2.3.4", false),
PackageDir: expectedPackageInstallPath("between", "2.3.4"),
},
},
// The existing version of "exact" did not match the version constraints,
@@ -1989,13 +1989,13 @@ func TestInit_getUpgradePlugins(t *testing.T) {
{
Provider: addrs.NewDefaultProvider("exact"),
Version: getproviders.MustParseVersion("1.2.3"),
PackageDir: expectedPackageInstallPath("exact", "1.2.3", false),
PackageDir: expectedPackageInstallPath("exact", "1.2.3"),
},
// Previous version is still there, but not selected
{
Provider: addrs.NewDefaultProvider("exact"),
Version: getproviders.MustParseVersion("0.0.1"),
PackageDir: expectedPackageInstallPath("exact", "0.0.1", false),
PackageDir: expectedPackageInstallPath("exact", "0.0.1"),
},
},
// The existing version of "greater-than" _did_ match the constraints,
@@ -2005,13 +2005,13 @@ func TestInit_getUpgradePlugins(t *testing.T) {
{
Provider: addrs.NewDefaultProvider("greater-than"),
Version: getproviders.MustParseVersion("2.3.4"),
PackageDir: expectedPackageInstallPath("greater-than", "2.3.4", false),
PackageDir: expectedPackageInstallPath("greater-than", "2.3.4"),
},
// Previous version is still there, but not selected
{
Provider: addrs.NewDefaultProvider("greater-than"),
Version: getproviders.MustParseVersion("2.3.3"),
PackageDir: expectedPackageInstallPath("greater-than", "2.3.3", false),
PackageDir: expectedPackageInstallPath("greater-than", "2.3.3"),
},
},
}
@@ -3306,16 +3306,9 @@ func installFakeProviderPackagesElsewhere(t *testing.T, cacheDir *providercache.
//
// The result always uses forward slashes, even on Windows, for consistency
// with how the getproviders and providercache packages build paths.
func expectedPackageInstallPath(name, version string, exe bool) string {
func expectedPackageInstallPath(name, version string) string {
platform := getproviders.CurrentPlatform
baseDir := ".terraform/providers"
if exe {
p := fmt.Sprintf("registry.opentofu.org/hashicorp/%s/%s/%s/terraform-provider-%s_%s", name, version, platform, name, version)
if platform.OS == "windows" {
p += ".exe"
}
return filepath.ToSlash(filepath.Join(baseDir, p))
}
return filepath.ToSlash(filepath.Join(
baseDir, fmt.Sprintf("registry.opentofu.org/hashicorp/%s/%s/%s", name, version, platform),
))