Skip to content

dataconnect: ci: upgrade data connect emulator to 15.0.0 (was 14.27.0) and firebase-tools to 15.0.0 (was 14.27.0) #7608

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.

Sign up for GitHub

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

Merged
dconeybe merged 3 commits into from
Dec 16, 2025
Merged

dataconnect: ci: upgrade data connect emulator to 15.0.0 (was 14.27.0) and firebase-tools to 15.0.0 (was 14.27.0) #7608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f8aa08
dataconnect: ci: upgrade data connect emulator to 15.0.0 (was 14.27.0…
dconeybe Dec 15, 2025
9290407
fix build due to naming differences in generated kotlin code in v3.0.0
dconeybe Dec 15, 2025
7b9a09f
Empty commit to re-trigger GitHub Actions
dconeybe Dec 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/dataconnect.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.27.0' }}
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.0' }}
FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dataconnect_demo_app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

env:
FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.27.0' }}
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.0' }}
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase
Expand Down
34 changes: 14 additions & 20 deletions ...est/kotlin/com/google/firebase/dataconnect/connectors/demo/KeyVariablesIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() {

val key = connector.insertPrimaryKeyIsInt64.execute(foo = id, value = value).data.key

val queryResult = connector.getPrimaryKeyIsInt64byKey.execute(key)
val queryResult = connector.getPrimaryKeyIsInt64ByKey.execute(key)
queryResult.data.primaryKeyIsInt64 shouldBe
GetPrimaryKeyIsInt64byKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value)
GetPrimaryKeyIsInt64ByKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value)
}

@Test
Expand Down Expand Up @@ -160,44 +160,38 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() {
val nested6 = createPrimaryKeyNested6(nested3.key, nested4.key)
val nested7 = createPrimaryKeyNested7(nested5a.key, nested5b.key, nested6.key)

val queryResult = connector.getPrimaryKeyNested7byKey.execute(nested7.key)
val queryResult = connector.getPrimaryKeyNested7ByKey.execute(nested7.key)

queryResult.data shouldBe
GetPrimaryKeyNested7byKeyQuery.Data(
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7(
GetPrimaryKeyNested7ByKeyQuery.Data(
GetPrimaryKeyNested7ByKeyQuery.Data.Key(
nested7.value,
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a(
nested5a.value,
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested1(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested1(
nested1s[0].key.id,
nested1s[0].value
),
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested2(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested2(
nested2s[0].key.id,
nested2s[0].value
),
),
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b(
nested5b.value,
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested1(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested1(
nested1s[1].key.id,
nested1s[1].value
),
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested2(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested2(
nested2s[1].key.id,
nested2s[1].value
),
),
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6(
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6(
nested6.value,
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested3(
nested3.key.id,
nested3.value
),
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested4(
nested4.key.id,
nested4.value
),
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested3(nested3.key.id, nested3.value),
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested4(nested4.key.id, nested4.value),
),
)
)
Expand Down
34 changes: 17 additions & 17 deletions ...st/kotlin/com/google/firebase/dataconnect/connectors/demo/NestedStructsIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,80 +35,80 @@ class NestedStructsIntegrationTest : DemoConnectorIntegrationTestBase() {
val nested1a = createNested1(nested1 = null, nested2Keys)
val nested1b = createNested1(nested1 = nested1a.key, nested2Keys)

val queryResult = connector.getNested1byKey.execute(nested1b.key)
val queryResult = connector.getNested1ByKey.execute(nested1b.key)

queryResult.data shouldBe
GetNested1byKeyQuery.Data(
GetNested1byKeyQuery.Data.Nested1(
GetNested1ByKeyQuery.Data(
GetNested1ByKeyQuery.Data.Nested1(
id = nested1b.key.id,
nested1 =
GetNested1byKeyQuery.Data.Nested1.Nested1(
GetNested1ByKeyQuery.Data.Nested1.Nested1(
id = nested1a.key.id,
nested1 = null,
nested2 =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2(
id = nested2s[0].key.id,
value = nested2s[0].value,
nested3 =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3(
id = nested3s[0].key.id,
value = nested3s[0].value,
),
nested3NullableNull = null,
nested3NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3NullableNonNull(
id = nested3s[1].key.id,
value = nested3s[1].value,
),
),
nested2NullableNull = null,
nested2NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull(
id = nested2s[1].key.id,
value = nested2s[1].value,
nested3 =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull.Nested3(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull.Nested3(
id = nested3s[2].key.id,
value = nested3s[2].value,
),
nested3NullableNull = null,
nested3NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull
.Nested3nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull
.Nested3NullableNonNull(
id = nested3s[3].key.id,
value = nested3s[3].value,
),
),
),
nested2 =
GetNested1byKeyQuery.Data.Nested1.Nested2(
GetNested1ByKeyQuery.Data.Nested1.Nested2(
id = nested2s[2].key.id,
value = nested2s[2].value,
nested3 =
GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3(
GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3(
id = nested3s[4].key.id,
value = nested3s[4].value,
),
nested3NullableNull = null,
nested3NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3NullableNonNull(
id = nested3s[5].key.id,
value = nested3s[5].value,
),
),
nested2NullableNull = null,
nested2NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull(
id = nested2s[3].key.id,
value = nested2s[3].value,
nested3 =
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3(
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3(
id = nested3s[6].key.id,
value = nested3s[6].value,
),
nested3NullableNull = null,
nested3NullableNonNull =
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3nullableNonNull(
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3NullableNonNull(
id = nested3s[7].key.id,
value = nested3s[7].value,
),
Expand Down
36 changes: 18 additions & 18 deletions .../com/google/firebase/dataconnect/connectors/demo/ScalarVariablesAndDataIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
runTest(timeout = 60.seconds) {
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
val insertResult =
connector.insertInt64variants.execute(
connector.insertInt64Variants.execute(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -769,9 +769,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = Long.MIN_VALUE
}

val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
queryResult.data.int64Variants shouldBe
GetInt64variantsByKeyQuery.Data.Int64variants(
GetInt64VariantsByKeyQuery.Data.Int64Variants(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -790,11 +790,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
@Test
fun insertInt64VariantsWithDefaultValues() =
runTest(timeout = 60.seconds) {
val insertResult = connector.insertInt64variantsWithHardcodedDefaults.execute {}
val insertResult = connector.insertInt64VariantsWithHardcodedDefaults.execute {}

val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
queryResult.data.int64Variants shouldBe
GetInt64variantsByKeyQuery.Data.Int64variants(
GetInt64VariantsByKeyQuery.Data.Int64Variants(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = HardcodedValues.NON_NULL_POSITIVE_LONG,
nonNullWithNegativeValue = HardcodedValues.NON_NULL_NEGATIVE_LONG,
Expand All @@ -814,7 +814,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
runTest(timeout = 60.seconds) {
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
val insertResult =
connector.insertInt64variants.execute(
connector.insertInt64Variants.execute(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -829,7 +829,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = Long.MIN_VALUE
}

connector.updateInt64variantsByKey.execute(insertResult.data.key) {
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {
nonNullWithZeroValue = Long.MAX_VALUE
nonNullWithPositiveValue = Long.MIN_VALUE
nonNullWithNegativeValue = 0
Expand All @@ -843,9 +843,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = longs.positiveValue5
}

val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
queryResult.data.int64Variants shouldBe
GetInt64variantsByKeyQuery.Data.Int64variants(
GetInt64VariantsByKeyQuery.Data.Int64Variants(
nonNullWithZeroValue = Long.MAX_VALUE,
nonNullWithPositiveValue = Long.MIN_VALUE,
nonNullWithNegativeValue = 0,
Expand All @@ -866,7 +866,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
runTest(timeout = 60.seconds) {
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
val insertResult =
connector.insertInt64variants.execute(
connector.insertInt64Variants.execute(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -881,7 +881,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = Long.MIN_VALUE
}

connector.updateInt64variantsByKey.execute(insertResult.data.key) {
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {
nullableWithNullValue = null
nullableWithZeroValue = null
nullableWithPositiveValue = null
Expand All @@ -890,9 +890,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = null
}

val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
queryResult.data.int64Variants shouldBe
GetInt64variantsByKeyQuery.Data.Int64variants(
GetInt64VariantsByKeyQuery.Data.Int64Variants(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -913,7 +913,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
runTest(timeout = 60.seconds) {
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
val insertResult =
connector.insertInt64variants.execute(
connector.insertInt64Variants.execute(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand All @@ -928,11 +928,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
nullableWithMinValue = Long.MIN_VALUE
}

connector.updateInt64variantsByKey.execute(insertResult.data.key) {}
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {}

val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
queryResult.data.int64Variants shouldBe
GetInt64variantsByKeyQuery.Data.Int64variants(
GetInt64VariantsByKeyQuery.Data.Int64Variants(
nonNullWithZeroValue = 0,
nonNullWithPositiveValue = longs.positiveValue1,
nonNullWithNegativeValue = longs.negativeValue1,
Expand Down
Loading
Loading