Skip to content

Commit ac9605b

Browse files
JoeWang1127JoeWang1127
authored
chore: remove maven latest version (#3383)
In this PR: - Remove functions to get latest library version from Maven Central
1 parent 75dcb96 commit ac9605b

File tree

10 files changed

+10
-233
lines changed

10 files changed

+10
-233
lines changed

‎hermetic_build/library_generation/owlbot/synthtool/languages/java.py

-35
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import os
1616
import xml.etree.ElementTree as ET
1717
import re
18-
import requests
1918
import yaml
2019
import synthtool as s
2120
import synthtool.gcp as gcp
@@ -123,30 +122,6 @@ def fix_grpc_headers(grpc_root: Path, package_name: str = "unused") -> None:
123122
)
124123

125124

126-
def latest_maven_version(group_id: str, artifact_id: str) -> Optional[str]:
127-
"""Helper function to find the latest released version of a Maven artifact.
128-
129-
Fetches metadata from Maven Central and parses out the latest released
130-
version.
131-
132-
Args:
133-
group_id (str): The groupId of the Maven artifact
134-
artifact_id (str): The artifactId of the Maven artifact
135-
136-
Returns:
137-
The latest version of the artifact as a string or None
138-
"""
139-
group_path = "/".join(group_id.split("."))
140-
url = (
141-
f"https://repo1.maven.org/maven2/{group_path}/{artifact_id}/maven-metadata.xml"
142-
)
143-
response = requests.get(url)
144-
if response.status_code >= 400:
145-
return "0.0.0"
146-
147-
return version_from_maven_metadata(response.text)
148-
149-
150125
def version_from_maven_metadata(metadata: str) -> Optional[str]:
151126
"""Helper function to parse the latest released version from the Maven
152127
metadata XML file.
@@ -200,16 +175,6 @@ def _common_template_metadata() -> Dict[str, Any]:
200175
repo_metadata = common._load_repo_metadata()
201176
if repo_metadata:
202177
metadata["repo"] = repo_metadata
203-
group_id, artifact_id = repo_metadata["distribution_name"].split(":")
204-
205-
metadata["latest_version"] = latest_maven_version(
206-
group_id=group_id, artifact_id=artifact_id
207-
)
208-
209-
metadata["latest_bom_version"] = latest_maven_version(
210-
group_id="com.google.cloud",
211-
artifact_id="libraries-bom",
212-
)
213178

214179
metadata["samples"] = samples.all_samples(["samples/**/src/main/java/**/*.java"])
215180
metadata["snippets"] = snippets.all_snippets(

‎hermetic_build/library_generation/owlbot/templates/java_library/samples/install-without-bom/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%}
22
{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%}
3+
{% set version = metadata['library_version'] -%}
34
<?xml version='1.0' encoding='UTF-8'?>
45
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
56
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +32,7 @@
3132
<dependency>
3233
<groupId>{{ group_id }}</groupId>
3334
<artifactId>{{ artifact_id }}</artifactId>
34-
<version>{{ metadata['latest_version'] }}</version>
35+
<version>{{ version }}</version>
3536
</dependency>
3637
<!-- [END {{metadata['repo']['name']}}_install_without_bom] -->
3738

‎hermetic_build/library_generation/owlbot/templates/java_library/samples/snapshot/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%}
22
{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%}
3+
{% set version = metadata['library_version'] -%}
34
<?xml version='1.0' encoding='UTF-8'?>
45
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
56
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +31,7 @@
3031
<dependency>
3132
<groupId>{{ group_id }}</groupId>
3233
<artifactId>{{ artifact_id }}</artifactId>
33-
<version>{{ metadata['latest_version'] }}</version>
34+
<version>{{ version }}</version>
3435
</dependency>
3536
<!-- {x-version-update-end} -->
3637

‎hermetic_build/library_generation/owlbot/templates/java_library/samples/snippets/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%}
22
{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%}
3+
{% set version = metadata['library_version'] -%}
34
<?xml version='1.0' encoding='UTF-8'?>
45
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
56
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +31,7 @@
3031
<dependency>
3132
<groupId>{{ group_id }}</groupId>
3233
<artifactId>{{ artifact_id }}</artifactId>
33-
<version>{{ metadata['latest_version'] }}</version>
34+
<version>{{ version }}</version>
3435
</dependency>
3536

3637
<dependency>

‎hermetic_build/library_generation/requirements.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ attrs==24.2.0
22
click==8.1.7
33
jinja2==3.1.4
44
lxml==5.3.0
5-
PyYAML==6.0.2
6-
requests==2.32.3
7-
requests-mock==1.12.1
5+
PyYAML==6.0.2

‎hermetic_build/library_generation/requirements.txt

-129
Original file line numberDiff line numberDiff line change
@@ -8,125 +8,10 @@ attrs==24.2.0 \
88
--hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
99
--hash=sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2
1010
# via -r hermetic_build/library_generation/requirements.in
11-
certifi==2024.8.30 \
12-
--hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
13-
--hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
14-
# via requests
15-
charset-normalizer==3.4.0 \
16-
--hash=sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621 \
17-
--hash=sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6 \
18-
--hash=sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8 \
19-
--hash=sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912 \
20-
--hash=sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c \
21-
--hash=sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b \
22-
--hash=sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d \
23-
--hash=sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d \
24-
--hash=sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95 \
25-
--hash=sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e \
26-
--hash=sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565 \
27-
--hash=sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64 \
28-
--hash=sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab \
29-
--hash=sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be \
30-
--hash=sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e \
31-
--hash=sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907 \
32-
--hash=sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0 \
33-
--hash=sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2 \
34-
--hash=sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62 \
35-
--hash=sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62 \
36-
--hash=sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23 \
37-
--hash=sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc \
38-
--hash=sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284 \
39-
--hash=sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca \
40-
--hash=sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455 \
41-
--hash=sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858 \
42-
--hash=sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b \
43-
--hash=sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594 \
44-
--hash=sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc \
45-
--hash=sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db \
46-
--hash=sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b \
47-
--hash=sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea \
48-
--hash=sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6 \
49-
--hash=sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920 \
50-
--hash=sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749 \
51-
--hash=sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7 \
52-
--hash=sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd \
53-
--hash=sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99 \
54-
--hash=sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242 \
55-
--hash=sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee \
56-
--hash=sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129 \
57-
--hash=sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2 \
58-
--hash=sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51 \
59-
--hash=sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee \
60-
--hash=sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8 \
61-
--hash=sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b \
62-
--hash=sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613 \
63-
--hash=sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742 \
64-
--hash=sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe \
65-
--hash=sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3 \
66-
--hash=sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5 \
67-
--hash=sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631 \
68-
--hash=sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7 \
69-
--hash=sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15 \
70-
--hash=sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c \
71-
--hash=sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea \
72-
--hash=sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417 \
73-
--hash=sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250 \
74-
--hash=sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88 \
75-
--hash=sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca \
76-
--hash=sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa \
77-
--hash=sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99 \
78-
--hash=sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149 \
79-
--hash=sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41 \
80-
--hash=sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574 \
81-
--hash=sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0 \
82-
--hash=sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f \
83-
--hash=sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d \
84-
--hash=sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654 \
85-
--hash=sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3 \
86-
--hash=sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19 \
87-
--hash=sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90 \
88-
--hash=sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578 \
89-
--hash=sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9 \
90-
--hash=sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1 \
91-
--hash=sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51 \
92-
--hash=sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719 \
93-
--hash=sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236 \
94-
--hash=sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a \
95-
--hash=sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c \
96-
--hash=sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade \
97-
--hash=sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944 \
98-
--hash=sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc \
99-
--hash=sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6 \
100-
--hash=sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6 \
101-
--hash=sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27 \
102-
--hash=sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6 \
103-
--hash=sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2 \
104-
--hash=sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12 \
105-
--hash=sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf \
106-
--hash=sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114 \
107-
--hash=sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7 \
108-
--hash=sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf \
109-
--hash=sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d \
110-
--hash=sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b \
111-
--hash=sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed \
112-
--hash=sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03 \
113-
--hash=sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4 \
114-
--hash=sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67 \
115-
--hash=sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365 \
116-
--hash=sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a \
117-
--hash=sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748 \
118-
--hash=sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b \
119-
--hash=sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079 \
120-
--hash=sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482
121-
# via requests
12211
click==8.1.7 \
12312
--hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
12413
--hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
12514
# via -r hermetic_build/library_generation/requirements.in
126-
idna==3.10 \
127-
--hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
128-
--hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
129-
# via requests
13015
jinja2==3.1.4 \
13116
--hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \
13217
--hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
@@ -389,17 +274,3 @@ pyyaml==6.0.2 \
389274
--hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
390275
--hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
391276
# via -r hermetic_build/library_generation/requirements.in
392-
requests==2.32.3 \
393-
--hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
394-
--hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
395-
# via
396-
# -r hermetic_build/library_generation/requirements.in
397-
# requests-mock
398-
requests-mock==1.12.1 \
399-
--hash=sha256:b1e37054004cdd5e56c84454cc7df12b25f90f382159087f4b6915aaeef39563 \
400-
--hash=sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401
401-
# via -r hermetic_build/library_generation/requirements.in
402-
urllib3==2.2.3 \
403-
--hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
404-
--hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
405-
# via requests

‎hermetic_build/library_generation/tests/integration_tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"google-cloud-java": "chore/test-hermetic-build",
4444
"java-bigtable": "chore/test-hermetic-build",
4545
}
46-
current_config_name = "current_generation_config.yaml"
46+
generation_config_name = "generation_config.yaml"
4747
googleapis_commitish = "113a378d5aad5018876ec0a8cbfd4d6a4f746809"
4848
# This variable is used to override the jar created by building the image
4949
# with our own downloaded jar in order to lock the integration test to use
@@ -87,7 +87,7 @@ def test_entry_point_running_in_container(self):
8787
self.__run_entry_point_in_docker_container(
8888
repo_location=repo_location,
8989
config_location=config_location,
90-
generation_config=current_config_name,
90+
generation_config=generation_config_name,
9191
api_definition=api_definitions_path,
9292
)
9393
# 4. compare generation result with golden files
@@ -328,7 +328,7 @@ def __get_config_files(cls, path: str) -> list[tuple[str, str]]:
328328
repo = sub_dir.name
329329
if repo in ["golden", "java-bigtable"]:
330330
continue
331-
config = f"{sub_dir}/{current_config_name}"
331+
config = f"{sub_dir}/{generation_config_name}"
332332
config_files.append((repo, config))
333333
return config_files
334334

‎hermetic_build/library_generation/tests/owlbot/java_unit_tests.py

-14
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import yaml
2323
from pathlib import Path
24-
import requests_mock
2524
from synthtool.languages import java
2625
from library_generation.tests.owlbot import util
2726

@@ -69,19 +68,6 @@ class JavaUnitTests(unittest.TestCase):
6968
def test_version_from_maven_metadata(self):
7069
self.assertEqual("3.3.0", java.version_from_maven_metadata(SAMPLE_METADATA))
7170

72-
def test_latest_maven_version(self):
73-
with requests_mock.Mocker() as m:
74-
m.get(
75-
"https://repo1.maven.org/maven2/com/google/cloud/libraries-bom/maven-metadata.xml",
76-
text=SAMPLE_METADATA,
77-
)
78-
self.assertEqual(
79-
"3.3.0",
80-
java.latest_maven_version(
81-
group_id="com.google.cloud", artifact_id="libraries-bom"
82-
),
83-
)
84-
8571
@mock.patch.dict(os.environ, {"SYNTHTOOL_TEMPLATES": f"{TEMPLATES_PATH}"})
8672
def test_working_common_templates(self):
8773
def assert_valid_xml(file):

‎hermetic_build/library_generation/tests/resources/integration/google-cloud-java/baseline_generation_config.yaml

-45
This file was deleted.

0 commit comments

Comments
 (0)