beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove extra logging

Browse Source
This commit is contained in:
sophia 2022-04-01 12:19:02 -05:00 committed by Paul Hinze
parent 8adbab2f22
commit c464569794
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
3 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
internal/core/box_metadata.go
View File

@ -86,6 +86,33 @@ func LoadBoxMetadata(data []byte) (*BoxMetadata, error) {
return &result, err
}
func (b *BoxMetadata) matches(version string, name string, p *core.BoxProvider) (matches bool, err error) {
ver, err := b.version(version, &core.BoxProvider{Name: name})
if err != nil {
return false, err
}
provider, err := ver.Provider(name)
if err != nil {
return false, err
}
var boxVersionProvider *BoxVersionProvider
mapstructure.Decode(p, &boxVersionProvider)
return provider.Matches(boxVersionProvider), nil
}
func (b *BoxMetadata) matchesAny(version string, name string, p ...*core.BoxProvider) (matches bool, err error) {
for _, provider := range p {
m, err := b.matches(version, name, provider)
if err != nil {
return false, err
}
if m {
return true, nil
}
}
return false, nil
}
func (b *BoxMetadata) version(ver string, providerOpts *core.BoxProvider) (v *BoxVersion, err error) {
matchesProvider := false
inputVersion, err := version.NewConstraint(ver)
@ -214,31 +241,4 @@ func (b *BoxMetadata) ListProviders(version string) (providers []string, err err
return ver.ListProviders()
}
func (b *BoxMetadata) Matches(version string, name string, p *core.BoxProvider) (matches bool, err error) {
ver, err := b.version(version, &core.BoxProvider{Name: name})
if err != nil {
return false, err
}
provider, err := ver.Provider(name)
if err != nil {
return false, err
}
var boxVersionProvider *BoxVersionProvider
mapstructure.Decode(p, &boxVersionProvider)
return provider.Matches(boxVersionProvider), nil
}
func (b *BoxMetadata) MatchesAny(version string, name string, p ...*core.BoxProvider) (matches bool, err error) {
for _, provider := range p {
m, err := b.Matches(version, name, provider)
if err != nil {
return false, err
}
if m {
return true, nil
}
}
return false, nil
}
var _ core.BoxMetadata = (*BoxMetadata)(nil)

20
internal/core/box_metadata_test.go
View File

@ -167,27 +167,27 @@ func TestProviderMatches(t *testing.T) {
t.Error(err)
}
matches, err := metadata.Matches(version, providerName, &core.BoxProvider{Name: "virtualbox"})
matches, err := metadata.matches(version, providerName, &core.BoxProvider{Name: "virtualbox"})
require.True(t, matches)
require.NoError(t, err)
matches, err = metadata.Matches(version, providerName, &core.BoxProvider{Url: "http://doesnotexist"})
matches, err = metadata.matches(version, providerName, &core.BoxProvider{Url: "http://doesnotexist"})
require.True(t, matches)
require.NoError(t, err)
matches, err = metadata.Matches(version, providerName, &core.BoxProvider{})
matches, err = metadata.matches(version, providerName, &core.BoxProvider{})
require.True(t, matches)
require.NoError(t, err)
matches, err = metadata.Matches(version, providerName, &core.BoxProvider{Name: "virtualbox", Url: "http://doesnotexist"})
matches, err = metadata.matches(version, providerName, &core.BoxProvider{Name: "virtualbox", Url: "http://doesnotexist"})
require.True(t, matches)
require.NoError(t, err)
matches, err = metadata.Matches(version, providerName, &core.BoxProvider{Name: "nope", Url: "http://doesnotexist"})
matches, err = metadata.matches(version, providerName, &core.BoxProvider{Name: "nope", Url: "http://doesnotexist"})
require.False(t, matches)
require.NoError(t, err)
matches, err = metadata.Matches(version, providerName, &core.BoxProvider{Name: "vmware"})
matches, err = metadata.matches(version, providerName, &core.BoxProvider{Name: "vmware"})
require.False(t, matches)
require.NoError(t, err)
}
@ -201,21 +201,21 @@ func TestProviderMatchesAny(t *testing.T) {
t.Error(err)
}
m, err := metadata.MatchesAny(version, providerName, &core.BoxProvider{Name: "virtualbox"})
m, err := metadata.matchesAny(version, providerName, &core.BoxProvider{Name: "virtualbox"})
require.True(t, m)
require.NoError(t, err)
m, err = metadata.MatchesAny(version, providerName,
m, err = metadata.matchesAny(version, providerName,
&core.BoxProvider{Name: "virtualbox"}, &core.BoxProvider{Name: "nope"})
require.True(t, m)
require.NoError(t, err)
m, err = metadata.MatchesAny(version, providerName,
m, err = metadata.matchesAny(version, providerName,
&core.BoxProvider{Url: "nope"}, &core.BoxProvider{Name: "nope"})
require.False(t, m)
require.NoError(t, err)
m, err = metadata.MatchesAny(version, providerName)
m, err = metadata.matchesAny(version, providerName)
require.False(t, m)
require.NoError(t, err)
}

4
lib/vagrant/box_metadata/remote.rb
View File

@ -32,7 +32,6 @@ module Vagrant
providers = Array(opts[:provider]) || []
v = @client.version(version, providers)
@logger.debug("found version for #{version}, #{providers}: #{v}")
Version.new(v, ver: v[:version], client: @client)
end
@ -51,7 +50,6 @@ module Vagrant
return if raw.nil?
@logger = Log4r::Logger.new("vagrant::box::version")
@logger.debug("creating version with ver #{ver} and client #{client}")
@version = ver
if client.nil?
raise ArgumentError,
@ -61,13 +59,11 @@ module Vagrant
end
def provider(name)
@logger.debug("searching for provider with ver #{@version}")
p = @client.provider(@version, name)
Provider.new(p, client: @client)
end
def providers
@logger.debug("searching for providers with ver #{@version}")
@client.list_providers(@version)
end