Merge pull request #15323 from hashicorp/jbardin/constraint-suggestion
remove "~> 0.0" constraint suggestions
This commit is contained in:
commit
2e57d284cb
|
@ -303,7 +303,7 @@ func (c *InitCommand) getProviders(path string, state *terraform.State, upgrade
|
|||
continue
|
||||
}
|
||||
|
||||
if req.Versions.Unconstrained() {
|
||||
if req.Versions.Unconstrained() && meta.Version != discovery.VersionZero {
|
||||
// meta.Version.MustParse is safe here because our "chosen" metas
|
||||
// were already filtered for validity of versions.
|
||||
constraintSuggestions[name] = meta.Version.MustParse().MinorUpgradeConstraintStr()
|
||||
|
|
|
@ -131,7 +131,7 @@ func ResolvePluginPaths(paths []string) PluginMetaSet {
|
|||
|
||||
parts := strings.SplitN(baseName, "_v", 2)
|
||||
name := parts[0]
|
||||
version := "0.0.0"
|
||||
version := VersionZero
|
||||
if len(parts) == 2 {
|
||||
version = parts[1]
|
||||
}
|
||||
|
|
|
@ -186,7 +186,7 @@ func (s PluginMetaSet) OverridePaths(paths map[string]string) PluginMetaSet {
|
|||
for name, path := range paths {
|
||||
ret.Add(PluginMeta{
|
||||
Name: name,
|
||||
Version: "0.0.0",
|
||||
Version: VersionZero,
|
||||
Path: path,
|
||||
})
|
||||
}
|
||||
|
|
|
@ -402,14 +402,14 @@ func TestPluginMetaSetOverridePaths(t *testing.T) {
|
|||
}
|
||||
if !ns.Has(PluginMeta{
|
||||
Name: "foo",
|
||||
Version: "0.0.0",
|
||||
Version: VersionZero,
|
||||
Path: "override-foo",
|
||||
}) {
|
||||
t.Errorf("new set is missing 'foo' override")
|
||||
}
|
||||
if !ns.Has(PluginMeta{
|
||||
Name: "fun",
|
||||
Version: "0.0.0",
|
||||
Version: VersionZero,
|
||||
Path: "override-fun",
|
||||
}) {
|
||||
t.Errorf("new set is missing 'fun' override")
|
||||
|
|
|
@ -7,6 +7,8 @@ import (
|
|||
version "github.com/hashicorp/go-version"
|
||||
)
|
||||
|
||||
const VersionZero = "0.0.0"
|
||||
|
||||
// A VersionStr is a string containing a possibly-invalid representation
|
||||
// of a semver version number. Call Parse on it to obtain a real Version
|
||||
// object, or discover that it is invalid.
|
||||
|
|
Loading…
Reference in New Issue