Complete rewrite of the Storage system

.gitignore

@@ -3,4 +3,8 @@
 .vscode/
 
 # Binary artifacts
-bin/
+bin/
+main_test.go
+vendor
+*.txt
+old

Makefile

@@ -1,13 +1,12 @@
 UID_GID ?= $(shell id -u):$(shell id -g)
-GO_VERSION ?= 1.14.4
+GO_VERSION ?= 1.15.6
 GIT_VERSION := $(shell hack/ldflags.sh --version-only)
 PROJECT := github.com/weaveworks/libgitops
 BOUNDING_API_DIRS := ${PROJECT}/cmd/apis/sample
 API_DIRS := ${PROJECT}/cmd/sample-app/apis/sample,${PROJECT}/cmd/sample-app/apis/sample/v1alpha1
 SRC_PKGS := cmd pkg
 DOCKER_ARGS := --rm
 CACHE_DIR := $(shell pwd)/bin/cache
-API_DOCS := api/sample-app.md api/runtime.md
 BINARIES := bin/sample-app bin/sample-gitops bin/sample-watch
 
 # If we're not running in CI, run Docker interactively
@@ -39,7 +38,6 @@ test-internal:
 tidy: docker-tidy-internal
 tidy-internal: /go/bin/goimports
 	go mod tidy
-	hack/generate-client.sh
 	gofmt -s -w ${SRC_PKGS}
 	goimports -w ${SRC_PKGS}
 

cmd/common/common.go

@@ -13,8 +13,8 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/weaveworks/libgitops/cmd/sample-app/apis/sample/v1alpha1"
 	"github.com/weaveworks/libgitops/cmd/sample-app/version"
-	"github.com/weaveworks/libgitops/pkg/runtime"
-	"github.com/weaveworks/libgitops/pkg/storage"
+	"github.com/weaveworks/libgitops/pkg/storage/client"
+	"github.com/weaveworks/libgitops/pkg/storage/core"
 )
 
 var (
@@ -25,10 +25,6 @@ func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
-func CarKeyForName(name string) storage.ObjectKey {
-	return storage.NewObjectKey(storage.NewKindKey(CarGVK), runtime.NewIdentifier("default/"+name))
-}
-
 func NewCar(name string) *v1alpha1.Car {
 	obj := &v1alpha1.Car{}
 	obj.Name = name
@@ -38,17 +34,17 @@ func NewCar(name string) *v1alpha1.Car {
 	return obj
 }
 
-func SetNewCarStatus(s storage.Storage, key storage.ObjectKey) error {
-	obj, err := s.Get(key)
+func SetNewCarStatus(ctx context.Context, c client.Client, name string) error {
+	car := &v1alpha1.Car{}
+	err := c.Get(ctx, core.ObjectKey{Name: name}, car)
 	if err != nil {
 		return err
 	}
 
-	car := obj.(*v1alpha1.Car)
 	car.Status.Distance = rand.Uint64()
 	car.Status.Speed = rand.Float64() * 100
 
-	return s.Update(car)
+	return c.Update(ctx, car)
 }
 
 func ParseVersionFlag() {
@@ -75,8 +71,8 @@ func NewEcho() *echo.Echo {
 func StartEcho(e *echo.Echo) error {
 	// Start the server
 	go func() {
-		if err := e.Start(":8888"); err != nil {
-			e.Logger.Info("shutting down the server")
+		if err := e.Start(":8881"); err != nil {
+			e.Logger.Info("shutting down the server", err)
 		}
 	}()
 

pkg/logs/flag/flag.go → cmd/common/logs/flag/flag.go

@@ -5,6 +5,9 @@ import (
 	"github.com/spf13/pflag"
 )
 
+// TODO: Use these flags in the sample binaries?
+// TODO: Move to the way controller-runtime does logs instead?
+
 type LogLevelFlag struct {
 	value *logrus.Level
 }

pkg/logs/logs.go → cmd/common/logs/logs.go

@@ -8,6 +8,8 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// TODO: Move to the way controller-runtime does logs instead?
+
 // Quiet specifies whether to only print machine-readable IDs
 var Quiet bool