Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove google/shopping/type/types.proto when generating shopping APIs #2554

Merged
merged 3 commits into from
Mar 13, 2024
Merged

chore: remove google/shopping/type/types.proto when generating shopping APIs #2554

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70e028d
chore: remove google/shopping/type/types.proto when generating shoppi…
JoeWang1127 Mar 11, 2024
8a9d237
Merge branch 'main' into chore/remove-shopping-type
JoeWang1127 Mar 12, 2024
f8af744
Merge branch 'main' into chore/remove-shopping-type
JoeWang1127 Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions library_generation/generate_library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,6 @@ case "${proto_path}" in
removed_proto="google/rpc/http.proto"
proto_files="${proto_files//${removed_proto}/}"
;;
"google/shopping"*)
# this proto is included in //google/shopping/css/v1:google-cloud-shopping-css-v1-java
# and //google/shopping/merchant/inventories/v1beta:google-cloud-merchant-inventories-v1beta-java
# and //google/shopping/merchant/reports/v1beta:google-cloud-merchant-reports-v1beta-java
proto_files="${proto_files} google/shopping/type/types.proto"
;;
esac
# download gapic-generator-java, protobuf and grpc plugin.
download_tools "${gapic_generator_version}" "${protobuf_version}" "${grpc_version}" "${os_architecture}"
Expand Down Expand Up @@ -284,8 +278,7 @@ case "${proto_path}" in
esac
# copy proto files to proto-*/src/main/proto
for proto_src in ${proto_files}; do
if [[ "${proto_src}" == "google/cloud/common/operation_metadata.proto" ]] ||
[[ "${proto_src}" == "google/shopping/type/types.proto" ]]; then
if [[ "${proto_src}" == "google/cloud/common/operation_metadata.proto" ]]; then
continue
fi
mkdir -p "${temp_destination_path}/proto-${folder_name}/src/main/proto"
Expand Down
Loading