Skip to content

Commit 0d4f64e

Browse files
XiaofeiCaoCopilot
andcommitted
[Java] Replace Maven Central with Azure Artifacts feed in automation scripts
- Updated MAVEN_HOST in parameters.py to use Azure Artifacts feed URL - Added SYSTEM_ACCESSTOKEN Bearer auth headers to requests in utils.py and generate_utils.py for CI environments - Added timeout=30 to all requests.get() calls missing timeouts - Exposed SYSTEM_ACCESSTOKEN env var in generation.yml pipeline steps Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 994301d commit 0d4f64e

5 files changed

Lines changed: 20 additions & 4 deletions

File tree

eng/automation/generate_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def uri_file_exists(file_path: str) -> bool:
453453

454454
def uri_file_read(file_path: str) -> str:
455455
if file_path.startswith("http://") or file_path.startswith("https://"):
456-
return requests.get(file_path).text
456+
return requests.get(file_path, timeout=30).text
457457
else:
458458
with open(file_path, "r", encoding="utf-8") as f_in:
459459
return f_in.read()

eng/automation/generate_utils.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,19 @@ def compare_with_maven_package(
237237
"[Changelog] Compare stable version {0} with current version {1}".format(previous_version, current_version)
238238
)
239239

240+
headers = {}
241+
token = os.environ.get("SYSTEM_ACCESSTOKEN")
242+
if token:
243+
headers["Authorization"] = f"Bearer {token}"
244+
240245
r = requests.get(
241246
MAVEN_URL.format(
242247
group_id=group_id.replace(".", "/"),
243248
artifact_id=module,
244249
version=previous_version,
245-
)
250+
),
251+
headers=headers,
252+
timeout=30,
246253
)
247254
if r.status_code == 404:
248255
logging.warning(

eng/automation/generation.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ steps:
5757
./eng/automation/generate.py --tsp-config "$(TSP_CONFIG)" --version "$(VERSION)" --auto-commit-external-change --user-name "azure-sdk" --user-email "azuresdk@microsoft.com"
5858
displayName: Generation from TypeSpec
5959
condition: ${{ eq(parameters.RELEASE_TYPE, 'TypeSpec') }}
60+
env:
61+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6062
6163
- bash: |
6264
export PATH=$JAVA_HOME_11_X64/bin:$PATH
@@ -65,6 +67,8 @@ steps:
6567
./eng/automation/generate.py --readme "$(README)" --tag "$(TAG)" --autorest-options="$(AUTOREST_OPTIONS)" --service "$(SERVICE)" --version "$(VERSION)" --suffix "$(SUFFIX)" --auto-commit-external-change --user-name "azure-sdk" --user-email "azuresdk@microsoft.com"
6668
displayName: Generation from Swagger
6769
condition: ${{ eq(parameters.RELEASE_TYPE, 'Swagger') }}
70+
env:
71+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6872
6973
- template: /eng/common/pipelines/templates/steps/create-pull-request.yml
7074
parameters:

eng/automation/parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
OUTPUT_FOLDER_FORMAT = None
1313

1414
# Constant parameters
15-
MAVEN_HOST = "https://repo1.maven.org/maven2"
15+
MAVEN_HOST = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1"
1616
MAVEN_URL = MAVEN_HOST + "/{group_id}/{artifact_id}/{version}/{artifact_id}-{version}.jar"
1717

1818
SDK_ROOT = "../../" # related to file dir

eng/automation/utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,12 @@ def get_latest_ga_version(group_id: str, module: str, previous_version: str) ->
405405

406406
group_path = group_id.replace(".", "/")
407407

408-
response = requests.get(f"{MAVEN_HOST}/{group_path}/{module}")
408+
headers = {}
409+
token = os.environ.get("SYSTEM_ACCESSTOKEN")
410+
if token:
411+
headers["Authorization"] = f"Bearer {token}"
412+
413+
response = requests.get(f"{MAVEN_HOST}/{group_path}/{module}", headers=headers, timeout=30)
409414

410415
response.raise_for_status()
411416

0 commit comments

Comments
 (0)