Skip to content

Commit 8f466a1

Browse files
committed
merge with main
2 parents ad3ae4f + c0a7188 commit 8f466a1

File tree

3,259 files changed

+510192
-167967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,259 files changed

+510192
-167967
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
# SDK
1919
###########
2020

21-
/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng
22-
2321
# Catch all
2422
/sdk/ @lmazuel
2523

@@ -271,7 +269,7 @@
271269
# ServiceOwners: @azureml-github @Azure/azure-ml-sdk
272270

273271
# PRLabel: %Machine Learning
274-
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur
272+
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur
275273

276274
# PRLabel: %ML-Local Endpoints
277275
/sdk/ml/azure-ai-ml/azure/ai/ml/_local_endpoints/ @NonStatic2014 @arunsu @JustinFirsching
@@ -302,9 +300,9 @@
302300
/sdk/ml/pipeline.tests.yml @wangchao1230 @eniac871 @kingernupur @achauhan-scc
303301

304302
# PRLabel: %ML-Workspace
305-
/sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/ @seanyao1 @debuggerXi
306-
/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/ @seanyao1 @debuggerXi
307-
/sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_operations.py @seanyao1 @debuggerXi
303+
/sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/ @seanyao1 @debuggerXi @kingernupur @achauhan-scc
304+
/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/ @seanyao1 @debuggerXi @kingernupur @achauhan-scc
305+
/sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_operations.py @seanyao1 @debuggerXi @kingernupur @achauhan-scc
308306

309307
# PRLabel: %ML-ImportJob
310308
/sdk/ml/azure-ai-ml/azure/ai/ml/_schema/job/import_job.py @xiongrenyi
@@ -844,6 +842,9 @@
844842
/eng/ @scbedd @weshaggard @benbp
845843
/eng/common/ @Azure/azure-sdk-eng
846844
/.github/workflows/ @Azure/azure-sdk-eng
845+
/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng
846+
847+
/.config/1espt/ @benbp @weshaggard
847848

848849
/tools/ @scbedd @mccoyp
849850

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Test Azure SDK Tools
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches: [ main ]
7+
paths:
8+
- "tools/azure-sdk-tools/**"
9+
10+
11+
jobs:
12+
build-and-test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
16+
- uses: actions/checkout@v2
17+
18+
# todo before checkin: multiplex to include running tests on py38 -> 312
19+
- name: Set up Python 3.11
20+
uses: actions/setup-python@v4
21+
with:
22+
python-version: 3.11
23+
24+
- name: Install azure-sdk-tools
25+
run: |
26+
python -m pip install -e tools/azure-sdk-tools[build,ghtools]
27+
python -m pip freeze
28+
shell: bash
29+
30+
- name: Run tests
31+
run: |
32+
pytest ./tests
33+
shell: bash
34+
working-directory: tools/azure-sdk-tools

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ sdk/storage/azure-storage-blob-changefeed/tests/settings/settings_real.py
123123
!sdk/ml/azure-ai-ml/tests/test_configs/*/*/environment*
124124
!sdk/ml/azure-ai-ml/tests/environment*
125125

126+
# azure-ai-evaluation connections file
127+
sdk/evaluation/azure-ai-evaluation/connections.json
128+
126129

127130
# The locations below are deprecated - keep to prevent any accidental secrets leakage ==========
128131
sdk/storage/azure-storage-blob/tests/_shared/settings_real.py

.vscode/cspell.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,11 @@
135135
"conda/conda-recipes/msal-extensions/meta.yaml",
136136
"conda/conda-recipes/msrest/meta.yaml",
137137
"conda/conda-recipes/uamqp/meta.yaml",
138-
"conda/conda-releaselogs/azure-mgmt.md"
138+
"conda/conda-releaselogs/azure-mgmt.md",
139+
".github/workflows/azure-sdk-tools.yml"
139140
],
140141
"words": [
142+
"msedge",
141143
"spinup",
142144
"cibuildwheel",
143145
"aoai",
@@ -261,6 +263,7 @@
261263
"iohttp",
262264
"IOHTTP",
263265
"IOLRO",
266+
"incompat",
264267
"inprogress",
265268
"ipconfiguration",
266269
"ipconfigurations",
@@ -350,6 +353,7 @@
350353
"prevsnapshot",
351354
"pschema",
352355
"PSECRET",
356+
"pydantic",
353357
"pyfetch",
354358
"pyfuncitem",
355359
"pygobject",
@@ -467,7 +471,8 @@
467471
"dicom",
468472
"WINDOWSVMIMAGE",
469473
"LINUXVMIMAGE",
470-
"MACVMIMAGE"
474+
"MACVMIMAGE",
475+
"myuseragent"
471476
],
472477
"overrides": [
473478
{

eng/.docsettings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ known_content_issues:
119119
- ['sdk/core/azure-common/README.rst', 'common']
120120
- ['sdk/core/azure-core/README.md', 'common']
121121
- ['sdk/core/azure-core/samples/README.md', 'common']
122+
- ['sdk/core/azure-core-tracing-opentelemetry/README.md', 'common']
122123
- ['sdk/core/corehttp/README.md', 'common']
123124
- ['sdk/core/corehttp/samples/README.md', 'common']
124125
- ['sdk/search/azure-search-documents/README.md', 'common']

eng/common/TestResources/New-TestResources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ try {
515515

516516
# Try to detect the shell based on the parent process name (e.g. launch via shebang).
517517
$shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Parent.ProcessName) -and $parentProcessName -eq 'cmd') {
518-
'cmd', 'set {0}={1}'
518+
'cmd', 'set {0}=''{1}'''
519519
} elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
520-
'shell', 'export {0}={1}'
520+
'shell', 'export {0}=''{1}'''
521521
} else {
522522
'PowerShell', '${{env:{0}}} = ''{1}'''
523523
}

eng/common/TestResources/deploy-test-resources.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,21 @@ steps:
5959
${{ parameters.SubscriptionConfiguration }}
6060
'@ | ConvertFrom-Json -AsHashtable;
6161
62+
$context = Get-AzContext
63+
$subscriptionConfiguration["Environment"] = $context.Environment.Name
64+
$subscriptionConfiguration["SubscriptionId"] = $context.Subscription.Id
65+
$subscriptionConfiguration["TenantId"] = $context.Subscription.TenantId
66+
$subscriptionConfiguration["TestApplicationId"] = $context.Account.Id
67+
$subscriptionConfiguration["ProvisionerApplicationId"] = $context.Account.Id
68+
69+
$principal = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
70+
$subscriptionConfiguration["TestApplicationOid"] = $principal.Id
71+
$subscriptionConfiguration["ProvisionerApplicationOid"] = $principal.Id
72+
73+
Write-Host ($subscriptionConfiguration | ConvertTo-Json)
74+
# Write the new SubscriptionConfiguration to be used by the remove test resources
75+
Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)"
76+
6277
# The subscriptionConfiguration may have ArmTemplateParameters defined, so
6378
# pass those in via the ArmTemplateParameters flag, and handle any
6479
# additional parameters from the pipelines via AdditionalParameters

eng/common/pipelines/codeowners-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ stages:
3131
vmImage: ubuntu-22.04
3232

3333
variables:
34-
CodeownersLinterVersion: '1.0.0-dev.20240917.2'
34+
CodeownersLinterVersion: '1.0.0-dev.20240926.2'
3535
DotNetDevOpsFeed: "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
3636
RepoLabelUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/repository-labels-blob"
3737
TeamUserUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/azure-sdk-write-teams-blob"

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ parameters:
55
- name: RepositoryPath
66
type: string
77
default: 'sdk'
8+
- name: RepositoryCommitish
9+
type: string
10+
default: $(Build.SourceVersion)
811

912
jobs:
1013
- job:
@@ -36,6 +39,7 @@ jobs:
3639
parameters:
3740
Repositories:
3841
- Name: ${{ parameters.Repository }}
42+
Commitish: ${{ parameters.RepositoryCommitish }}
3943
WorkingDirectory: $(System.DefaultWorkingDirectory)
4044
Paths:
4145
- 'sdk/**/*.yml'

eng/common/scripts/Update-DocsMsPackages.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function GetMetadata($moniker) {
5454
return $metadata
5555
}
5656

57-
function ValidatePackageForOnboarding2($package) {
57+
function PackageIsValidForDocsOnboarding($package) {
5858
if (!(Test-Path "Function:$ValidateDocsMsPackagesFn")) {
5959
return $true
6060
}
@@ -88,7 +88,7 @@ foreach ($moniker in $MONIKERS) {
8888
if ($package.ContainsKey('_SkipDocsValidation') -and $true -eq $package['_SkipDocsValidation']) {
8989
Write-Host "Skip validation for package: $($packageIdentity)"
9090
}
91-
elseif (!(ValidatePackageForOnboarding2 $package)) {
91+
elseif (!(PackageIsValidForDocsOnboarding $package)) {
9292
LogWarning "Skip adding package that did not pass validation: $($packageIdentity)"
9393
continue
9494
}
@@ -101,7 +101,7 @@ foreach ($moniker in $MONIKERS) {
101101
$oldPackage = $alreadyOnboardedPackages[$packageIdentity]
102102

103103
if ($oldPackage.Version -ne $package.Version) {
104-
if (!(ValidatePackageForOnboarding2 $package)) {
104+
if (!(PackageIsValidForDocsOnboarding $package)) {
105105
LogWarning "Omitting package that failed validation: $($packageIdentity)@$($package.Version)"
106106
continue
107107
}

0 commit comments

Comments
 (0)