Vc/remove hollow 1 (#25)

* remove ancient flasher dependency * excise references to go.hollow.sh/events
metal-toolbox · Dec 12, 2023 · 59ee6af · 59ee6af
1 parent 662eb9b
commit 59ee6af
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 21 deletions.
diff --git a/condition/status.go b/condition/status.go
@@ -5,10 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/metal-toolbox/flasher/types"
+	"github.com/metal-toolbox/rivets/events/registry"
 	"github.com/nats-io/nats.go"
 	"github.com/pkg/errors"
-	"go.hollow.sh/toolbox/events/registry"
 )
 
 type ErrQueryStatus struct {
@@ -120,7 +119,7 @@ func CheckConditionInProgress(conditionID, facilityCode, kvBucket string, js nat
 	}
 
 	// we have an status entry for this condition, is is complete?
-	sv := types.StatusValue{}
+	sv := StatusValue{}
 	if errJSON := json.Unmarshal(entry.Value(), &sv); errJSON != nil {
 		errJSON = errors.Wrap(errJSON, "unable to construct a sane status for condition")
 		return Indeterminate, newErrQueryStatus(errJSON, kvBucket, lookupKey, "")

diff --git a/condition/status_test.go b/condition/status_test.go
@@ -9,15 +9,14 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/metal-toolbox/flasher/types"
+	"github.com/metal-toolbox/rivets/events"
+	"github.com/metal-toolbox/rivets/events/pkg/kv"
+	"github.com/metal-toolbox/rivets/events/registry"
 	"github.com/nats-io/nats-server/v2/server"
 	srvtest "github.com/nats-io/nats-server/v2/test"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.hollow.sh/toolbox/events"
-	"go.hollow.sh/toolbox/events/pkg/kv"
-	"go.hollow.sh/toolbox/events/registry"
 )
 
 func startJetStreamServer(t *testing.T) *server.Server {
@@ -107,7 +106,7 @@ func TestCheckConditionInProgress(t *testing.T) {
 			Complete,
 			"",
 			func() []byte {
-				sv := &types.StatusValue{State: string(Failed)}
+				sv := &StatusValue{State: string(Failed)}
 				return sv.MustBytes()
 			},
 			false,

diff --git a/condition/types.go b/condition/types.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"go.hollow.sh/toolbox/events"
+	"github.com/metal-toolbox/rivets/events"
 
 	"golang.org/x/exp/slices"
 )

diff --git a/events/mock/events.go b/events/mock/events.go
diff --git a/events/pkg/kv/kv.go b/events/pkg/kv/kv.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/nats-io/nats.go"
 
-	"go.hollow.sh/toolbox/events"
+	"github.com/metal-toolbox/rivets/events"
 )
 
 // DefaultKVConfig returns a configuration with "mostly sane" defaults. Override

diff --git a/events/pkg/kv/kv_test.go b/events/pkg/kv/kv_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/nats-io/nats.go"
 
+	"github.com/metal-toolbox/rivets/events"
 	kvTest "github.com/metal-toolbox/rivets/events/internal/test"
-	"go.hollow.sh/toolbox/events"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/events/registry/registry.go b/events/registry/registry.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/nats-io/nats.go"
 
-	"go.hollow.sh/toolbox/events"
-	"go.hollow.sh/toolbox/events/pkg/kv"
+	"github.com/metal-toolbox/rivets/events"
+	"github.com/metal-toolbox/rivets/events/pkg/kv"
 )
 
 var (

diff --git a/events/registry/registry_test.go b/events/registry/registry_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/require"
 
+	"github.com/metal-toolbox/rivets/events"
 	kvTest "github.com/metal-toolbox/rivets/events/internal/test"
-	"go.hollow.sh/toolbox/events"
 )
 
 func TestAppLifecycle(t *testing.T) {