From a2b368827f98964c54daae10b1b70dd84df7cf69 Mon Sep 17 00:00:00 2001 From: evanboyle Date: Thu, 19 Mar 2020 11:45:10 -0700 Subject: [PATCH] fix internal logging usage --- pkg/cmd/pulumi.go | 2 +- pkg/engine/plugins_test.go | 3 --- sdk/go/common/resource/plugin/host.go | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/cmd/pulumi.go b/pkg/cmd/pulumi.go index e5dfdd88a..bf22fd2c9 100644 --- a/pkg/cmd/pulumi.go +++ b/pkg/cmd/pulumi.go @@ -116,7 +116,7 @@ func NewPulumiCmd() *cobra.Command { } if cmdutil.IsTruthy(os.Getenv("PULUMI_SKIP_UPDATE_CHECK")) { - logging.Infof("skipping update check") + logging.V(5).Infof("skipping update check") close(updateCheckResult) } else { // Run the version check in parallel so that it doesn't block executing the command. diff --git a/pkg/engine/plugins_test.go b/pkg/engine/plugins_test.go index 9c34deadd..74f6328e7 100644 --- a/pkg/engine/plugins_test.go +++ b/pkg/engine/plugins_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/pulumi/pulumi/sdk/go/common/tokens" - "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) @@ -31,7 +30,6 @@ func mustMakeVersion(v string) *semver.Version { } func TestDefaultProvidersSingle(t *testing.T) { - logging.InitLogging(true, 7, false) languagePlugins := newPluginSet() languagePlugins.Add(workspace.PluginInfo{ Name: "aws", @@ -60,7 +58,6 @@ func TestDefaultProvidersSingle(t *testing.T) { } func TestDefaultProvidersOverrideNoVersion(t *testing.T) { - logging.InitLogging(true, 7, false) languagePlugins := newPluginSet() languagePlugins.Add(workspace.PluginInfo{ Name: "aws", diff --git a/sdk/go/common/resource/plugin/host.go b/sdk/go/common/resource/plugin/host.go index ac600e328..8dc7b4c1c 100644 --- a/sdk/go/common/resource/plugin/host.go +++ b/sdk/go/common/resource/plugin/host.go @@ -438,17 +438,17 @@ func (host *defaultHost) Close() error { // Close all plugins. for _, plug := range host.analyzerPlugins { if err := plug.Plugin.Close(); err != nil { - logging.Infof("Error closing '%s' analyzer plugin during shutdown; ignoring: %v", plug.Info.Name, err) + logging.V(5).Infof("Error closing '%s' analyzer plugin during shutdown; ignoring: %v", plug.Info.Name, err) } } for _, plug := range host.resourcePlugins { if err := plug.Plugin.Close(); err != nil { - logging.Infof("Error closing '%s' resource plugin during shutdown; ignoring: %v", plug.Info.Name, err) + logging.V(5).Infof("Error closing '%s' resource plugin during shutdown; ignoring: %v", plug.Info.Name, err) } } for _, plug := range host.languagePlugins { if err := plug.Plugin.Close(); err != nil { - logging.Infof("Error closing '%s' language plugin during shutdown; ignoring: %v", plug.Info.Name, err) + logging.V(5).Infof("Error closing '%s' language plugin during shutdown; ignoring: %v", plug.Info.Name, err) } }