Skip to content

Commit afad190

Browse files
Merge pull request #751 from microsoft/rc-psl-vulnerabilityfix
fix: update subprocess calls in script
2 parents 89a28a0 + a0ebe3d commit afad190

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

archive-doc-gen/scripts/auth_init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def add_client_secret(credential, app_id):
5959

6060

6161
def update_azd_env(name, val):
62-
subprocess.run(f"azd env set {name} {val}", shell=True)
62+
subprocess.run(["azd", "env", "set", name, val], shell=False, check=True)
6363

6464

6565
if __name__ == "__main__":

archive-doc-gen/scripts/data_preparation.py

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,15 @@ def create_or_update_search_index(
152152
if not admin_key:
153153
admin_key = json.loads(
154154
subprocess.run(
155-
f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
156-
shell=True,
155+
[
156+
"az", "search", "admin-key", "show",
157+
"--subscription", subscription_id,
158+
"--resource-group", resource_group,
159+
"--service-name", service_name
160+
],
161+
shell=False,
157162
capture_output=True,
163+
check=True,
158164
).stdout
159165
)["primaryKey"]
160166

@@ -312,9 +318,15 @@ def upload_documents_to_index(
312318
if not admin_key:
313319
admin_key = json.loads(
314320
subprocess.run(
315-
f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
316-
shell=True,
321+
[
322+
"az", "search", "admin-key", "show",
323+
"--subscription", subscription_id,
324+
"--resource-group", resource_group,
325+
"--service-name", service_name
326+
],
327+
shell=False,
317328
capture_output=True,
329+
check=True,
318330
).stdout
319331
)["primaryKey"]
320332

@@ -349,9 +361,15 @@ def validate_index(service_name, subscription_id, resource_group, index_name):
349361
api_version = "2024-03-01-Preview"
350362
admin_key = json.loads(
351363
subprocess.run(
352-
f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
353-
shell=True,
364+
[
365+
"az", "search", "admin-key", "show",
366+
"--subscription", subscription_id,
367+
"--resource-group", resource_group,
368+
"--service-name", service_name
369+
],
370+
shell=False,
354371
capture_output=True,
372+
check=True,
355373
).stdout
356374
)["primaryKey"]
357375

0 commit comments

Comments
 (0)