Skip to content

Commit c58fdb4

Browse files
msyycCopilot
andauthored
[sdk generation pipeline] rename _meta.json to _metadata.json (#41187)
* rename _meta.json to _metadata.json * format * Update tools/azure-sdk-tools/packaging_tools/generate_utils.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * update --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent aeb62b9 commit c58fdb4

File tree

3 files changed

+14
-39
lines changed

3 files changed

+14
-39
lines changed

tools/azure-sdk-tools/packaging_tools/generate_utils.py

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,14 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name,
132132
_LOGGER.info(f"Fail to save metadata since package folder doesn't exist: {package_folder}")
133133
return
134134
for_swagger_gen = "meta" in config
135-
metadata_folder = package_folder / "_meta.json"
136-
if metadata_folder.exists() and for_swagger_gen:
135+
# remove old _meta.json
136+
old_metadata_folder = package_folder / "_meta.json"
137+
if old_metadata_folder.exists():
138+
os.remove(old_metadata_folder)
139+
_LOGGER.info(f"Remove old metadata file: {old_metadata_folder}")
140+
141+
metadata_folder = package_folder / "_metadata.json"
142+
if metadata_folder.exists():
137143
with open(metadata_folder, "r") as file_in:
138144
metadata = json.load(file_in)
139145
else:
@@ -172,31 +178,11 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name,
172178

173179
_LOGGER.info("Metadata json:\n {}".format(json.dumps(metadata, indent=2)))
174180

175-
metadata_file_path = os.path.join(package_folder, "_meta.json")
176-
with open(metadata_file_path, "w") as writer:
181+
metadata_file_path = package_folder / "_metadata.json"
182+
with metadata_file_path.open("w") as writer:
177183
json.dump(metadata, writer, indent=2)
178184
_LOGGER.info(f"Saved metadata to {metadata_file_path}")
179185

180-
# Check whether MANIFEST.in includes _meta.json
181-
if "resource-manager" in input_readme:
182-
require_meta = "include _meta.json\n"
183-
manifest_file = os.path.join(package_folder, "MANIFEST.in")
184-
if not os.path.exists(manifest_file):
185-
_LOGGER.info(f"MANIFEST.in doesn't exist: {manifest_file}")
186-
return
187-
188-
includes = []
189-
write_flag = False
190-
with open(manifest_file, "r") as f:
191-
includes = f.readlines()
192-
if require_meta not in includes:
193-
includes = [require_meta] + includes
194-
write_flag = True
195-
196-
if write_flag:
197-
with open(manifest_file, "w") as f:
198-
f.write("".join(includes))
199-
200186

201187
@return_origin_path
202188
def judge_tag_preview(path: str, package_name: str) -> bool:
@@ -462,8 +448,8 @@ def gen_typespec(
462448

463449
with open(Path("eng/emitter-package.json"), "r") as file_in:
464450
data = json.load(file_in)
465-
npm_package_verstion = {
466-
typespec_python: data["dependencies"][typespec_python],
451+
npm_package_version = {
452+
"emitterVersion": data["dependencies"][typespec_python],
467453
}
468454

469-
return npm_package_verstion
455+
return npm_package_version

tools/azure-sdk-tools/packaging_tools/templates/packaging_files/MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
include _meta.json
21
recursive-include tests *.py *.json
32
recursive-include samples *.py *.md
43
include *.md

tools/azure-sdk-tools/tests/test_servicemetadata.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def test_metadata(self):
7272
self.config["projects"][readme_file] = {}
7373

7474
package_folder = Path(self.sdk_folder, self.folder_name, self.package_name).expanduser()
75-
metadata_file_path = os.path.join(package_folder, "_meta.json")
75+
metadata_file_path = os.path.join(package_folder, "_metadata.json")
7676
manifest_file = os.path.join(package_folder, "MANIFEST.in")
7777
os.makedirs(package_folder)
7878

@@ -125,10 +125,6 @@ def test_metadata(self):
125125

126126
assert os.path.isfile(metadata_file_path) == True
127127
assert os.path.isfile(manifest_file) == True
128-
with open(manifest_file, "r") as f:
129-
meta_line = "include _meta.json\n"
130-
line = f.readline()
131-
assert meta_line == line
132128

133129
# Test update MANIFEST.in again
134130
update_servicemetadata(
@@ -143,9 +139,3 @@ def test_metadata(self):
143139

144140
assert os.path.isfile(metadata_file_path) == True
145141
assert os.path.isfile(manifest_file) == True
146-
with open(manifest_file, "r") as f:
147-
meta_line = "include _meta.json\n"
148-
line = f.readline()
149-
second_line = f.readline()
150-
assert meta_line == line
151-
assert meta_line != second_line

0 commit comments

Comments
 (0)