Skip to content
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.

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

refactor: refatcor code and upgrade Go-Akt to v2.0.0 #73

Merged
merged 3 commits into from
May 25, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: fix module path to match version
Tochemey committed May 25, 2024
commit f6b95980cf906c768f1e8829f8ebcbccf3a49b24
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN}}
- uses: earthly/actions/setup-earthly@v1
- uses: earthly/actions/setup-earthly@v2
with:
version: v0.7.19
- name: Earthly version
@@ -52,7 +52,7 @@ jobs:
files: ./coverage.out # optional
fail_ci_if_error: false # optional (default = false)
verbose: false # optional (default = false)
# - uses: go-semantic-release/action@v1
# - uses: go-semantic-release/action@v2
# id: semver
# with:
# github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN}}
- uses: earthly/actions/setup-earthly@v1
- uses: earthly/actions/setup-earthly@v2
with:
version: v0.7.19
- name: Earthly version
2 changes: 1 addition & 1 deletion Earthfile
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ protogen:
--path protos/ego

# save artifact to
SAVE ARTIFACT gen/ego/v1 AS LOCAL egopb
SAVE ARTIFACT gen/ego/v2 AS LOCAL egopb

testprotogen:
# copy the proto files to generate
8 changes: 4 additions & 4 deletions actor.go
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@ import (
"github.com/tochemey/goakt/v2/actors"
"github.com/tochemey/goakt/v2/goaktpb"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/eventstream"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/eventstream"
"github.com/tochemey/ego/v2/internal/telemetry"
)

var (
10 changes: 5 additions & 5 deletions actor_test.go
Original file line number Diff line number Diff line change
@@ -39,11 +39,11 @@ import (
"github.com/tochemey/goakt/v2/log"
"github.com/tochemey/gopack/postgres"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore/memory"
pgeventstore "github.com/tochemey/ego/eventstore/postgres"
"github.com/tochemey/ego/eventstream"
testpb "github.com/tochemey/ego/test/data/pb/v1"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore/memory"
pgeventstore "github.com/tochemey/ego/v2/eventstore/postgres"
"github.com/tochemey/ego/v2/eventstream"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

func TestActor(t *testing.T) {
116 changes: 58 additions & 58 deletions egopb/ego.pb.go

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions engine.go
Original file line number Diff line number Diff line change
@@ -38,11 +38,11 @@ import (
"github.com/tochemey/goakt/v2/log"
"github.com/tochemey/goakt/v2/telemetry"

"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/eventstream"
egotel "github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/projection"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/eventstream"
egotel "github.com/tochemey/ego/v2/internal/telemetry"
"github.com/tochemey/ego/v2/offsetstore"
"github.com/tochemey/ego/v2/projection"
)

// Engine represents the engine that empowers the various entities
10 changes: 5 additions & 5 deletions engine_test.go
Original file line number Diff line number Diff line change
@@ -41,11 +41,11 @@ import (
"github.com/tochemey/goakt/v2/log"
mockdisco "github.com/tochemey/goakt/v2/mocks/discovery"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore/memory"
samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1"
offsetstore "github.com/tochemey/ego/offsetstore/memory"
"github.com/tochemey/ego/projection"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore/memory"
samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1"
offsetstore "github.com/tochemey/ego/v2/offsetstore/memory"
"github.com/tochemey/ego/v2/projection"
)

func TestEgo(t *testing.T) {
2 changes: 1 addition & 1 deletion entity.go
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ import (

"github.com/tochemey/goakt/v2/actors"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/v2/egopb"
)

var (
4 changes: 2 additions & 2 deletions entity_test.go
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/tochemey/ego/eventstore/memory"
samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1"
"github.com/tochemey/ego/v2/eventstore/memory"
samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1"
)

func TestNewEntity(t *testing.T) {
2 changes: 1 addition & 1 deletion eventstore/iface.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ package eventstore
import (
"context"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/v2/egopb"
)

// EventsStore defines the API to write to the events store
6 changes: 3 additions & 3 deletions eventstore/memory/memory.go
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@ import (
"google.golang.org/protobuf/reflect/protoregistry"
"google.golang.org/protobuf/types/known/anypb"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/internal/telemetry"
)

// EventsStore keep in memory every journal
6 changes: 3 additions & 3 deletions eventstore/memory/memory_test.go
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ import (
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
testpb "github.com/tochemey/ego/test/data/pb/v1"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

func TestEventsStore(t *testing.T) {
6 changes: 3 additions & 3 deletions eventstore/postgres/postgres.go
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ import (

"github.com/tochemey/gopack/postgres"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/internal/telemetry"
)

var (
6 changes: 3 additions & 3 deletions eventstore/postgres/postgres_test.go
Original file line number Diff line number Diff line change
@@ -37,9 +37,9 @@ import (

"github.com/tochemey/gopack/postgres"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
testpb "github.com/tochemey/ego/test/data/pb/v1"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

func TestPostgresEventsStore(t *testing.T) {
2 changes: 1 addition & 1 deletion eventstore/postgres/row.go
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ import (
"google.golang.org/protobuf/reflect/protoregistry"
"google.golang.org/protobuf/types/known/anypb"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/v2/egopb"
)

// row represents the events store row
2 changes: 1 addition & 1 deletion eventstream/subscriber.go
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ import (

"github.com/google/uuid"

"github.com/tochemey/ego/internal/queue"
"github.com/tochemey/ego/v2/internal/queue"
)

// Subscriber defines the Subscriber Interface
6 changes: 3 additions & 3 deletions example/main.go
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ import (
"github.com/google/uuid"
"google.golang.org/protobuf/proto"

"github.com/tochemey/ego"
"github.com/tochemey/ego/eventstore/memory"
samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1"
"github.com/tochemey/ego/v2"
"github.com/tochemey/ego/v2/eventstore/memory"
samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1"
)

func main() {
18 changes: 9 additions & 9 deletions example/pbs/sample/pb/v1/sample.pb.go
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/tochemey/ego
module github.com/tochemey/ego/v2

go 1.21

2 changes: 1 addition & 1 deletion helper_test.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ import (
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/emptypb"

testpb "github.com/tochemey/ego/test/data/pb/v1"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

// AccountEntityBehavior implement EntityBehavior
2 changes: 1 addition & 1 deletion offsetstore/iface.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ package offsetstore
import (
"context"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/v2/egopb"
)

// OffsetStore defines the contract needed to persist offsets
6 changes: 3 additions & 3 deletions offsetstore/memory/memory.go
Original file line number Diff line number Diff line change
@@ -34,9 +34,9 @@ import (
"github.com/pkg/errors"
"go.uber.org/atomic"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/internal/telemetry"
"github.com/tochemey/ego/v2/offsetstore"
)

// OffsetStore implements the offset store interface
4 changes: 2 additions & 2 deletions offsetstore/memory/memory_test.go
Original file line number Diff line number Diff line change
@@ -33,8 +33,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/offsetstore"
)

func TestOffsetStore(t *testing.T) {
6 changes: 3 additions & 3 deletions offsetstore/postgres/postgres.go
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ import (

"github.com/tochemey/gopack/postgres"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/internal/telemetry"
"github.com/tochemey/ego/v2/offsetstore"
)

var (
4 changes: 2 additions & 2 deletions offsetstore/postgres/postgres_test.go
Original file line number Diff line number Diff line change
@@ -35,8 +35,8 @@ import (

"github.com/tochemey/gopack/postgres"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/offsetstore"
)

func TestPostgresOffsetStore(t *testing.T) {
4 changes: 2 additions & 2 deletions projection/actor.go
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@ import (
"github.com/tochemey/goakt/v2/actors"
"github.com/tochemey/goakt/v2/goaktpb"

"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/offsetstore"
)

// Start is used to start the projection
8 changes: 4 additions & 4 deletions projection/actor_test.go
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@ import (
"github.com/tochemey/goakt/v2/actors"
"github.com/tochemey/goakt/v2/log"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore/memory"
memoffsetstore "github.com/tochemey/ego/offsetstore/memory"
testpb "github.com/tochemey/ego/test/data/pb/v1"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore/memory"
memoffsetstore "github.com/tochemey/ego/v2/offsetstore/memory"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

func TestActor(t *testing.T) {
8 changes: 4 additions & 4 deletions projection/runner.go
Original file line number Diff line number Diff line change
@@ -37,10 +37,10 @@ import (

"github.com/tochemey/goakt/v2/log"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore"
"github.com/tochemey/ego/internal/telemetry"
"github.com/tochemey/ego/offsetstore"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore"
"github.com/tochemey/ego/v2/internal/telemetry"
"github.com/tochemey/ego/v2/offsetstore"
)

// runner defines the projection runner
8 changes: 4 additions & 4 deletions projection/runner_test.go
Original file line number Diff line number Diff line change
@@ -40,10 +40,10 @@ import (

"github.com/tochemey/goakt/v2/log"

"github.com/tochemey/ego/egopb"
"github.com/tochemey/ego/eventstore/memory"
memoffsetstore "github.com/tochemey/ego/offsetstore/memory"
testpb "github.com/tochemey/ego/test/data/pb/v1"
"github.com/tochemey/ego/v2/egopb"
"github.com/tochemey/ego/v2/eventstore/memory"
memoffsetstore "github.com/tochemey/ego/v2/offsetstore/memory"
testpb "github.com/tochemey/ego/v2/test/data/pb/v1"
)

func TestProjection(t *testing.T) {
2 changes: 1 addition & 1 deletion protos/ego/v1/ego.proto → protos/ego/v2/ego.proto
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ package ego.v1;

import "google/protobuf/any.proto";

option go_package = "github.com/tochemey/ego/v1;egopb";
option go_package = "github.com/tochemey/ego/v2;egopb";

// Event defines the event that needs to be persisted onto the events store
message Event {
2 changes: 1 addition & 1 deletion protos/test/buf.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1
version: v2
lint:
use:
- DEFAULT
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ syntax = "proto3";

package tests.v1;

option go_package = "github.com/tochemey/ego/tests/v1;testpb";
option go_package = "github.com/tochemey/ego/tests/v2;testpb";

message TestReply {}
message TestPanic {}
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ import (
"github.com/google/uuid"
"github.com/tochemey/ego"
"github.com/tochemey/ego/eventstore/memory"
samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1"
samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v2"
"google.golang.org/protobuf/proto"
)

26 changes: 13 additions & 13 deletions test/data/pb/v1/test.pb.go