steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Shreyas Goenka 2024-12-27 13:42:06 +05:30
parent 44d43fccb7
commit 2eb3344edb
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/bundle/helpers_test.go
View File

@ -19,6 +19,7 @@ import (
"github.com/databricks/cli/libs/filer" "github.com/databricks/cli/libs/filer"
"github.com/databricks/cli/libs/flags" "github.com/databricks/cli/libs/flags"
"github.com/databricks/cli/libs/folders" "github.com/databricks/cli/libs/folders"
"github.com/databricks/cli/libs/telemetry"
"github.com/databricks/cli/libs/template" "github.com/databricks/cli/libs/template"
"github.com/databricks/databricks-sdk-go" "github.com/databricks/databricks-sdk-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -28,6 +29,7 @@ const defaultSparkVersion = "13.3.x-snapshot-scala2.12"
func initTestTemplate(t testutil.TestingT, ctx context.Context, templateName string, config map[string]any) string { func initTestTemplate(t testutil.TestingT, ctx context.Context, templateName string, config map[string]any) string {
bundleRoot := t.TempDir() bundleRoot := t.TempDir()
ctx = telemetry.ContextWithLogger(ctx)
return initTestTemplateWithBundleRoot(t, ctx, templateName, config, bundleRoot) return initTestTemplateWithBundleRoot(t, ctx, templateName, config, bundleRoot)
} }

2
integration/bundle/init_test.go
View File

@ -240,7 +240,7 @@ func TestBundleInitTelemetryForCustomTemplates(t *testing.T) {
testcli.RequireSuccessfulRun(t, ctx, "bundle", "init", tmpDir1, "--output-dir", tmpDir2, "--config-file", filepath.Join(tmpDir3, "config.json")) testcli.RequireSuccessfulRun(t, ctx, "bundle", "init", tmpDir1, "--output-dir", tmpDir2, "--config-file", filepath.Join(tmpDir3, "config.json"))
// Assert the telemetry payload is correctly logged. For custom templates we should // Assert the telemetry payload is correctly logged. For custom templates we should
// // never set template_enum_args.
logs, err := telemetry.GetLogs(ctx) logs, err := telemetry.GetLogs(ctx)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 1, len(logs)) require.Equal(t, 1, len(logs))

4
libs/telemetry/logger.go
View File

@ -41,8 +41,8 @@ type logger struct {
protoLogs []string protoLogs []string
} }
// Only to be used in tests to introspect the telemetry logs that are queued // This function is meant to be only to be used in tests to introspect the telemetry logs
// to be flushed. // that have been logged so far.
func GetLogs(ctx context.Context) ([]FrontendLog, error) { func GetLogs(ctx context.Context) ([]FrontendLog, error) {
l := fromContext(ctx) l := fromContext(ctx)
res := []FrontendLog{} res := []FrontendLog{}