Skip to content

Commit

Permalink
Merged changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
gunjan-juyal committed Feb 4, 2024
2 parents 18a4e86 + 5ee5540 commit 7ccfeb2
Show file tree
Hide file tree
Showing 612 changed files with 176,080 additions and 14,319 deletions.
6 changes: 3 additions & 3 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:3a95f1b9b1102865ca551b76be51d2bdb850900c4db2f6d79269e7af81ac8f84
# created: 2023-07-27T18:37:44.251188775Z
digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc
# created: 2024-01-22T14:14:20.913785597Z
6 changes: 6 additions & 0 deletions .github/.OwlBot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ deep-copy-regex:
dest: "/owl-bot-staging/$1/grpc-google-cloud-spanner-admin-instance-$1/src"
- source: "/google/spanner/admin/instance/(v.*)/.*-java/gapic-google-.*/src"
dest: "/owl-bot-staging/$1/google-cloud-spanner/src/"
- source: "/google/spanner/executor/(v.*)/.*-java/proto-google-.*/src"
dest: "/owl-bot-staging/$1/proto-google-cloud-spanner-executor-$1/src"
- source: "/google/spanner/executor/(v.*)/.*-java/grpc-google-.*/src"
dest: "/owl-bot-staging/$1/grpc-google-cloud-spanner-executor-$1/src"
- source: "/google/spanner/executor/(v.*)/.*-java/gapic-google-.*/src"
dest: "/owl-bot-staging/$1/google-cloud-spanner-executor/src/"
16 changes: 8 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [11, 17]
java: [11, 17, 21]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
Expand All @@ -41,7 +41,7 @@ jobs:
name: "units (8)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
java-version: 8
Expand All @@ -58,7 +58,7 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
java-version: 8
Expand All @@ -81,7 +81,7 @@ jobs:
matrix:
java: [17]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
Expand All @@ -91,7 +91,7 @@ jobs:
javadoc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
Expand All @@ -103,7 +103,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
Expand All @@ -115,7 +115,7 @@ jobs:
clirr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-against-emulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- 9020:9020

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/renovate_config_check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Renovate Bot Config Validation

on:
pull_request:
paths:
- 'renovate.json'

jobs:
renovate_bot_config_validation:
runs-on: ubuntu-22.04

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

- name: Install Renovate and Config Validator
run: |
npm install -g npm@latest
npm install --global renovate
renovate-config-validator
6 changes: 3 additions & 3 deletions .github/workflows/samples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
checkstyle:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-java@v1
with:
java-version: 8
Expand All @@ -16,7 +16,7 @@ jobs:
name: "compile (8)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
# Java 11 to generate class file targeting Java 8
Expand All @@ -38,7 +38,7 @@ jobs:
matrix:
java: [11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
java-version: ${{matrix.java}}
Expand Down
6 changes: 3 additions & 3 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ javadoc)
mvn javadoc:javadoc javadoc:test-javadoc
RETURN_CODE=$?
;;
integration)
integration|integration-directpath-enabled)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Penable-integration-tests \
Expand All @@ -94,7 +94,7 @@ integration)
verify
RETURN_CODE=$?
;;
integration-cloud-devel)
integration-cloud-devel|integration-cloud-devel-directpath-enabled)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Penable-integration-tests \
Expand All @@ -110,7 +110,7 @@ integration-cloud-devel)
verify
RETURN_CODE=$?
;;
integration-cloud-staging)
integration-cloud-staging|integration-cloud-staging-directpath-enabled)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Penable-integration-tests \
Expand Down
32 changes: 32 additions & 0 deletions .kokoro/continuous/integration-cloud-devel-directpath-enabled.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "integration-cloud-devel-directpath-enabled"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-client-testing"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}

env_vars: {
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
value: "true"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "integration-cloud-staging-directpath-enabled"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-client-testing"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}

env_vars: {
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
value: "true"
}
51 changes: 0 additions & 51 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,54 +65,3 @@ if [ ! -z "${JAVA8_HOME}" ]; then
fi

mvn -B dependency:analyze -DfailOnWarning=true

echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
## Run dependency list completeness check
function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt

# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt

# Compare two dependency lists
msg "Comparing dependency lists..."
diff .org-list.txt .new-list.txt >.diff.txt
if [[ $? == 0 ]]
then
msg "Success. No diff!"
else
msg "Diff found. See below: "
msg "You can also check .diff.txt file located in $1."
cat .diff.txt
return 1
fi
}

# Allow failures to continue running the script
set +e

error_count=0
for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
pushd "$dir"
completenessCheck "$dir"
error_count=$(($error_count + $?))
popd
done

if [[ $error_count == 0 ]]
then
msg "All checks passed."
exit 0
else
msg "Errors found. See log statements above."
exit 1
fi
28 changes: 28 additions & 0 deletions .kokoro/nightly/integration-cloud-devel-directpath-enabled.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "integration-cloud-devel-directpath-enabled"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-client-testing"
}

env_vars: {
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
value: "true"
}

27 changes: 27 additions & 0 deletions .kokoro/nightly/integration-cloud-staging-directpath-enabled.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "integration-cloud-staging-directpath-enabled"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-client-testing"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-client-testing"
}

env_vars: {
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
value: "true"
}
42 changes: 42 additions & 0 deletions .kokoro/nightly/integration-directpath-enabled.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "integration-directpath-enabled"
}
# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}

env_vars: {
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
value: "true"
}
Loading

0 comments on commit 7ccfeb2

Please sign in to comment.