Skip to content

Commit d6cff5d

Browse files
blakeli0blakeli0
authored
Merge branch 'main' into observability/tracing-attr/gcp.client.service
2 parents 8d8addb + 6e99335 commit d6cff5d

File tree

4,186 files changed

+486158
-2486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,186 files changed

+486158
-2486
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1313
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1414
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team
15+
/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team

‎.github/requirements.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
requests==2.32.4
1+
requests==2.33.0

‎.github/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ idna==3.7 \
104104
--hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
105105
--hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
106106
# via requests
107-
requests==2.32.4 \
108-
--hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
109-
--hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
107+
requests==2.33.0 \
108+
--hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \
109+
--hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652
110110
# via -r requirements.in
111111
urllib3==2.6.3 \
112112
--hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ jobs:
9292
java-bigquery: java-bigquery/**
9393
java-bigquerystorage: java-bigquerystorage/**
9494
java-datastore: java-datastore/**
95-
java-logging: java-logging/**
9695
java-logging-logback: java-logging-logback/**
96+
java-logging: java-logging/**
9797
java-spanner: java-spanner/**
98+
java-storage: java-storage/**
9899
sdk-platform-java: sdk-platform-java/**
99100
split-units:
100101
runs-on: ubuntu-latest

‎.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ jobs:
8888
# Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory
8989
run: |
9090
if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
91-
../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
91+
../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
9292
else
93-
../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
93+
../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
9494
fi
9595
working-directory: sdk-platform-java/java-showcase

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,5 @@ monorepo
7878
*.tfstate.backup
7979
*.tfstate.*.backup
8080
*.tfstate.lock.info
81+
82+
.jqwik-database

‎.kokoro/common.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ excluded_modules=(
3232
'java-spanner'
3333
'java-spanner-jdbc'
3434
'google-auth-library-java'
35+
'java-storage'
3536
)
3637

3738
function retry_with_backoff {

‎.kokoro/presubmit/storage-graalvm-native-presubmit.cfg‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
38+
}
39+
env_vars: {
40+
key: "BUILD_SUBDIR"
41+
value: "java-storage"
42+
}

‎.kokoro/presubmit/storage-integration.cfg‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account,client-library-test-universe-domain-credential"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
38+
}
39+
40+
41+
env_vars: {
42+
key: "BUILD_SUBDIR"
43+
value: "java-storage"
44+
}

‎gapic-libraries-bom/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,13 @@
12631263
<type>pom</type>
12641264
<scope>import</scope>
12651265
</dependency>
1266+
<dependency>
1267+
<groupId>com.google.cloud</groupId>
1268+
<artifactId>google-cloud-storage-bom</artifactId>
1269+
<version>2.64.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1270+
<type>pom</type>
1271+
<scope>import</scope>
1272+
</dependency>
12661273
<dependency>
12671274
<groupId>com.google.cloud</groupId>
12681275
<artifactId>google-cloud-storage-transfer-bom</artifactId>

0 commit comments

Comments
 (0)