update log types

pulumi · Aug 9, 2024 · c659722 · c659722
1 parent 47c88a4
commit c659722
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/provider/pkg/await/watchers.go b/provider/pkg/await/watchers.go
@@ -245,18 +245,18 @@ func NewEventAggregator(
 			m := checkerlog.WarningMessage(msg)
 			switch e.Type {
 			case corev1.EventTypeWarning:
-				logger.LogMessage(m)
+				logger.LogStatus(diag.Warning, m.S)
 			default:
-				m.Severity = diag.Debug
-				logger.LogMessage(m)
+				logger.LogStatus(diag.Debug, m.S)
 			}
 			return nil
 		},
 	)
 }
 
 type logMessager interface {
-	LogMessage(checkerlog.Message)
+	Log(diag.Severity, string)
+	LogStatus(diag.Severity, string)
 }
 
 func relatedEvents(owner *unstructured.Unstructured) func(*unstructured.Unstructured) bool {

diff --git a/provider/pkg/await/watchers_test.go b/provider/pkg/await/watchers_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/watch"
@@ -154,6 +154,9 @@ func TestRelatedEvent(t *testing.T) {
 
 type log struct{ io.Writer }
 
-func (l log) LogMessage(m checkerlog.Message) {
-	fmt.Fprintf(l, "%s %s", m.Severity, m.String())
+func (l log) Log(sev diag.Severity, msg string) {
+	fmt.Fprintf(l, "%s %s", sev, msg)
+}
+func (l log) LogStatus(sev diag.Severity, msg string) {
+	l.Log(sev, msg)
 }