fix: Fix sending of Pipeline options when running a Pipeline in a transaction

.github/scripts/update_generation_config.sh

@@ -48,13 +48,14 @@ function update_config() {
 }
 
 # Update an action to a new version in GitHub action.
+# the second argument must have the git tag (including "v").
 function update_action() {
     local key_word=$1
     local new_value=$2
     local file=$3
     echo "Update ${key_word} to ${new_value} in ${file}"
     # use a different delimiter because the key_word contains "/".
-    sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
+    sed -i -e "s|${key_word}@[^ ]*$|${key_word}@${new_value}|" "${file}"
 }
 
 # The parameters of this script is:
@@ -143,12 +144,16 @@ rm -rf tmp-googleapis
 update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
 
 # Update gapic-generator-java version to the latest
-latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
-update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
-
-# Update composite action version to latest gapic-generator-java version
-update_action "googleapis/sdk-platform-java/.github/scripts" \
-  "${latest_version}" \
+latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
+update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}"
+
+# Update the GitHub Actions reference to the latest.
+# After the google-cloud-java monorepo migration of sdk-platform-java,
+# we cannot rely on the gapic-generator-java version tag. Let's use
+# the shared dependencies BOM version
+latest_shared_dependencies_bom_version=$(get_latest_released_version "com.google.cloud" "google-cloud-shared-dependencies")
+update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \
+  "google-cloud-shared-dependencies/v${latest_shared_dependencies_bom_version}" \
   "${workflow}"
 
 # Update libraries-bom version to the latest

google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java

@@ -281,7 +281,7 @@ public ApiFuture<Pipeline.Snapshot> execute(
       @Nonnull Pipeline pipeline, @Nonnull PipelineExecuteOptions options) {
     Preconditions.checkState(isEmpty(), READ_BEFORE_WRITE_ERROR_MSG);
     try (TraceUtil.Scope ignored = transactionTraceContext.makeCurrent()) {
-      return pipeline.execute(new PipelineExecuteOptions(), transactionId, null);
+      return pipeline.execute(options, transactionId, null);
     }
   }
 }

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java

@@ -3883,7 +3883,11 @@ public void testPipelineInTransactionsWithOptions() throws Exception {
     firestore
         .runTransaction(
             transaction -> {
-              PipelineExecuteOptions options = new PipelineExecuteOptions().with("foo", "bar");
+              PipelineExecuteOptions options =
+                  new PipelineExecuteOptions()
+                      .withExplainOptions(
+                          new ExplainOptions()
+                              .withExecutionMode(ExplainOptions.ExecutionMode.ANALYZE));
               List<PipelineResult> results =
                   transaction.execute(pipeline, options).get().getResults();
               assertThat(results).hasSize(1);