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

refactor: Simplify version parsing and add logging in PatchWheel

This commit is contained in:
Denis Bilenko 2025-03-03 16:17:13 +01:00 committed by Denis Bilenko (aider)
parent c814e86cf4
commit fd8f65a9da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/patchwheel/patchwheel.go
View File

@ -14,6 +14,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/databricks/cli/libs/log"
) )
// readMetadataAndRecord scans the zip file for files matching the patterns // readMetadataAndRecord scans the zip file for files matching the patterns
@ -55,9 +57,7 @@ func parseMetadata(content []byte) (version, distribution string, err error) {
if strings.HasPrefix(line, versionKey) { if strings.HasPrefix(line, versionKey) {
v := strings.TrimSpace(strings.TrimPrefix(line, versionKey)) v := strings.TrimSpace(strings.TrimPrefix(line, versionKey))
// If there's a '+' in the version, strip it off. // If there's a '+' in the version, strip it off.
if strings.Contains(v, "+") { v = strings.SplitN(v, "+", 2)[0]
v = strings.SplitN(v, "+", 2)[0]
}
version = v version = v
} else if strings.HasPrefix(line, nameKey) { } else if strings.HasPrefix(line, nameKey) {
distribution = strings.TrimSpace(strings.TrimPrefix(line, nameKey)) distribution = strings.TrimSpace(strings.TrimPrefix(line, nameKey))
@ -155,6 +155,7 @@ func PatchWheel(path, outputDir string) (string, error) {
} }
baseVersion, distribution, err := parseMetadata(metadataContent) baseVersion, distribution, err := parseMetadata(metadataContent)
log.Infof(ctx, "path=%s baseVersion=%s distribution=%s err=%s", path, baseVersion, distribution)
if err != nil { if err != nil {
return "", err return "", err
} }