Fix go-libs (#21)

Author: nfx

go-libs/fileset/fileset.go

@@ -1,15 +1,17 @@
 package fileset
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"io/fs"
-	"log"
 	"os"
 	"path"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/databricks/databricks-sdk-go/logger"
 )
 
 type FileSet []File
@@ -100,7 +102,7 @@ func (fi File) MustMatch(needle string) bool {
 func (fi File) FindAll(needle *regexp.Regexp) (all []string, err error) {
 	raw, err := fi.Raw()
 	if err != nil {
-		log.Printf("[ERROR] read %s: %s", fi.Absolute, err)
+		logger.Errorf(context.Background(), "read %s: %s", fi.Absolute, err)
 		return nil, err
 	}
 	for _, v := range needle.FindAllStringSubmatch(string(raw), -1) {
@@ -112,7 +114,7 @@ func (fi File) FindAll(needle *regexp.Regexp) (all []string, err error) {
 func (fi File) Match(needle *regexp.Regexp) bool {
 	raw, err := fi.Raw()
 	if err != nil {
-		log.Printf("[ERROR] read %s: %s", fi.Absolute, err)
+		logger.Errorf(context.Background(), "read %s: %s", fi.Absolute, err)
 		return false
 	}
 	return needle.Match(raw)
@@ -146,14 +148,6 @@ func RecursiveChildren(dir string) (found FileSet, err error) {
 		if current.Name() == "vendor" {
 			continue
 		}
-		if current.Name() == "scripts" {
-			continue
-		}
-		// ext directory contains external projects at the current project depends
-		// on. We should ignore it for listing files in the project
-		if current.Name() == "ext" {
-			continue
-		}
 		children, err := ReadDir(current.Absolute)
 		if err != nil {
 			return nil, err

go-libs/github/github.go

@@ -2,12 +2,8 @@ package github
 
 import (
 	"context"
-	"encoding/json"
-	"errors"
 	"fmt"
-	"io"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/databricks/databricks-sdk-go/httpclient"
@@ -16,10 +12,6 @@ import (
 const gitHubAPI = "https://api.github.com"
 const gitHubUserContent = "https://raw.githubusercontent.com"
 
-// Placeholders to use as unique keys in context.Context.
-var apiOverride int
-var userContentOverride int
-
 type GitHubClient struct {
 	api *httpclient.ApiClient
 	cfg *GitHubConfig
@@ -91,48 +83,3 @@ func (c *GitHubClient) ListRuns(ctx context.Context, org, repo, workflow string)
 	err := c.api.Do(ctx, "GET", path, httpclient.WithResponseUnmarshal(&response))
 	return response.WorkflowRuns, err
 }
-
-func WithApiOverride(ctx context.Context, override string) context.Context {
-	return context.WithValue(ctx, &apiOverride, override)
-}
-
-func WithUserContentOverride(ctx context.Context, override string) context.Context {
-	return context.WithValue(ctx, &userContentOverride, override)
-}
-
-var ErrNotFound = errors.New("not found")
-
-func getBytes(ctx context.Context, method, url string, body io.Reader) ([]byte, error) {
-	ao, ok := ctx.Value(&apiOverride).(string)
-	if ok {
-		url = strings.Replace(url, gitHubAPI, ao, 1)
-	}
-	uco, ok := ctx.Value(&userContentOverride).(string)
-	if ok {
-		url = strings.Replace(url, gitHubUserContent, uco, 1)
-	}
-	req, err := http.NewRequestWithContext(ctx, "GET", url, body)
-	if err != nil {
-		return nil, err
-	}
-	res, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode == 404 {
-		return nil, ErrNotFound
-	}
-	if res.StatusCode >= 400 {
-		return nil, fmt.Errorf("github request failed: %s", res.Status)
-	}
-	defer res.Body.Close()
-	return io.ReadAll(res.Body)
-}
-
-func httpGetAndUnmarshal(ctx context.Context, url string, response any) error {
-	raw, err := getBytes(ctx, "GET", url, nil)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(raw, response)
-}

go-libs/github/releases.go

@@ -13,36 +13,30 @@ const cacheTTL = 1 * time.Hour
 
 // NewReleaseCache creates a release cache for a repository in the GitHub org.
 // Caller has to provide different cache directories for different repositories.
-func NewReleaseCache(org, repo, cacheDir string) *ReleaseCache {
+func NewReleaseCache(client *GitHubClient, org, repo, cacheDir string) *ReleaseCache {
 	pattern := fmt.Sprintf("%s-%s-releases", org, repo)
 	return &ReleaseCache{
-		cache: localcache.NewLocalCache[Versions](cacheDir, pattern, cacheTTL),
-		Org:   org,
-		Repo:  repo,
+		cache:  localcache.NewLocalCache[Versions](cacheDir, pattern, cacheTTL),
+		client: client,
+		Org:    org,
+		Repo:   repo,
 	}
 }
 
 type ReleaseCache struct {
-	cache localcache.LocalCache[Versions]
-	Org   string
-	Repo  string
+	cache  localcache.LocalCache[Versions]
+	client *GitHubClient
+	Org    string
+	Repo   string
 }
 
 func (r *ReleaseCache) Load(ctx context.Context) (Versions, error) {
 	return r.cache.Load(ctx, func() (Versions, error) {
-		return getVersions(ctx, r.Org, r.Repo)
+		logger.Debugf(ctx, "Fetching latest releases for %s/%s from GitHub API", r.Org, r.Repo)
+		return r.client.Versions(ctx, r.Org, r.Repo)
 	})
 }
 
-// getVersions is considered to be a private API, as we want the usage go through a cache
-func getVersions(ctx context.Context, org, repo string) (Versions, error) {
-	var releases Versions
-	logger.Debugf(ctx, "Fetching latest releases for %s/%s from GitHub API", org, repo)
-	url := fmt.Sprintf("%s/repos/%s/%s/releases", gitHubAPI, org, repo)
-	err := httpGetAndUnmarshal(ctx, url, &releases)
-	return releases, err
-}
-
 type ghAsset struct {
 	Name               string `json:"name"`
 	ContentType        string `json:"content_type"`

go-libs/github/releases_test.go

@@ -11,34 +11,28 @@ import (
 
 const repositoryCacheTTL = 24 * time.Hour
 
-func NewRepositoryCache(org, cacheDir string) *repositoryCache {
+func NewRepositoryCache(client *GitHubClient, org, cacheDir string) *repositoryCache {
 	filename := fmt.Sprintf("%s-repositories", org)
 	return &repositoryCache{
-		cache: localcache.NewLocalCache[Repositories](cacheDir, filename, repositoryCacheTTL),
-		Org:   org,
+		cache:  localcache.NewLocalCache[Repositories](cacheDir, filename, repositoryCacheTTL),
+		client: client,
+		Org:    org,
 	}
 }
 
 type repositoryCache struct {
-	cache localcache.LocalCache[Repositories]
-	Org   string
+	cache  localcache.LocalCache[Repositories]
+	client *GitHubClient
+	Org    string
 }
 
 func (r *repositoryCache) Load(ctx context.Context) (Repositories, error) {
 	return r.cache.Load(ctx, func() (Repositories, error) {
-		return getRepositories(ctx, r.Org)
+		logger.Debugf(ctx, "Loading repositories for %s from GitHub API", r.Org)
+		return r.client.ListRepositories(ctx, r.Org)
 	})
 }
 
-// getRepositories is considered to be privata API, as we want the usage to go through a cache
-func getRepositories(ctx context.Context, org string) (Repositories, error) {
-	var repos Repositories
-	logger.Debugf(ctx, "Loading repositories for %s from GitHub API", org)
-	url := fmt.Sprintf("%s/users/%s/repos", gitHubAPI, org)
-	err := httpGetAndUnmarshal(ctx, url, &repos)
-	return repos, err
-}
-
 type Repositories []Repo
 
 type Repo struct {

go-libs/github/repositories.go

@@ -4,7 +4,7 @@ go 1.21.0
 
 require (
 	github.com/briandowns/spinner v1.23.0
-	github.com/databricks/databricks-sdk-go v0.26.0
+	github.com/databricks/databricks-sdk-go v0.26.1
 	github.com/fatih/color v1.16.0
 	github.com/nwidger/jsoncolor v0.3.2
 	github.com/spf13/cobra v1.8.0
@@ -18,7 +18,7 @@ require (
 	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
@@ -32,26 +32,25 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.16.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/api v0.152.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect