diff --git a/bundle/internal/schema/main.go b/bundle/internal/schema/main.go index 17730290f..77927a966 100644 --- a/bundle/internal/schema/main.go +++ b/bundle/internal/schema/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" "os" - "path" + "path/filepath" "reflect" "github.com/databricks/cli/bundle/config" @@ -129,9 +129,9 @@ func main() { } func generateSchema(workdir, outputFile string) { - annotationsPath := path.Join(workdir, "annotations.yml") - annotationsOpenApiPath := path.Join(workdir, "annotations_openapi.yml") - annotationsOpenApiOverridesPath := path.Join(workdir, "annotations_openapi_overrides.yml") + annotationsPath := filepath.Join(workdir, "annotations.yml") + annotationsOpenApiPath := filepath.Join(workdir, "annotations_openapi.yml") + annotationsOpenApiOverridesPath := filepath.Join(workdir, "annotations_openapi_overrides.yml") // Input file, the databricks openapi spec. inputFile := os.Getenv("DATABRICKS_OPENAPI_SPEC") diff --git a/bundle/internal/schema/main_test.go b/bundle/internal/schema/main_test.go index fd467f16d..7d41dcec7 100644 --- a/bundle/internal/schema/main_test.go +++ b/bundle/internal/schema/main_test.go @@ -5,7 +5,6 @@ import ( "os" "path" "reflect" - "runtime" "testing" "github.com/databricks/cli/bundle/config" @@ -41,9 +40,6 @@ func copyFile(src, dst string) error { // 2. replace all "PLACEHOLDER" values with the actual descriptions if possible // 3. run `make schema` again to regenerate the schema with acutal descriptions func TestRequiredAnnotationsForNewFields(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip() - } workdir := t.TempDir() annotationsPath := path.Join(workdir, "annotations.yml") annotationsOpenApiPath := path.Join(workdir, "annotations_openapi.yml") @@ -68,9 +64,6 @@ func TestRequiredAnnotationsForNewFields(t *testing.T) { // Checks whether types in annotation files are still present in Config type func TestNoDetachedAnnotations(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip() - } files := []string{ "annotations.yml", "annotations_openapi.yml",