kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

make store a struct and add tests

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-03-25 15:17:35 -07:00 committed by Solomon Hykes
parent 524f77df65
commit 9fec69f3a0
8 changed files with 85 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/dagger/cmd/down.go
View File

@ -22,11 +22,11 @@ var downCmd = &cobra.Command{
},
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
// nolint:staticcheck
ctx := lg.WithContext(cmd.Context())
store := dagger.DefaultStore()
routeName := getRouteName(lg, cmd)
route, err := dagger.LookupRoute(ctx, routeName, nil)
route, err := store.LookupRoute(ctx, routeName, nil)
if err != nil {
lg.Fatal().Err(err).Str("route-name", routeName).Msg("failed to lookup route")
}

3
cmd/dagger/cmd/list.go
View File

@ -23,8 +23,9 @@ var listCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
store := dagger.DefaultStore()
routes, err := dagger.ListRoutes(ctx)
routes, err := store.ListRoutes(ctx)
if err != nil {
lg.Fatal().Err(err).Msg("cannot list routes")
}

5
cmd/dagger/cmd/new.go
View File

@ -22,18 +22,17 @@ var newCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
store := dagger.DefaultStore()
// nolint:staticcheck
upRouteFlag, err := cmd.Flags().GetBool("up")
if err != nil {
lg.Fatal().Err(err).Str("flag", "up").Msg("unable to resolve flag")
}
// nolint:staticcheck
routeName := getRouteName(lg, cmd)
// TODO: Implement options: --layout-*, --setup
route, err := dagger.CreateRoute(ctx, routeName, nil)
route, err := store.CreateRoute(ctx, routeName, nil)
if err != nil {
lg.Fatal().Err(err).Msg("failed to create route")
}

4
cmd/dagger/cmd/query.go
View File

@ -23,11 +23,11 @@ var queryCmd = &cobra.Command{
},
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
// nolint:staticcheck
ctx := lg.WithContext(cmd.Context())
store := dagger.DefaultStore()
routeName := getRouteName(lg, cmd)
route, err := dagger.LookupRoute(ctx, routeName, nil)
route, err := store.LookupRoute(ctx, routeName, nil)
if err != nil {
lg.Fatal().Err(err).Str("route-name", routeName).Msg("failed to lookup route")
}

4
cmd/dagger/cmd/up.go
View File

@ -22,11 +22,11 @@ var upCmd = &cobra.Command{
},
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
// nolint:staticcheck
ctx := lg.WithContext(cmd.Context())
store := dagger.DefaultStore()
routeName := getRouteName(lg, cmd)
route, err := dagger.LookupRoute(ctx, routeName, nil)
route, err := store.LookupRoute(ctx, routeName, nil)
if err != nil {
lg.Fatal().Err(err).Str("route-name", routeName).Msg("failed to lookup route")
}

76
dagger/store.go
View File

@ -4,22 +4,35 @@ import (
"context"
"encoding/json"
"errors"
"io/ioutil"
"os"
"path"
"strings"
"path/filepath"
"github.com/google/uuid"
)
const (
storeLocation = "$HOME/.config/dagger/routes"
defaultStoreRoot = "$HOME/.config/dagger/routes"
)
type Store struct {
root string
}
func NewStore(root string) *Store {
return &Store{
root: root,
}
}
func DefaultStore() *Store {
return NewStore(os.ExpandEnv(defaultStoreRoot))
}
type CreateOpts struct{}
func CreateRoute(ctx context.Context, name string, o *CreateOpts) (*Route, error) {
r, err := LookupRoute(ctx, name, &LookupOpts{})
func (s *Store) CreateRoute(ctx context.Context, name string, o *CreateOpts) (*Route, error) {
r, err := s.LookupRoute(ctx, name, &LookupOpts{})
if err != nil && !errors.Is(err, os.ErrNotExist) {
return nil, err
}
@ -36,50 +49,53 @@ func CreateRoute(ctx context.Context, name string, o *CreateOpts) (*Route, error
return nil, err
}
return r, syncRoute(r)
return r, s.syncRoute(r)
}
type UpdateOpts struct{}
func UpdateRoute(ctx context.Context, r *Route, o *UpdateOpts) error {
return syncRoute(r)
func (s *Store) UpdateRoute(ctx context.Context, r *Route, o *UpdateOpts) error {
return s.syncRoute(r)
}
type DeleteOpts struct{}
func DeleteRoute(ctx context.Context, r *Route, o *DeleteOpts) error {
return deleteRoute(r)
func (s *Store) DeleteRoute(ctx context.Context, r *Route, o *DeleteOpts) error {
return os.Remove(s.routePath(r.st.Name))
}
type LookupOpts struct{}
func LookupRoute(ctx context.Context, name string, o *LookupOpts) (*Route, error) {
st, err := loadRoute(name)
func (s *Store) LookupRoute(ctx context.Context, name string, o *LookupOpts) (*Route, error) {
data, err := os.ReadFile(s.routePath(name))
if err != nil {
return nil, err
}
var st RouteState
if err := json.Unmarshal(data, &st); err != nil {
return nil, err
}
return &Route{
st: st,
st: &st,
}, nil
}
type LoadOpts struct{}
func LoadRoute(ctx context.Context, id string, o *LoadOpts) (*Route, error) {
func (s *Store) LoadRoute(ctx context.Context, id string, o *LoadOpts) (*Route, error) {
panic("NOT IMPLEMENTED")
}
func ListRoutes(ctx context.Context) ([]string, error) {
func (s *Store) ListRoutes(ctx context.Context) ([]string, error) {
routes := []string{}
rootDir := os.ExpandEnv(storeLocation)
files, err := ioutil.ReadDir(rootDir)
files, err := os.ReadDir(s.root)
if err != nil {
return nil, err
}
for _, f := range files {
if f.IsDir() || !strings.HasSuffix(f.Name(), ".json") {
if f.IsDir() || filepath.Ext(f.Name()) != ".json" {
// There is extra data in the directory, ignore
continue
}
@ -89,12 +105,12 @@ func ListRoutes(ctx context.Context) ([]string, error) {
return routes, nil
}
func routePath(name string) string {
return path.Join(os.ExpandEnv(storeLocation), name+".json")
func (s *Store) routePath(name string) string {
return path.Join(s.root, name+".json")
}
func syncRoute(r *Route) error {
p := routePath(r.st.Name)
func (s *Store) syncRoute(r *Route) error {
p := s.routePath(r.st.Name)
if err := os.MkdirAll(path.Dir(p), 0755); err != nil {
return err
@ -107,19 +123,3 @@ func syncRoute(r *Route) error {
return os.WriteFile(p, data, 0644)
}
func deleteRoute(r *Route) error {
return os.Remove(routePath(r.st.Name))
}
func loadRoute(name string) (*RouteState, error) {
data, err := os.ReadFile(routePath(name))
if err != nil {
return nil, err
}
var st *RouteState
if err := json.Unmarshal(data, st); err != nil {
return nil, err
}
return st, nil
}

37
dagger/store_test.go Normal file
View File

@ -0,0 +1,37 @@
package dagger
import (
"context"
"errors"
"os"
"testing"
"github.com/stretchr/testify/require"
)
func TestStore(t *testing.T) {
ctx := context.TODO()
root, err := os.MkdirTemp(os.TempDir(), "dagger-*")
require.NoError(t, err)
store := NewStore(root)
_, err = store.LookupRoute(ctx, "notexist", nil)
require.Error(t, err)
require.True(t, errors.Is(err, os.ErrNotExist))
r, err := store.CreateRoute(ctx, "test", nil)
require.NoError(t, err)
require.NotNil(t, r)
require.Equal(t, "test", r.Name())
r, err = store.LookupRoute(ctx, "test", nil)
require.NoError(t, err)
require.NotNil(t, r)
require.Equal(t, "test", r.Name())
routes, err := store.ListRoutes(ctx)
require.NoError(t, err)
require.Len(t, routes, 1)
require.Equal(t, "test", routes[0])
}

1
examples/react-netlify/main.cue
View File

@ -25,6 +25,5 @@ todoApp: netlify.#Site & {
contents: yarn.#Script & {
source: repository
run: "build"
env: "xx" :"bar"
}
}