Skip to content

Commit 81c99ff

Browse files
chingor13renovate-botBenWhiteheadcloud-java-botrelease-please[bot]
authored
chore: migrate java-storage to monorepo (#12103)
Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com> Co-authored-by: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot <cloud-java-bot@google.com> Co-authored-by: Nidhi <nidhiii@google.com> Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com> Co-authored-by: Luwei Ge <lwge@google.com> Co-authored-by: Shreyas Sinha <shreyassinha@google.com> Co-authored-by: Dhriti Chopra <dhritichopra@google.com> Co-authored-by: Dhriti07 <56169283+Dhriti07@users.noreply.github.com> Co-authored-by: Diego Marquez <diegomarquezp@google.com> Co-authored-by: Tomo Suzuki <suztomo@google.com> Co-authored-by: Louis Christopher <louis9171@outlook.com> Co-authored-by: Joe Wang <joewa@google.com> Co-authored-by: Blake Li <blakeli@google.com>
2 parents 40ac6e4 + b4ba27d commit 81c99ff

File tree

984 files changed

+414844
-1
lines changed

Some content is hidden

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

984 files changed

+414844
-1
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/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

.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 {
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+
}
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/java8"
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>

generation/check_non_release_please_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1616
[[ "${pomFile}" =~ .*java-spanner.* ]] || \
1717
[[ "${pomFile}" =~ .*java-spanner-jdbc.* ]] || \
1818
[[ "${pomFile}" =~ .*google-auth-library-java.* ]] || \
19+
[[ "${pomFile}" =~ .*java-storage.* ]] || \
1920
[[ "${pomFile}" =~ .*.github*. ]]; then
2021
continue
2122
fi

generation_config.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,6 +2524,28 @@ libraries:
25242524
- proto_path: google/cloud/speech/v1
25252525
- proto_path: google/cloud/speech/v1p1beta1
25262526
- proto_path: google/cloud/speech/v2
2527+
- api_shortname: storage
2528+
name_pretty: Cloud Storage
2529+
product_documentation: https://cloud.google.com/storage
2530+
client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/history
2531+
api_description: 'is a durable and highly available object storage service. Google
2532+
Cloud Storage is almost infinitely scalable and guarantees consistency: when a
2533+
write succeeds, the latest copy of the object will be returned to any GET, globally.'
2534+
issue_tracker: https://issuetracker.google.com/savedsearches/559782
2535+
release_level: stable
2536+
language: java
2537+
distribution_name: com.google.cloud:google-cloud-storage
2538+
codeowner_team: '@googleapis/gcs-team'
2539+
api_id: storage.googleapis.com
2540+
requires_billing: true
2541+
library_type: GAPIC_COMBO
2542+
extra_versioned_modules: gapic-google-cloud-storage-v2
2543+
excluded_poms: google-cloud-storage-bom,google-cloud-storage
2544+
recommended_package: com.google.cloud.storage
2545+
transport: rest
2546+
GAPICs:
2547+
- proto_path: google/storage/v2
2548+
- proto_path: google/storage/control/v2
25272549
- api_shortname: storagetransfer
25282550
name_pretty: Storage Transfer Service
25292551
product_documentation: https://cloud.google.com/storage-transfer-service

java-storage/.OwlBot-hermetic.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
deep-preserve-regex:
16+
- /java-storage/google-.*/src/test/java/com/google/storage/control/v2/ITFoldersTest.java
17+
deep-remove-regex:
18+
- /java-storage/grpc-google-.*/src
19+
- /java-storage/proto-google-.*/src
20+
- /java-storage/gapic-google-.*/src
21+
- /java-storage/google-cloud-storage-control/src
22+
deep-copy-regex:
23+
- source: /google/storage/v2/.*-java/proto-google-.*/src
24+
dest: /owl-bot-staging/java-storage/v2/proto-google-cloud-storage-v2/src
25+
- source: /google/storage/v2/.*-java/grpc-google-.*/src
26+
dest: /owl-bot-staging/java-storage/v2/grpc-google-cloud-storage-v2/src
27+
- source: /google/storage/v2/.*-java/gapic-google-.*/src
28+
dest: /owl-bot-staging/java-storage/v2/gapic-google-cloud-storage-v2/src
29+
- source: /google/storage/v2/.*-java/gapic-google-.*/src/main/java/com/google/storage/v2/gapic_metadata.json
30+
dest: /owl-bot-staging/java-storage/v2/gapic-google-cloud-storage-v2/src/main/resources/com/google/storage/v2/gapic_metadata.json
31+
- source: /google/storage/control/v2/.*-java/proto-google-.*/src
32+
dest: /owl-bot-staging/java-storage/v2/proto-google-cloud-storage-control-v2/src
33+
- source: /google/storage/control/v2/.*-java/grpc-google-.*/src
34+
dest: /owl-bot-staging/java-storage/v2/grpc-google-cloud-storage-control-v2/src
35+
- source: /google/storage/control/v2/.*-java/gapic-google-.*/src
36+
dest: /owl-bot-staging/java-storage/v2/google-cloud-storage-control/src
37+
- source: /google/storage/control/v2/.*-java/gapic-google-.*/src/main/java/com/google/storage/control/v2/gapic_metadata.json
38+
dest: /owl-bot-staging/java-storage/v2/google-cloud-storage-control/src/main/resources/com/google/storage/control/v2/gapic_metadata.json

0 commit comments

Comments
 (0)