Merge branch 'main' into ep/functions-strict-api

Author: emilypgoogle

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+* [changed] Updated `firebase-crashlytics` dependency to v19.2.1
+
 
 # 19.2.0
 * [changed] Updated `firebase-crashlytics` dependency to v19.2.0

firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/DateScalarIntegrationTest.kt

@@ -19,6 +19,8 @@ package com.google.firebase.dataconnect.testutil
 import com.google.firebase.dataconnect.ConnectorConfig
 import com.google.firebase.dataconnect.DataConnectSettings
 import com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType
+import com.google.firebase.dataconnect.testutil.EdgeCases.Dates.MAX_YEAR
+import com.google.firebase.dataconnect.testutil.EdgeCases.Dates.MIN_YEAR
 import com.google.firebase.util.nextAlphanumericString
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.Codepoint
@@ -35,11 +37,14 @@ import io.kotest.property.arbitrary.filter
 import io.kotest.property.arbitrary.filterIsInstance
 import io.kotest.property.arbitrary.filterNot
 import io.kotest.property.arbitrary.int
+import io.kotest.property.arbitrary.long
 import io.kotest.property.arbitrary.map
 import io.kotest.property.arbitrary.merge
 import io.kotest.property.arbitrary.next
 import io.kotest.property.arbitrary.of
 import io.kotest.property.arbitrary.string
+import java.util.Date
+import kotlin.random.nextInt
 
 fun <A> Arb<A>.filterNotNull(): Arb<A & Any> = filter { it !== null }.map { it!! }
 
@@ -168,3 +173,55 @@ fun Arb.Companion.callerSdkType(): Arb<CallerSdkType> = arbitrary {
 fun Arb.Companion.tag(): Arb<String> = arbitrary {
   "tag" + Arb.string(size = 10, Codepoint.alphanumeric()).bind()
 }
+
+private fun maxDayForMonth(month: Int): Int {
+  return when (month) {
+    1 -> 31
+    2 -> 28
+    3 -> 31
+    4 -> 30
+    5 -> 31
+    6 -> 30
+    7 -> 31
+    8 -> 31
+    9 -> 30
+    10 -> 31
+    11 -> 30
+    12 -> 31
+    else ->
+      throw IllegalArgumentException("invalid month: $month (must be between 1 and 12, inclusive)")
+  }
+}
+
+data class DateAndString(val date: Date, val string: String)
+
+fun Arb.Companion.dateAndString(): Arb<DateAndString> =
+  arbitrary(edgecases = EdgeCases.dateAndStrings) { rs ->
+    val year = rs.random.nextInt(MIN_YEAR..MAX_YEAR)
+    val month = rs.random.nextInt(1..12)
+    val day = rs.random.nextInt(1..maxDayForMonth(month))
+
+    val date = dateFromYearMonthDayUTC(year, month, day)
+
+    val yearStr = "$year"
+    val monthStr = "$month".padStart(2, '0')
+    val dayStr = "$day".padStart(2, '0')
+    val string = "$yearStr-$monthStr-$dayStr"
+
+    DateAndString(date, string)
+  }
+
+fun Arb.Companion.dateAndStringOffDayBoundary(): Arb<DateAndString> =
+  arbitrary(edgecases = EdgeCases.dateAndStringOffDayBoundary) {
+    // Skip dates with the maximum year, as adding non-zero milliseconds will result in the year
+    // 10,000, which is invalid.
+    val dateAndStrings = Arb.dateAndString().filterNot { it.string.contains("9999") }
+    // Don't add more than 86_400_000L, the number of milliseconds per day, to the date.
+    val millisOffsets = Arb.long(0L until 86_400_000L)
+
+    val dateAndString = dateAndStrings.bind()
+    val millisOffset = millisOffsets.bind()
+    val dateOffDayBoundary = Date(dateAndString.date.time + millisOffset)
+
+    DateAndString(dateOffDayBoundary, dateAndString.string)
+  }

firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/Arbs.kt

@@ -16,6 +16,10 @@
 
 package com.google.firebase.dataconnect.testutil
 
+import java.util.Date
+import java.util.GregorianCalendar
+import java.util.TimeZone
+
 object EdgeCases {
 
   val numbers: List<Double> =
@@ -82,4 +86,50 @@ object EdgeCases {
   }
 
   val anyScalars: List<Any?> = primitives + lists + maps + listOf(null)
+
+  object Dates {
+    const val MIN_YEAR = 1583
+    const val MAX_YEAR = 9999
+
+    val MIN: Date
+      get() = dateFromYearMonthDayUTC(MIN_YEAR, 1, 1)
+    val MIN_DATE_AND_STRING: DateAndString
+      get() = DateAndString(MIN, "$MIN_YEAR-01-01")
+
+    val MAX: Date
+      get() = dateFromYearMonthDayUTC(MAX_YEAR, 12, 31)
+    val MAX_DATE_AND_STRING: DateAndString
+      get() = DateAndString(MAX, "$MAX_YEAR-12-31")
+
+    val ZERO: Date
+      get() = GregorianCalendar(TimeZone.getTimeZone("UTC")).apply { timeInMillis = 0 }.time
+    val ZERO_DATE_AND_STRING: DateAndString
+      get() = DateAndString(ZERO, "1970-01-01")
+  }
+
+  val dates: List<Date> = listOf(Dates.MIN, Dates.MAX, Dates.ZERO)
+
+  val dateAndStrings: List<DateAndString> =
+    listOf(
+      Dates.MIN_DATE_AND_STRING,
+      Dates.MAX_DATE_AND_STRING,
+      Dates.ZERO_DATE_AND_STRING,
+    )
+
+  val dateAndStringOffDayBoundary: List<DateAndString> =
+    listOf(
+      DateAndString(
+        Date(Dates.MIN_DATE_AND_STRING.date.time + 1),
+        Dates.MIN_DATE_AND_STRING.string
+      ),
+      DateAndString(
+        Date(Dates.MAX_DATE_AND_STRING.date.time + 1),
+        Dates.MAX_DATE_AND_STRING.string
+      ),
+      DateAndString(
+        Date(Dates.ZERO_DATE_AND_STRING.date.time + 1),
+        Dates.ZERO_DATE_AND_STRING.string
+      ),
+      DateAndString(Date(Dates.ZERO_DATE_AND_STRING.date.time - 1), "1969-12-31"),
+    )
 }

firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/EdgeCases.kt

@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Update Firestore proto definitions. [#6369](//github.com/firebase/firebase-android-sdk/pull/6369)
 * [changed] Updated protobuf dependency to `3.25.5` to fix
   [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 

firebase-firestore/CHANGELOG.md

@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package google.firestore.v1;
 import "google/firestore/v1/document.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "AggregationResultProto";
 option java_package = "com.google.firestore.v1";
@@ -35,7 +35,8 @@ option ruby_package = "Google::Cloud::Firestore::V1";
 message AggregationResult {
   // The result of the aggregation functions, ex: `COUNT(*) AS total_docs`.
   //
-  // The key is the [alias][google.firestore.v1.StructuredAggregationQuery.Aggregation.alias]
+  // The key is the
+  // [alias][google.firestore.v1.StructuredAggregationQuery.Aggregation.alias]
   // assigned to the aggregation function on input and the size of this map
   // equals the number of aggregation functions in the query.
   map<string, Value> aggregate_fields = 2;

firebase-firestore/src/proto/google/firestore/v1/aggregation_result.proto

@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ syntax = "proto3";
 package google.firestore.v1;
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "BloomFilterProto";
 option java_package = "com.google.firestore.v1";
@@ -32,21 +32,21 @@ option ruby_package = "Google::Cloud::Firestore::V1";
 // defines the number of bits of the last byte to be ignored as "padding". The
 // values of these "padding" bits are unspecified and must be ignored.
 //
-// To retrieve the first bit, bit 0, calculate: (bitmap[0] & 0x01) != 0.
-// To retrieve the second bit, bit 1, calculate: (bitmap[0] & 0x02) != 0.
-// To retrieve the third bit, bit 2, calculate: (bitmap[0] & 0x04) != 0.
-// To retrieve the fourth bit, bit 3, calculate: (bitmap[0] & 0x08) != 0.
-// To retrieve bit n, calculate: (bitmap[n / 8] & (0x01 << (n % 8))) != 0.
+// To retrieve the first bit, bit 0, calculate: `(bitmap[0] & 0x01) != 0`.
+// To retrieve the second bit, bit 1, calculate: `(bitmap[0] & 0x02) != 0`.
+// To retrieve the third bit, bit 2, calculate: `(bitmap[0] & 0x04) != 0`.
+// To retrieve the fourth bit, bit 3, calculate: `(bitmap[0] & 0x08) != 0`.
+// To retrieve bit n, calculate: `(bitmap[n / 8] & (0x01 << (n % 8))) != 0`.
 //
 // The "size" of a `BitSequence` (the number of bits it contains) is calculated
-// by this formula: (bitmap.length * 8) - padding.
+// by this formula: `(bitmap.length * 8) - padding`.
 message BitSequence {
   // The bytes that encode the bit sequence.
   // May have a length of zero.
   bytes bitmap = 1;
 
   // The number of bits of the last byte in `bitmap` to ignore as "padding".
-  // If the length of `bitmap` is zero, then this value must be 0.
+  // If the length of `bitmap` is zero, then this value must be `0`.
   // Otherwise, this value must be between 0 and 7, inclusive.
   int32 padding = 2;
 }
@@ -57,10 +57,10 @@ message BitSequence {
 // hash as 2 distinct 64-bit hash values, interpreted as unsigned integers
 // using 2's complement encoding.
 //
-// These two hash values, named h1 and h2, are then used to compute the
-// `hash_count` hash values using the formula, starting at i=0:
+// These two hash values, named `h1` and `h2`, are then used to compute the
+// `hash_count` hash values using the formula, starting at `i=0`:
 //
-//   h(i) = h1 + (i * h2)
+//     h(i) = h1 + (i * h2)
 //
 // These resulting values are then taken modulo the number of bits in the bloom
 // filter to get the bits of the bloom filter to test for the given entry.
@@ -70,4 +70,4 @@ message BloomFilter {
 
   // The number of hashes used by the algorithm.
   int32 hash_count = 2;
-}
+}

firebase-firestore/src/proto/google/firestore/v1/bloom_filter.proto

@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC.
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,32 +11,32 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
 
 syntax = "proto3";
 
 package google.firestore.v1;
 
-import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option java_package = "com.google.firestore.v1";
 option objc_class_prefix = "GCFS";
 option php_namespace = "Google\\Cloud\\Firestore\\V1";
-
+option ruby_package = "Google::Cloud::Firestore::V1";
 
 // A set of field paths on a document.
 // Used to restrict a get or update operation on a document to a subset of its
 // fields.
 // This is different from standard field masks, as this is always scoped to a
-// [Document][google.firestore.v1.Document], and takes in account the dynamic nature of [Value][google.firestore.v1.Value].
+// [Document][google.firestore.v1.Document], and takes in account the dynamic
+// nature of [Value][google.firestore.v1.Value].
 message DocumentMask {
-  // The list of field paths in the mask. See [Document.fields][google.firestore.v1.Document.fields] for a field
-  // path syntax reference.
+  // The list of field paths in the mask. See
+  // [Document.fields][google.firestore.v1.Document.fields] for a field path
+  // syntax reference.
   repeated string field_paths = 1;
 }
 
@@ -49,14 +49,17 @@ message Precondition {
     bool exists = 1;
 
     // When set, the target document must exist and have been last updated at
-    // that time.
+    // that time. Timestamp must be microsecond aligned.
     google.protobuf.Timestamp update_time = 2;
   }
 }
 
 // Options for creating a new transaction.
 message TransactionOptions {
   // Options for a transaction that can be used to read and write documents.
+  //
+  // Firestore does not allow 3rd party auth requests to create read-write.
+  // transactions.
   message ReadWrite {
     // An optional transaction to retry.
     bytes retry_transaction = 1;
@@ -68,7 +71,10 @@ message TransactionOptions {
     // consistency.
     oneof consistency_selector {
       // Reads documents at the given time.
-      // This may not be older than 60 seconds.
+      //
+      // This must be a microsecond precision timestamp within the past one
+      // hour, or if Point-in-Time Recovery is enabled, can additionally be a
+      // whole minute timestamp within the past 7 days.
       google.protobuf.Timestamp read_time = 2;
     }
   }