Skip to content

Commit

Permalink
Merge branch 'main' into release/keyvault/january/2025
Browse files Browse the repository at this point in the history
# Conflicts:
#	sdk/clientcore/http-stress/pom.xml
  • Loading branch information
vcolin7 committed Jan 23, 2025
2 parents 08c6ffa + 3d12c1c commit 30a9bc8
Show file tree
Hide file tree
Showing 1,626 changed files with 7,398 additions and 152,594 deletions.
15 changes: 3 additions & 12 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@
# ServiceLabel: %ARO
# ServiceOwners: @mjudeikis @jim-minter @julienstroheker @amanohar

# PRLabel: %graalvm
/sdk/aot/ @srnagar @jonathangiles

# ServiceLabel: %graalvm
# AzureSdkOwners: @srnagar

Expand Down Expand Up @@ -158,9 +155,6 @@
# ServiceLabel: %Batch
# ServiceOwners: @mksuni @bgklein @mscurrell @cRui861 @paterasMSFT @gingi @dpwatrous

# ServiceLabel: %BatchAI
# ServiceOwners: @matthchr

# ServiceLabel: %Billing
# ServiceOwners: @cabbpt

Expand Down Expand Up @@ -268,13 +262,13 @@
/sdk/communication/azure-communication-callingserver/ @minwoolee-msft

# PRLabel: %Communication - Call Automation
/sdk/communication/azure-communication-callautomation/ @juntuchen-msft @cochi2
/sdk/communication/azure-communication-callautomation/ @juntuchen-msft @minwoolee-msft @fhaghbin-msft

# PRLabel: %Communication - Chat
/sdk/communication/azure-communication-chat/ @ankitarorabit @minnieliu @Azure/azure-sdk-communication-code-reviewers

# PRLabel: %Communication - Email
/sdk/communication/azure-communication-email/ @yogeshmo
/sdk/communication/azure-communication-email/ @kagbakpem @Azure/azure-sdk-write-communication

# PRLabel: %Communication - Identity
/sdk/communication/azure-communication-identity/ @Azure/acs-identity-sdk @AikoBB @maximrytych-ms @mjafferi-msft
Expand Down Expand Up @@ -459,12 +453,9 @@
# PRLabel: %Event Hubs
/sdk/eventhubs/microsoft-azure-eventhubs-eph/ @sjkwak

# PRLabel: %Event Hubs
/sdk/eventhubs/microsoft-azure-eventhubs-extensions/ @sjkwak

# ServiceLabel: %Health Deidentification
# PRLabel: %Health Deidentification
/sdk/healthdataaiservices/ @GrahamMThomas @alexathomases @billwert
/sdk/healthdataaiservices/ @GrahamMThomas @alexathomases @billwert @Azure/healthdatadeidentification

# PRLabel: %Event Hubs
/sdk/eventhubs/microsoft-azure-eventhubs/ @sjkwak
Expand Down
3 changes: 0 additions & 3 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,8 @@
"**/src/**/samples/**/*.ipynb",
"**/sdk/**/swagger/**",
"**/src/**/resources/**",
"sdk/aot/azure-aot-graalvm-samples/**",
"sdk/agrifood/azure-verticals-agrifood-farming/**",
"sdk/aot/azure-aot-graalvm-support-netty/**",
"sdk/anomalydetector/azure-ai-anomalydetector/**",
"sdk/aot/azure-aot-graalvm-support/**",
"sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/**",
"sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/**",
"sdk/appconfiguration/azure-spring-cloud-feature-management-web/**",
Expand Down
6 changes: 3 additions & 3 deletions common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.65.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
<version>4.66.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
</dependency>

<dependency>
Expand All @@ -136,13 +136,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.19.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<version>5.20.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.20.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.20.3</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
Expand Down
2 changes: 0 additions & 2 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ known_presence_issues:
- ['sdk/cognitiveservices/ms-azure-cs-videosearch', '#2847']
- ['sdk/cognitiveservices/ms-azure-cs-visualsearch', '#2847']
- ['sdk/cognitiveservices/ms-azure-cs-websearch', '#2847']
- ['sdk/eventhubs/microsoft-azure-eventhubs-extensions', '#2847']
- ['sdk/mediaservices/microsoft-azure-media', '#2847']
- ['sdk/servicebus/microsoft-azure-servicebus', '#2847']
# Changelog List
Expand Down Expand Up @@ -80,7 +79,6 @@ known_presence_issues:
- ['sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md', '#2847']
- ['sdk/eventhubs/microsoft-azure-eventhubs/CHANGELOG.md', '#2847']
- ['sdk/eventhubs/microsoft-azure-eventhubs-eph/CHANGELOG.md', '#2847']
- ['sdk/eventhubs/microsoft-azure-eventhubs-extensions/CHANGELOG.md', '#2847']
- ['sdk/keyvault/microsoft-azure-keyvault/CHANGELOG.md', '#2847']
- ['sdk/keyvault/microsoft-azure-keyvault-core/CHANGELOG.md', '#2847']
- ['sdk/keyvault/microsoft-azure-keyvault-cryptography/CHANGELOG.md', '#2847']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,6 @@
<!-- Don't check for JavaDocPackage or LineLength in samples or tests-->
<suppress checks="(JavadocPackage|LineLength)" files=".*[/\\](samples|test)[/\\].*\.java"/>

<!-- To allow using sysout in GraalVM classes as the output is printed out during the build -->
<suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck"
files="com.azure.aot.graalvm.support.implementation.GraalVMFeature.java"/>

<!-- To allow using sysout in GraalVM classes as the output is printed out during the build -->
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck"
files="com.azure.aot.graalvm.support.netty.implementation.features.*\.java"/>

<!-- The class is copied from Quarkus and uses the relevant copyright text.
Also, this class contains a number of fields that are annotated to be updated in native image. So, these exceptions are needed -->
<suppress checks="StaticVariableName|VisibilityModifier|TypeName|Header"
files="com.azure.aot.graalvm.support.netty.implementation.features.*\.java"/>

<!-- Suppress LineLength for i18n message properties -->
<suppress checks="LineLength" files="messages.properties"/>

Expand Down Expand Up @@ -161,7 +148,7 @@

<!-- Checkstyle suppressions for azure.spring.cloud.autoconfigure.compatibility package -->
<suppress checks="MethodName" files="com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.java"/>

<!-- Test class for spring-messaging-azure-servicebus module -->
<suppress checks="InnerAssignment" files="com.azure.spring.messaging.servicebus.implementation.properties.merger.util.TestPropertiesComparer"/>
<suppress checks="InnerAssignment" files="com.azure.spring.messaging.servicebus.implementation.properties.merger.util.TestPropertiesValueInjectHelper.java"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1714,24 +1714,6 @@
<Bug pattern="BC_UNCONFIRMED_CAST"/>
</Match>

<Match>
<Or>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerSslJdkAlpnApplicationProtocolNegotiatorAlpnWrapper"/>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerSslJdkAlpnApplicationProtocolNegotiatorAlpnWrapperJava8"/>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerSslJdkSslContext"/>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerSslSslContext"/>
</Or>
<Bug pattern="BC_IMPOSSIBLE_CAST"/>
</Match>
<Match>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerCodecHttpHttpContentDecompressor"/>
<Bug pattern="CI_CONFUSED_INHERITANCE"/>
</Match>
<Match>
<Class name="com.azure.aot.graalvm.support.netty.implementation.features.TargetIoNettyHandlerSslOpenSsl"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>

<!-- Non Shipped code -->
<Match>
<Package name="~com\.azure\.(jedis|lettuce|redisson).*"/>
Expand Down
17 changes: 13 additions & 4 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,16 @@ try {
$context = Get-AzContext
}
} else {
if ($currentSubcriptionId -ne 'faa080af-c1d8-40ad-9cce-e1a450ca5b57') {
if ($context.Tenant.Name -like '*TME*') {
if ($currentSubscriptionId -ne '4d042dc6-fe17-4698-a23f-ec6a8d1e98f4') {
Log "Attempting to select subscription 'Azure SDK Test Resources - TME (4d042dc6-fe17-4698-a23f-ec6a8d1e98f4)'"
$null = Select-AzSubscription -Subscription '4d042dc6-fe17-4698-a23f-ec6a8d1e98f4' -ErrorAction Ignore
# Update the context.
$context = Get-AzContext
}
} elseif ($currentSubcriptionId -ne 'faa080af-c1d8-40ad-9cce-e1a450ca5b57') {
Log "Attempting to select subscription 'Azure SDK Developer Playground (faa080af-c1d8-40ad-9cce-e1a450ca5b57)'"
$null = Select-AzSubscription -Subscription 'faa080af-c1d8-40ad-9cce-e1a450ca5b57' -ErrorAction Ignore

# Update the context.
$context = Get-AzContext
}
Expand All @@ -261,6 +267,7 @@ try {
'faa080af-c1d8-40ad-9cce-e1a450ca5b57' = 'Azure SDK Developer Playground'
'a18897a6-7e44-457d-9260-f2854c0aca42' = 'Azure SDK Engineering System'
'2cd617ea-1866-46b1-90e3-fffb087ebf9b' = 'Azure SDK Test Resources'
'4d042dc6-fe17-4698-a23f-ec6a8d1e98f4' = 'Azure SDK Test Resources - TME '
}

# Print which subscription is currently selected.
Expand Down Expand Up @@ -313,7 +320,8 @@ try {
# Make sure the provisioner OID is set so we can pass it through to the deployment.
if (!$ProvisionerApplicationId -and !$ProvisionerApplicationOid) {
if ($context.Account.Type -eq 'User') {
$user = Get-AzADUser -UserPrincipalName $context.Account.Id
# Use -Mail as the lookup works in both corp and TME tenants
$user = Get-AzADUser -Mail $context.Account.Id
$ProvisionerApplicationOid = $user.Id
} elseif ($context.Account.Type -eq 'ServicePrincipal') {
$sp = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
Expand Down Expand Up @@ -383,7 +391,8 @@ try {
Write-Warning "The specified TestApplicationId '$TestApplicationId' will be ignored when -ServicePrincipalAutth is not set."
}

$userAccount = (Get-AzADUser -UserPrincipalName (Get-AzContext).Account)
# Use -Mail as the lookup works in both corp and TME tenants
$userAccount = (Get-AzADUser -Mail (Get-AzContext).Account.Id)
$TestApplicationOid = $userAccount.Id
$TestApplicationId = $testApplicationOid
$userAccountName = $userAccount.UserPrincipalName
Expand Down
3 changes: 2 additions & 1 deletion eng/common/docgeneration/Generate-DocIndex.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ function Get-BlobStorage-Artifacts(
# "--query '[].name'" returns a list of only blob names
# "--num-results *" handles pagination so the caller does not have to
$artifacts = az storage blob list `
--auth-mode login `
--account-name $storageAccountName `
--container-name $storageContainerName `
--prefix $storagePrefix `
--delimiter / `
--only-show-errors `
--query '[].name' `
--num-results * | ConvertFrom-Json
--num-results * | ConvertFrom-Json
LogDebug "Number of artifacts found: $($artifacts.Length)"

# example: "python/azure-storage-blob" -> "azure-storage-blob"
Expand Down
10 changes: 5 additions & 5 deletions eng/common/docgeneration/templates/matthews/styles/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function httpGetAsyncFallbackOnFail(targetUrl, successCallback, failureCallback)
}

function populateOptions(selector, packageName) {
var versionRequestUrl = "https://azuresdkdocs.blob.core.windows.net/$web/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/versions"
var versionRequestUrl = "https://azuresdkdocs.z19.web.core.windows.net/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/versions"

httpGetAsync(versionRequestUrl, function (responseText) {
var versionselector = document.createElement("select")
Expand Down Expand Up @@ -181,9 +181,9 @@ function loadedOtherVersions(url, latestVersions, publishedVersions, selector, c
}

function populateIndexList(selector, packageName) {
var url = "https://azuresdkdocs.blob.core.windows.net/$web/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/versions"
var latestGAUrl = "https://azuresdkdocs.blob.core.windows.net/$web/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/latest-ga"
var latestPreviewUrl = "https://azuresdkdocs.blob.core.windows.net/$web/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/latest-preview"
var url = "https://azuresdkdocs.z19.web.core.windows.net/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/versions"
var latestGAUrl = "https://azuresdkdocs.z19.web.core.windows.net/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/latest-ga"
var latestPreviewUrl = "https://azuresdkdocs.z19.web.core.windows.net/" + SELECTED_LANGUAGE + "/" + packageName + "/versioning/latest-preview"
var latestVersions = document.createElement("ul")
httpGetLatestAsync(latestGAUrl, latestVersions, packageName)
httpGetLatestAsync(latestPreviewUrl, latestVersions, packageName)
Expand Down Expand Up @@ -217,7 +217,7 @@ function populateIndexList(selector, packageName) {
}

function getPackageUrl(language, package, version) {
return "https://azuresdkdocs.blob.core.windows.net/$web/" + language + "/" + package + "/" + version + "/index.html"
return "https://azuresdkdocs.z19.web.core.windows.net/" + language + "/" + package + "/" + version + "/index.html"
}

// Populate Versions
Expand Down
Loading

0 comments on commit 30a9bc8

Please sign in to comment.