Remove JSON storage

Author: calvinmclean

garden-app/cmd/migrate.go

@@ -25,10 +25,6 @@ func Execute() {
 
 	command.AddCommand(controllerCommand)
 
-	command.AddCommand(migrateCommand)
-
-	command.AddCommand(storageMigrateCommand)
-
 	viper.SetEnvPrefix("GARDEN_APP")
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()

garden-app/cmd/root.go

@@ -10,12 +10,6 @@ influxdb:
   org: "garden"
   bucket: "garden"
 storage:
-  driver: "hashmap"
+  driver: "sqlite"
   options:
-    filename: "gardens.yaml"
-# or use redis storage:
-# storage:
-#   type: "KV"
-#   options:
-#     driver: "redis"
-#     Server: "localhost:6379"
+    data_source_name: "garden.db"

garden-app/cmd/storage_migrate.go

@@ -26,9 +26,6 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.17.0
 	github.com/stretchr/testify v1.10.0
-	github.com/tarmac-project/hord v0.6.0
-	github.com/tarmac-project/hord/drivers/hashmap v0.6.0
-	github.com/tarmac-project/hord/drivers/redis v0.6.0
 	gopkg.in/dnaeon/go-vcr.v4 v4.0.1
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.46.1
@@ -127,6 +124,9 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tarmac-project/hord v0.6.0 // indirect
+	github.com/tarmac-project/hord/drivers/hashmap v0.6.0 // indirect
+	github.com/tarmac-project/hord/drivers/redis v0.6.0 // indirect
 	github.com/tdewolff/minify/v2 v2.12.9 // indirect
 	github.com/tdewolff/parse/v2 v2.6.8 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect

garden-app/config.yaml.example

@@ -17,8 +17,6 @@ const (
 	HealthStatusDown    HealthStatus = "DOWN"
 	HealthStatusUp      HealthStatus = "UP"
 	HealthStatusUnknown HealthStatus = "N/A"
-
-	currentGardenVersion = uint(2)
 )
 
 // Garden is the representation of a single garden-controller device
@@ -34,7 +32,6 @@ type Garden struct {
 	NotificationClientID      *string               `json:"notification_client_id,omitempty" yaml:"notification_client_id,omitempty"`
 	NotificationSettings      *NotificationSettings `json:"notification_settings,omitempty" yaml:"notification_settings,omitempty"`
 	ControllerConfig          *ControllerConfig     `json:"controller_config,omitempty" yaml:"controller_config,omitempty"`
-	Version                   uint                  `json:"version,omitempty" yaml:"version"`
 }
 
 type NotificationSettings struct {
@@ -45,14 +42,6 @@ type NotificationSettings struct {
 	WateringComplete  bool      `json:"watering_complete" yaml:"watering_complete"`
 }
 
-func (g *Garden) GetVersion() uint {
-	return g.Version
-}
-
-func (g *Garden) SetVersion(v uint) {
-	g.Version = v
-}
-
 func (g *Garden) GetID() string {
 	return g.ID.String()
 }
@@ -181,9 +170,6 @@ func (g *Garden) Bind(r *http.Request) error {
 		g.CreatedAt = &now
 		fallthrough
 	case http.MethodPut:
-		if g.Version == 0 {
-			g.Version = currentGardenVersion
-		}
 		if g.CreatedAt == nil || g.CreatedAt.IsZero() {
 			g.CreatedAt = &now
 		}
@@ -267,7 +253,5 @@ func (g *Garden) Bind(r *http.Request) error {
 }
 
 func (g *Garden) Render(_ http.ResponseWriter, _ *http.Request) error {
-	// Version is excluded from responses because it's not important external information
-	g.Version = 0
 	return nil
 }

garden-app/go.mod

@@ -9,11 +9,7 @@ import (
 	"github.com/calvinmclean/automated-garden/garden-app/pkg/weather"
 
 	"github.com/calvinmclean/babyapi"
-	"github.com/calvinmclean/babyapi/storage/kv"
 	"github.com/mitchellh/mapstructure"
-	"github.com/tarmac-project/hord"
-	"github.com/tarmac-project/hord/drivers/hashmap"
-	"github.com/tarmac-project/hord/drivers/redis"
 )
 
 // Config is used to identify and configure a storage client
@@ -40,17 +36,10 @@ type Client struct {
 }
 
 func NewClient(config Config) (*Client, error) {
-	switch config.Driver {
-	case "sqlite":
-		return newSQLiteClient(config)
-	case "hashmap", "redis":
-		return newKVClient(config)
-	default:
-		return nil, fmt.Errorf("invalid driver: %q", config.Driver)
+	if config.Driver != "sqlite" {
+		return nil, fmt.Errorf("invalid driver: %q (only sqlite is supported)", config.Driver)
 	}
-}
 
-func newSQLiteClient(config Config) (*Client, error) {
 	var sqlConfig sql.Config
 	err := mapstructure.Decode(config.Options, &sqlConfig)
 	if err != nil {
@@ -72,52 +61,3 @@ func newSQLiteClient(config Config) (*Client, error) {
 		AdditionalQueries:         sqlClient.AdditionalQueries,
 	}, nil
 }
-
-func newKVClient(config Config) (*Client, error) {
-	db, err := newHordDB(config)
-	if err != nil {
-		return nil, fmt.Errorf("error creating base client: %w", err)
-	}
-
-	gardens := babyapi.NewKVStorage[*pkg.Garden](db, "Garden")
-	zones := babyapi.NewKVStorage[*pkg.Zone](db, "Zone")
-	waterSchedules := babyapi.NewKVStorage[*pkg.WaterSchedule](db, "WaterSchedule")
-
-	return &Client{
-		Gardens:                   gardens,
-		Zones:                     zones,
-		WaterSchedules:            waterSchedules,
-		WeatherClientConfigs:      babyapi.NewKVStorage[*weather.Config](db, "WeatherClient"),
-		NotificationClientConfigs: babyapi.NewKVStorage[*notifications.Client](db, "NotificationClient"),
-		WaterRoutines:             babyapi.NewKVStorage[*pkg.WaterRoutine](db, "WaterRoutine"),
-		AdditionalQueries: &KVAdditionalQueries{
-			Gardens:        gardens,
-			Zones:          zones,
-			WaterSchedules: waterSchedules,
-		},
-	}, nil
-}
-
-// newHordDB will create a new DB connection for one of the supported hord backends:
-//   - hashmap
-//   - redis
-func newHordDB(config Config) (hord.Database, error) {
-	switch config.Driver {
-	case "hashmap":
-		var cfg hashmap.Config
-		err := mapstructure.Decode(config.Options, &cfg)
-		if err != nil {
-			return nil, fmt.Errorf("error decoding config: %w", err)
-		}
-		return kv.NewFileDB(cfg)
-	case "redis":
-		var cfg redis.Config
-		err := mapstructure.Decode(config.Options, &cfg)
-		if err != nil {
-			return nil, fmt.Errorf("error decoding config: %w", err)
-		}
-		return kv.NewRedisDB(cfg)
-	default:
-		return nil, fmt.Errorf("invalid KV driver: %q", config.Driver)
-	}
-}