Skip to content

Commit f810e8e

Browse files
committed
build: remove logic to normalize the repo-metadata values
1 parent 6cf0567 commit f810e8e

3 files changed

Lines changed: 4 additions & 13 deletions

File tree

sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
157157

158158
{% if metadata['repo']['transport'] == 'grpc' -%}
159159
{{metadata['repo']['name_pretty']}} uses gRPC for the transport layer.
160-
{% elif metadata['repo']['transport'] == 'http' -%}
160+
{% elif metadata['repo']['transport'] == 'http' or metadata['repo']['transport'] == 'rest' -%}
161161
{{metadata['repo']['name_pretty']}} uses HTTP/JSON for the transport layer.
162-
{% elif metadata['repo']['transport'] == 'both' -%}
162+
{% elif metadata['repo']['transport'] == 'both' or metadata['repo']['transport'] == 'grpc+rest' -%}
163163
{{metadata['repo']['name_pretty']}} uses both gRPC and HTTP/JSON for the transport layer.
164164
{% endif %}
165165
{% endif -%}

sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-custom-transport-golden.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"api_description": "allows you to encrypt, store, manage, and audit infrastructure and application-level secrets.",
66
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-secretmanager/latest/overview",
77
"release_level": "preview",
8-
"transport": "http",
8+
"transport": "rest",
99
"language": "java",
1010
"repo": "googleapis/google-cloud-java",
1111
"repo_short": "java-secretmanager",

sdk-platform-java/hermetic_build/library_generation/utils/utilities.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,23 +232,14 @@ def generate_postprocessing_prerequisite_files(
232232
else f"https://cloud.google.com/{language}/docs/reference/{artifact_id}/latest/overview"
233233
)
234234

235-
# The mapping is needed because transport in .repo-metadata.json
236-
# is one of grpc, http and both,
237-
if transport == "grpc":
238-
converted_transport = "grpc"
239-
elif transport == "rest":
240-
converted_transport = "http"
241-
else:
242-
converted_transport = "both"
243-
244235
repo_metadata = {
245236
"api_shortname": library.api_shortname,
246237
"name_pretty": library.name_pretty,
247238
"product_documentation": library.product_documentation,
248239
"api_description": library.api_description,
249240
"client_documentation": client_documentation,
250241
"release_level": library.release_level,
251-
"transport": converted_transport,
242+
"transport": transport,
252243
"language": language,
253244
"repo": repo,
254245
"repo_short": f"{language}-{library_name}",

0 commit comments

Comments
 (0)