Skip to content

Commit aa9783d

Browse files
authored
Improve Provider Logging (#2801)
* Improve test logging * Fix logging in TF provider * fix * fix lint
1 parent d14bbe8 commit aa9783d

File tree

2 files changed

+6
-38
lines changed

2 files changed

+6
-38
lines changed

internal/acceptance/init_test.go

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/databricks/databricks-sdk-go/logger"
2121
"github.com/databricks/terraform-provider-databricks/commands"
2222
"github.com/databricks/terraform-provider-databricks/common"
23+
dbproviderlogger "github.com/databricks/terraform-provider-databricks/logger"
2324
"github.com/databricks/terraform-provider-databricks/provider"
2425
"github.com/databricks/terraform-provider-databricks/qa"
2526
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,12 +31,8 @@ import (
3031
func init() {
3132
rand.Seed(time.Now().UnixMicro())
3233
databricks.WithProduct("tf-integration-tests", common.Version())
33-
if isInDebug() {
34-
// Terraform SDK v2 intercepts default logger
35-
// that Go SDK SimpleLogger is using, so we have
36-
// to re-implement one again.
37-
logger.DefaultLogger = stdErrLogger{}
38-
}
34+
os.Setenv("TF_LOG", "DEBUG")
35+
dbproviderlogger.SetLogger()
3936
}
4037

4138
func workspaceLevel(t *testing.T, steps ...step) {
@@ -180,8 +177,8 @@ func run(t *testing.T, steps []step) {
180177
ts := []resource.TestStep{}
181178
ctx := context.Background()
182179

183-
stepConfig := ""
184180
for i, s := range steps {
181+
stepConfig := ""
185182
if s.Template != "" {
186183
stepConfig = environmentTemplate(t, s.Template, vars)
187184
}
@@ -381,33 +378,3 @@ func loadDebugEnvIfRunsFromIDE(t *testing.T, key string) {
381378
os.Setenv(k, v)
382379
}
383380
}
384-
385-
type stdErrLogger struct {
386-
traceEnabled bool
387-
}
388-
389-
func (l stdErrLogger) Enabled(_ context.Context, level logger.Level) bool {
390-
return true
391-
}
392-
393-
func (l stdErrLogger) Tracef(_ context.Context, format string, v ...interface{}) {
394-
if l.traceEnabled {
395-
fmt.Fprintf(os.Stderr, "[TRACE] "+format+"\n", v...)
396-
}
397-
}
398-
399-
func (l stdErrLogger) Debugf(_ context.Context, format string, v ...interface{}) {
400-
fmt.Fprintf(os.Stderr, "\n[DEBUG] "+format+"\n", v...)
401-
}
402-
403-
func (l stdErrLogger) Infof(_ context.Context, format string, v ...interface{}) {
404-
fmt.Fprintf(os.Stderr, "\n[INFO] "+format+"\n", v...)
405-
}
406-
407-
func (l stdErrLogger) Warnf(_ context.Context, format string, v ...interface{}) {
408-
fmt.Fprintf(os.Stderr, "\n[WARN] "+format+"\n", v...)
409-
}
410-
411-
func (l stdErrLogger) Errorf(_ context.Context, format string, v ...interface{}) {
412-
fmt.Fprintf(os.Stderr, "[ERROR] "+format+"\n", v...)
413-
}

logger/logger.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ func (tfLogger *TfLogger) Errorf(ctx context.Context, format string, v ...any) {
6161
}
6262

6363
func SetLogger() {
64-
logger.DefaultLogger = &TfLogger{}
64+
var tfLogger *TfLogger
65+
logger.DefaultLogger = tfLogger
6566
}

0 commit comments

Comments
 (0)