Skip to content

plugins(wasm): Change default cache location #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 1 commit into from
Jun 26, 2022
Merged

plugins(wasm): Change default cache location #1709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions internal/ext/wasm/wasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,19 @@ import (
)

func cacheDir() (string, error) {
// Use the checksum to see if it already existsin the modcache
cache := os.Getenv("SQLCCACHE")
if cache != "" {
return cache, nil
}
home, err := os.UserHomeDir()
if err != nil {
return "", err
cacheHome := os.Getenv("XDG_CACHE_HOME")
if cacheHome == "" {
home, err := os.UserHomeDir()
if err != nil {
return "", err
}
cacheHome = filepath.Join(home, ".cache")
}
return filepath.Join(home, "sqlc", "mod"), nil
return filepath.Join(cacheHome, "sqlc"), nil
}

type Runner struct {
Expand All @@ -58,17 +61,18 @@ func (r *Runner) loadModule(ctx context.Context, engine *wasmtime.Engine) (*wasm
if err != nil {
return nil, err
}

cache, err := cacheDir()
cacheRoot, err := cacheDir()
if err != nil {
return nil, err
}
cache := filepath.Join(cacheRoot, "plugins")
if err := os.MkdirAll(cache, 0755); err != nil && !os.IsExist(err) {
return nil, fmt.Errorf("failed to create cache directory: %w", err)
}

pluginDir := filepath.Join(cache, expected)
// TODO: Include os / arch in module name
modPath := filepath.Join(pluginDir, fmt.Sprintf("plugin_%s_%s.module", runtime.GOOS, runtime.GOARCH))
_, staterr := os.Stat(modPath)

if staterr == nil {
data, err := os.ReadFile(modPath)
if err != nil {
Expand All @@ -90,17 +94,15 @@ func (r *Runner) loadModule(ctx context.Context, engine *wasmtime.Engine) (*wasm
}

if staterr != nil {
// TODO: What permissions to use?
err := os.MkdirAll(pluginDir, 0750)
err := os.Mkdir(pluginDir, 0755)
if err != nil && !os.IsExist(err) {
return nil, fmt.Errorf("mkdirall: %w", err)
}
out, err := module.Serialize()
if err != nil {
return nil, fmt.Errorf("serialize: %w", err)
}
// TODO: What permissions to use?
if err := os.WriteFile(modPath, out, 0666); err != nil {
if err := os.WriteFile(modPath, out, 0444); err != nil {
return nil, fmt.Errorf("cache wasm: %w", err)
}
}
Expand Down Expand Up @@ -160,13 +162,11 @@ func (r *Runner) loadWASM(ctx context.Context, cache string, expected string) ([
}

if staterr != nil {
// TODO: What permissions to use?
err := os.MkdirAll(pluginDir, 0750)
err := os.Mkdir(pluginDir, 0755)
if err != nil && !os.IsExist(err) {
return nil, fmt.Errorf("mkdirall: %w", err)
}
// TODO: What permissions to use?
if err := os.WriteFile(pluginPath, wmod, 0666); err != nil {
if err := os.WriteFile(pluginPath, wmod, 0444); err != nil {
return nil, fmt.Errorf("cache wasm: %w", err)
}
}
Expand Down