fix(deps): update 3d-parties non major deps

database.go

@@ -7,7 +7,7 @@ import (
 )
 
 // NewDatabase creates new instance of dalgo interface to Firestore
-func NewDatabase(id string, client *firestore.Client) (db dal.Database) {
+func NewDatabase(id string, client *firestore.Client) (db dal.DB) {
 	if id == "" {
 		panic("id is a required field, got empty string")
 	}
@@ -24,8 +24,8 @@ func NewDatabase(id string, client *firestore.Client) (db dal.Database) {
 	}
 }
 
-var _ dal.Database = database{}
-var _ dal.Database = (*database)(nil)
+var _ dal.DB = database{}
+var _ dal.DB = (*database)(nil)
 
 // database implements dal.Database
 type database struct {
@@ -38,11 +38,11 @@ func (db database) ID() string {
 	return db.id
 }
 
-func (db database) Client() dal.ClientInfo {
-	return dal.NewClientInfo("firestore", "v1.9.0")
+func (db database) Adapter() dal.Adapter {
+	return dal.NewAdapter("firestore", "v1.9.0")
 }
 
-var _ dal.Database = (*database)(nil)
+var _ dal.DB = (*database)(nil)
 
 func (db database) Upsert(ctx context.Context, record dal.Record) error {
 	panic("implement me")

end2end/e2e_test.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	end2end "github.com/dal-go/dalgo-end2end-tests"
 	"github.com/dal-go/dalgo2firestore"
+	"github.com/pkg/errors"
 	"io"
 	"log"
 	"os"
@@ -19,7 +20,10 @@ import (
 func TestEndToEnd(t *testing.T) {
 	log.Println("TestEndToEnd() started...")
 	cmd, cmdStdout, cmdStdErr := startFirebaseEmulators(t)
-	defer terminateFirebaseEmulators(t, cmd)
+	defer func() {
+		terminateFirebaseEmulators(t, cmd)
+		cmd = nil
+	}()
 	emulatorExited := false
 	go handleCommandStderr(t, cmdStdErr, &emulatorExited)
 	select {
@@ -59,8 +63,12 @@ func handleCommandStderr(t *testing.T, stderr *bytes.Buffer, emulatorExited *boo
 }
 
 func terminateFirebaseEmulators(t *testing.T, cmd *exec.Cmd) {
+	if cmd == nil {
+		return
+	}
+	// TODO(help-wanted): Consider cmd.Cancel() ?
 	if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
-		if err != os.ErrProcessDone {
+		if errors.Is(err, os.ErrProcessDone) {
 			t.Error("Failed to terminate Firebase emulator:", err)
 			return
 		}
@@ -109,7 +117,7 @@ func waitForEmulatorReadiness(t *testing.T, cmdOutput *bytes.Buffer, emulatorExi
 			if strings.Contains(line, "All emulators ready!") {
 				//t.Log("Firebase emulators are ready.")
 				emulatorsReady <- true
-				close(emulatorsReady)
+				//close(emulatorsReady)
 			}
 		}
 	}()

getter.go

@@ -69,23 +69,7 @@ func docSnapshotToRecord(
 }
 
 func (db database) GetMulti(ctx context.Context, records []dal.Record) error {
-	docRefs := make([]*firestore.DocumentRef, len(records))
-	for i, rec := range records {
-		key := rec.Key()
-		docRefs[i] = db.keyToDocRef(key)
-	}
-	docSnapshots, err := db.client.GetAll(ctx, docRefs)
-	if err != nil {
-		return err
-	}
-	allErrors := make([]error, 0, len(records))
-	for i, rec := range records {
-		if err = docSnapshotToRecord(nil, docSnapshots[i], rec, dataTo); err != nil && !dal.IsNotFound(err) {
-			allErrors = append(allErrors, err)
-		}
-	}
-	if len(allErrors) > 0 {
-		return errors.Wrapf(allErrors[0], "failed to marshal data for %v records out of %v", len(allErrors), len(records))
-	}
-	return nil
+	return db.RunReadonlyTransaction(ctx, func(ctx context.Context, tx dal.ReadTransaction) error {
+		return tx.GetMulti(ctx, records)
+	})
 }

go.mod

@@ -4,14 +4,15 @@ go 1.20
 
 require (
 	cloud.google.com/go/firestore v1.12.0
-	github.com/dal-go/dalgo v0.5.0
-	github.com/dal-go/dalgo-end2end-tests v0.0.27
+	github.com/dal-go/dalgo v0.10.0
+	github.com/dal-go/dalgo-end2end-tests v0.0.31
 	github.com/pkg/errors v0.9.1
-	google.golang.org/api v0.138.0
-	google.golang.org/grpc v1.57.0
+	google.golang.org/api v0.139.0
+	google.golang.org/grpc v1.58.0
 )
 
 //replace github.com/dal-go/dalgo => ../dalgo
+//replace github.com/dal-go/dalgo-end2end-tests => ../dalgo-end2end-tests
 
 require (
 	cloud.google.com/go v0.110.7 // indirect
@@ -22,7 +23,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/s2a-go v0.1.5 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -41,7 +42,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )