Merge remote-tracking branch 'refs/remotes/origin/interval_support' into interval_support

Author: Sagar Agarwal

.github/CODEOWNERS

@@ -4,9 +4,5 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-spanner-java is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/api-spanner-java
-**/*.java               @googleapis/api-spanner-java
-
-# The java-samples-reviewers team is the default owner for samples changes
-samples/**/*.java       @googleapis/java-samples-reviewers @googleapis/api-spanner-java
+# The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/spanner-client-libraries-java

.github/release-please.yml

@@ -42,3 +42,7 @@ branches:
     bumpMinorPreMajor: true
     handleGHRelease: true
     branch: 6.66.x
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 6.88.x

.github/scripts/update_generation_config.sh

@@ -28,11 +28,23 @@ function update_config() {
     sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}"
 }
 
+# Update an action to a new version in GitHub action.
+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}"
+}
+
 # The parameters of this script is:
 # 1. base_branch, the base branch of the result pull request.
 # 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java
 # 3. [optional] generation_config, the path to the generation configuration,
 # the default value is generation_config.yaml in the repository root.
+# 4. [optional] workflow, the library generation workflow file,
+# the default value is .github/workflows/hermetic_library_generation.yaml.
 while [[ $# -gt 0 ]]; do
 key="$1"
 case "${key}" in
@@ -48,6 +60,10 @@ case "${key}" in
     generation_config="$2"
     shift
     ;;
+  --workflow)
+    workflow="$2"
+    shift
+    ;;
   *)
     echo "Invalid option: [$1]"
     exit 1
@@ -71,21 +87,34 @@ if [ -z "${generation_config}" ]; then
   echo "Use default generation config: ${generation_config}"
 fi
 
+if [ -z "${workflow}" ]; then
+    workflow=".github/workflows/hermetic_library_generation.yaml"
+    echo "Use default library generation workflow file: ${workflow}"
+fi
+
 current_branch="generate-libraries-${base_branch}"
 title="chore: Update generation configuration at $(date)"
 
-# try to find a open pull request associated with the branch
+git checkout "${base_branch}"
+# Try to find a open pull request associated with the branch
 pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
-# create a branch if there's no open pull request associated with the
+# Create a branch if there's no open pull request associated with the
 # branch; otherwise checkout the pull request.
 if [ -z "${pr_num}" ]; then
   git checkout -b "${current_branch}"
+  # Push the current branch to remote so that we can
+  # compare the commits later.
+  git push -u origin "${current_branch}"
 else
   gh pr checkout "${pr_num}"
 fi
 
+# Only allow fast-forward merging; exit with non-zero result if there's merging
+# conflict.
+git merge -m "chore: merge ${base_branch} into ${current_branch}" "${base_branch}"
+
 mkdir tmp-googleapis
-# use partial clone because only commit history is needed.
+# Use partial clone because only commit history is needed.
 git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis
 pushd tmp-googleapis
 git pull
@@ -94,25 +123,43 @@ popd
 rm -rf tmp-googleapis
 update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
 
-# update gapic-generator-java version to the latest
+# 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 libraries-bom version to the latest
+# Update composite action version to latest gapic-generator-java version
+update_action "googleapis/sdk-platform-java/.github/scripts" \
+  "${latest_version}" \
+  "${workflow}"
+
+# Update libraries-bom version to the latest
 latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom")
 update_config "libraries_bom_version" "${latest_version}" "${generation_config}"
 
-git add "${generation_config}"
+git add "${generation_config}" "${workflow}"
 changed_files=$(git diff --cached --name-only)
 if [[ "${changed_files}" == "" ]]; then
     echo "The latest generation config is not changed."
     echo "Skip committing to the pull request."
+else
+    git commit -m "${title}"
+fi
+
+# There are potentially at most two commits: merge commit and change commit.
+# We want to exit the script if no commit happens (otherwise this will be an
+# infinite loop).
+# `git cherry` is a way to find whether the local branch has commits that are
+# not in the remote branch.
+# If we find any such commit, push them to remote branch.
+unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l)
+if [[ "${unpushed_commit}" -eq 0 ]]; then
+    echo "No unpushed commits, exit"
     exit 0
 fi
-git commit -m "${title}"
+
 if [ -z "${pr_num}" ]; then
   git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git"
-  git fetch -q --unshallow remote_repo
+  git fetch -q remote_repo
   git push -f remote_repo "${current_branch}"
   gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}"
 else

.github/sync-repo-settings.yaml

@@ -21,6 +21,8 @@ branchProtectionRules:
       - compile (11)
       - units-with-multiplexed-session (8)
       - units-with-multiplexed-session (11)
+      - unmanaged_dependency_check
+      - library_generation
   - pattern: 3.3.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -159,6 +161,27 @@ branchProtectionRules:
       - compile (11)
       - units-with-multiplexed-session (8)
       - units-with-multiplexed-session (11)
+  - pattern: 6.88.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - javadoc
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - 'Kokoro - Test: Integration with Multiplexed Sessions'
+      - cla/google
+      - checkstyle
+      - compile (8)
+      - compile (11)
+      - units-with-multiplexed-session (8)
+      - units-with-multiplexed-session (11)
+      - unmanaged_dependency_check
+      - library_generation
 permissionRules:
   - team: yoshi-admins
     permission: admin

.github/workflows/ci.yaml

@@ -53,6 +53,8 @@ jobs:
       env:
         JOB_TYPE: test
         GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"
@@ -92,6 +94,8 @@ jobs:
         env:
           JOB_TYPE: test
           GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
+          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
   windows:
     runs-on: windows-latest
     steps:

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml

@@ -39,4 +39,4 @@ jobs:
       env:
         JOB_TYPE: test
         SPANNER_EMULATOR_HOST: localhost:9010
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true

.github/workflows/unmanaged_dependency_check.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.37.0
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
         with:
           bom-path: google-cloud-spanner-bom/pom.xml

.kokoro/build.sh

@@ -113,8 +113,8 @@ integration-directpath-enabled)
       -Dclirr.skip=true \
       -Denforcer.skip=true \
       -Dmaven.main.skip=true \
-      -Dspanner.gce.config.project_id=gcloud-devel \
-      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-directpath \
+      -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \
+      -Dspanner.gce.config.project_id=span-cloud-testing \
       -fae \
       verify
     RETURN_CODE=$?
@@ -206,12 +206,17 @@ slowtests)
     verify
   RETURN_CODE=$?
   ;;
-samples)
+samples|samples-slow-tests)
     SAMPLES_DIR=samples
+    PROFILES=''
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
     if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
     then
       SAMPLES_DIR=samples/snapshot
+    elif [[ ${JOB_TYPE} = 'samples-slow-tests' ]]
+    then
+      SAMPLES_DIR=samples/snippets
+      PROFILES='-Pslow-tests,!integration-tests'
     fi
 
     if [[ -f ${SAMPLES_DIR}/pom.xml ]]
@@ -227,6 +232,7 @@ samples)
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
           -Denforcer.skip=true \
+          ${PROFILES} \
           -fae \
           verify
         RETURN_CODE=$?

.kokoro/continuous/integration-cloud-devel-directpath-enabled.cfg

@@ -27,6 +27,6 @@ env_vars: {
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
+    key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
 }

.kokoro/continuous/integration-cloud-staging-directpath-enabled.cfg

@@ -27,6 +27,6 @@ env_vars: {
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
+    key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
 }

.kokoro/continuous/java8.cfg

@@ -22,7 +22,6 @@ env_vars: {
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
+    key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
 }
-

.kokoro/nightly/integration-cloud-devel-directpath-enabled.cfg

@@ -22,6 +22,6 @@ env_vars: {
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
+    key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
 }

.kokoro/nightly/integration-cloud-staging-directpath-enabled.cfg

@@ -28,15 +28,15 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
+  value: "secret_manager/java-client-testing"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
+  value: "java-client-testing"
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
+    key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
 }

.kokoro/nightly/integration-directpath-enabled.cfg

@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "samples"
+  value: "samples-slow-tests"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
@@ -32,3 +32,8 @@ env_vars: {
   value: "java-it-service-account"
 }
 
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
+}
+

.kokoro/presubmit/java11-samples.cfg renamed to .kokoro/nightly/java11-samples-slow-tests.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.37.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0"
 }
 
 env_vars: {

.kokoro/nightly/java7.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.37.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0"
 }
 
 env_vars: {