Update Firestore and held-back dependencies #21190
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -20,23 +20,25 @@ import ( | |||||
| "fmt" | ||||||
| "net" | ||||||
| "os" | ||||||
| "reflect" | ||||||
| "strings" | ||||||
| "testing" | ||||||
| "time" | ||||||
| "unsafe" | ||||||
|
|
||||||
| "cloud.google.com/go/firestore" | ||||||
| "cloud.google.com/go/firestore/apiv1/admin/adminpb" | ||||||
| "cloud.google.com/go/firestore/apiv1/firestorepb" | ||||||
| "github.com/gravitational/trace" | ||||||
| "github.com/jonboulle/clockwork" | ||||||
| "github.com/sirupsen/logrus" | ||||||
| "github.com/stretchr/testify/require" | ||||||
| "google.golang.org/api/option" | ||||||
| "google.golang.org/genproto/googleapis/rpc/code" | ||||||
| "google.golang.org/genproto/googleapis/rpc/status" | ||||||
| "google.golang.org/grpc" | ||||||
| "google.golang.org/grpc/credentials/insecure" | ||||||
| "google.golang.org/grpc/metadata" | ||||||
| "google.golang.org/protobuf/proto" | ||||||
| "google.golang.org/protobuf/types/known/timestamppb" | ||||||
|
|
||||||
|
|
@@ -194,25 +196,29 @@ type mockFirestoreServer struct { | |||||
| commitErr error | ||||||
| } | ||||||
|
|
||||||
| func (s *mockFirestoreServer) BatchWrite(ctx context.Context, req *firestorepb.BatchWriteRequest) (*firestorepb.BatchWriteResponse, error) { | ||||||
| md, _ := metadata.FromIncomingContext(ctx) | ||||||
| if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") { | ||||||
| return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg) | ||||||
| } | ||||||
|
|
||||||
| s.reqs = append(s.reqs, req) | ||||||
| if s.commitErr != nil { | ||||||
| return nil, s.commitErr | ||||||
| } | ||||||
|
|
||||||
| resp := &firestorepb.BatchWriteResponse{} | ||||||
| for i := 0; i < len(req.Writes); i++ { | ||||||
|
There was a problem hiding this comment. Suggestion: If you don't need the variable:
Suggested change
There was a problem hiding this comment.
There was a problem hiding this comment. hold up, when did we get this syntax? There was a problem hiding this comment. Since forever, I think. |
||||||
| resp.Status = append(resp.Status, &status.Status{ | ||||||
| Code: int32(code.Code_OK), | ||||||
| }) | ||||||
|
|
||||||
| resp.WriteResults = append(resp.WriteResults, &firestorepb.WriteResult{ | ||||||
| UpdateTime: timestamppb.Now(), | ||||||
| }) | ||||||
| } | ||||||
|
|
||||||
| return resp, nil | ||||||
| } | ||||||
|
|
||||||
| func TestDeleteDocuments(t *testing.T) { | ||||||
|
|
@@ -231,19 +237,9 @@ func TestDeleteDocuments(t *testing.T) { | |||||
| documents: 1, | ||||||
| }, | ||||||
| { | ||||||
| name: "commit success", | ||||||
| assertion: require.NoError, | ||||||
| documents: 1796, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -261,6 +257,14 @@ func TestDeleteDocuments(t *testing.T) { | |||||
| CreateTime: time.Now(), | ||||||
|
There was a problem hiding this comment. nit: Use for-range above? There was a problem hiding this comment. The variable There was a problem hiding this comment. Comment is still viable, although certainly not worth a PR. |
||||||
| UpdateTime: time.Now(), | ||||||
| }) | ||||||
|
|
||||||
| // We really shouldn't need this, but the Firestore SDK made some unfortunate design | ||||||
| // decisions that make it impossible to set the field of a DocumentRef used for the seemingly | ||||||
| // useless deduplication in the BulkWriter API. | ||||||
| rs := reflect.ValueOf(docs[i].Ref).Elem() | ||||||
| rf := rs.FieldByName("shortPath") | ||||||
| rf = reflect.NewAt(rf.Type(), unsafe.Pointer(rf.UnsafeAddr())).Elem() | ||||||
| rf.SetString(docs[i].Ref.Path) | ||||||
|
Comment on lines
+261
to
+267
There was a problem hiding this comment. What is the consequence of not setting this? Could we get around the reflect block in some other way? There was a problem hiding this comment. This was already merged due to @rosstimothy adding it to the queue. I was confused by errors for some time in tests for quite some time that didn't crop up in real world testing. As it turns out, the firestore SDK This would be fine, the test generates an unique There was a problem hiding this comment. I could not find an alternative way around this easily. There was a problem hiding this comment. Fair enough, thanks for the explanation. |
||||||
| } | ||||||
|
|
||||||
| mockFirestore := &mockFirestoreServer{ | ||||||
|
|
@@ -310,7 +314,7 @@ func TestDeleteDocuments(t *testing.T) { | |||||
| var committed int | ||||||
| for _, req := range mockFirestore.reqs { | ||||||
| switch r := req.(type) { | ||||||
| case *firestorepb.BatchWriteRequest: | ||||||
| committed += len(r.Writes) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update api/go.mod too.