Skip to content

Commit

Permalink
Merge branch 'fix/ci-firebase-emulator'
Browse files Browse the repository at this point in the history
# Conflicts:
#	go.mod
#	go.sum
  • Loading branch information
trakhimenok committed Sep 2, 2024
2 parents e0c2a81 + 1f092bd commit f794599
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 679 deletions.
6 changes: 3 additions & 3 deletions deleter.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import (
//type deleter struct {
// client *firestore.Client
// keyToDocRef keyToDocRefFunc
// delete func(ctx context.Context, docRef *firestore.DocumentRef) (_ *firestore.WriteResult, err error)
// deleteByDocRef func(ctx context.Context, docRef *firestore.DocumentRef) (_ *firestore.WriteResult, err error)
// bulkWriter func(ctx context.Context) *firestore.BulkWriter
//}

//func newDeleter(dtb database) deleter {
// return deleter{
// client: dtb.client,
// keyToDocRef: keyToDocRef,
// delete: delete,
// deleteByDocRef: deleteByDocRef,
// bulkWriter: func(c context.Context) *firestore.BulkWriter {
//
// },
Expand All @@ -26,7 +26,7 @@ import (
// Delete deletes a record from the database.
func (db database) Delete(ctx context.Context, key *dal.Key) error {
docRef := db.keyToDocRef(key)
_, err := delete(ctx, docRef)
_, err := deleteByDocRef(ctx, docRef)
return err
}

Expand Down
29 changes: 12 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.23.0

require (
cloud.google.com/go/firestore v1.16.0
github.com/dal-go/dalgo v0.12.2
github.com/dal-go/dalgo v0.13.0
github.com/dal-go/dalgo-end2end-tests v0.0.37
github.com/pkg/errors v0.9.1
google.golang.org/api v0.195.0
Expand All @@ -18,43 +18,38 @@ require (

require (
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.1 // indirect
cloud.google.com/go/auth v0.9.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute v1.27.5 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/longrunning v0.5.12 // indirect
cloud.google.com/go/longrunning v0.6.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/strongo/random v0.0.1 // indirect
github.com/strongo/validation v0.0.6 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit f794599

Please sign in to comment.