Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
@mssfang
mssfang committed Dec 7, 2023
2 parents 131fad5 + b665d9e commit 2e23e25
Show file tree
Hide file tree
Showing 9,023 changed files with 450,473 additions and 344,258 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
269 changes: 269 additions & 0 deletions .github/CODEOWNERS_baseline_errors.txt
View file

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions .vscode/cspell.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,10 @@
{
"filename": "sdk/servicebus/azure-messaging-servicebus/**",
"words": [
"anu",
"Conniey",
"liudmila",
"Milli",
"qpid",
"unretriable"
]
Expand Down Expand Up @@ -1055,13 +1058,8 @@
"Drevapi",
"Dskip",
"Dspotbugs",
"Pdev"
]
},
{
"filename": "sdk/spring/spring-cloud-azure-starter-monitor/**.md",
"words": [
"Djava"
"Pdev",
"Djava"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.33]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.34]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -74,12 +74,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.13.10</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.13.11</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.11.16</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.11.17</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>
</dependencies>
</project>
20 changes: 10 additions & 10 deletions common/smoke-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.45.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.45.1</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.13.10</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.13.11</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<dependency>
Expand All @@ -106,49 +106,49 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.11.16</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.11.17</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.8.13</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.8.14</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.52.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
<version>4.53.1</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.7.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<version>4.7.3</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.16.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<version>5.17.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.17.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.25.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.25.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
Expand Down
2 changes: 2 additions & 0 deletions eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ the main ServiceBusClientBuilder. -->
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="ServiceBusSessionReceiver(Async)?Client.java"/>

<suppress checks="com.azure.tools.checkstyle.checks.UseCaughtExceptionCauseCheck" files="ServiceBusMessageBatch.java"/>
<!-- Supress the BufferOverflowException thrown from encodedSize method, this exception is caught, mapped and logged at the callsite -->
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files="com.azure.messaging.servicebus.ServiceBusMessageBatch.java"/>

<!-- Suppress the long package name in autoconfigure.implementation.redis package -->
<suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.redis.*" />
Expand Down
2 changes: 1 addition & 1 deletion eng/code-quality-reports/src/main/resources/revapi/revapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
{
"regex": true,
"code": "java\\.annotation\\.removed",
"old": ".*? (com\\.azure\\.containers\\.containerregistry\\.models.*|com\\.azure\\.search\\.documents(\\.indexes)?\\.models.*|com\\.azure\\.security\\.keyvault\\.(administration|certificates)\\.models.*)",
"old": ".*? (com\\.azure\\.containers\\.containerregistry\\.models.*|com\\.azure\\.search\\.documents(\\.indexes)?\\.models.*|com\\.azure\\.security\\.keyvault\\.(administration|certificates|keys|keys\\.cryptography)\\.models.*)",
"description": ".*com.fasterxml.jackson.*",
"justification": "Removing Jackson annotations from ACR, KeyVault, and Search in transition to stream-style."
},
Expand Down
140 changes: 131 additions & 9 deletions eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@
<Class name="com.microsoft.azure.servicebus.Utils"/>
<Method name="getDataFromMessageBody"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.implementation.Base64UrlJsonDeserializer"/>
<Method name="deserialize"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.implementation.ByteExtensions"/>
<Method name="clone"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.models.KeyProperties"/>
<Method name="decode"/>
Expand Down Expand Up @@ -185,6 +177,15 @@
<Class name="com.azure.core.serializer.json.jackson.implementation.JacksonJsonReader"/>
<Method name="getBinary"/>
</And>
<Class name="com.azure.security.keyvault.keys.implementation.models.BackupKeyResult"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.JsonWebKey"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyOperationResult"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyOperationsParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyReleasePolicy"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyRestoreParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeySignParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyVerifyParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.RandomBytes"/>
</Or>
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
</Match>
Expand Down Expand Up @@ -636,7 +637,6 @@
<Class name="com.azure.security.keyvault.secrets.models.KeyVaultSecret"/>
<Class name="com.azure.security.keyvault.secrets.models.SecretProperties"/>
<Class name="com.azure.security.keyvault.keys.models.DeletedKey"/>
<Class name="com.azure.security.keyvault.keys.cryptography.implementation.SecretKey"/>
<Class name="com.azure.security.keyvault.keys.models.KeyVaultKey"/>
<Class name="com.azure.security.keyvault.keys.models.KeyProperties"/>
<Class name="com.azure.security.keyvault.keys.models.KeyRotationPolicy"/>
Expand Down Expand Up @@ -2436,6 +2436,18 @@
<Bug pattern="SE_BAD_FIELD"/>
</Match>

<!-- The returned Disposable can be ignored since Scheduler is closed when Reactor closes. -->
<Match>
<Class name="com.azure.core.amqp.implementation.ReactorExecutor"/>
<Method name="start"/>
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
</Match>
<Match>
<Class name="com.azure.core.amqp.implementation.ReactorExecutor"/>
<Method name="run"/>
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
</Match>

<!-- For BinaryData, copying array contents degrades performance. The data returned as byte array from BinaryData is expected to be copied by the call if mutability is desired. -->
<Match>
<Class name="com.azure.core.implementation.util.ByteArrayContent"/>
Expand Down Expand Up @@ -2713,5 +2725,115 @@
<Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE"/>
</Match>

<!-- Field is not initialized in Ctr but necessary safety measures are in place when accessing it -->
<Match>
<Class name="com.azure.messaging.servicebus.NonSessionProcessor"/>
<Field name="rollingMessagePump"/>
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
</Match>
<Match>
<Class name="com.azure.messaging.servicebus.SessionProcessor"/>
<Field name="rollingSessionsMessagePump"/>
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
</Match>
<Match>
<Class name="com.azure.messaging.servicebus.ServiceBusProcessor"/>
<Field name="rollingMessagePump"/>
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
</Match>
<!-- False positives -->
<Match>
<Class name="com.azure.messaging.servicebus.NonSessionProcessor$RollingNonSessionMessagePump"/>
<Or>
<Field name="builder"/>
<Field name="logger"/>
<Field name="disposable"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class name="com.azure.messaging.servicebus.SessionProcessor$RollingSessionsMessagePump"/>
<Or>
<Field name="builder"/>
<Field name="logger"/>
<Field name="disposable"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class name="com.azure.messaging.servicebus.ServiceBusProcessor$RollingMessagePump"/>
<Or>
<Field name="nonSessionBuilder"/>
<Field name="sessionBuilder"/>
<Field name="logger"/>
<Field name="disposable"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<!-- The RollingNonSessionMessagePump and RollingSessionsMessagePump doesn't need to be serializable -->
<Match>
<Class
name="com.azure.messaging.servicebus.NonSessionProcessor$RollingNonSessionMessagePump"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.SessionProcessor$RollingSessionsMessagePump"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.ServiceBusProcessor$RollingMessagePump"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>
<!-- False positives -->
<Match>
<Class
name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver"/>
<Or>
<Field name="instrumentation"/>
<Field name="logger"/>
<Field name="messageFlux"/>
<Field name="receiversTracker"/>
<Field name="tracer"/>
<Field name="managementNode"/>
<Field name="serializer"/>
<Field name="workerScheduler"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver$NextSessionStream"/>
<Or>
<Field name="newSession"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.ServiceBusSingleSessionManager$SessionReceiverStream"/>
<Or>
<Field name="sessionReceiver"/>
</Or>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<!-- The RollingSessionReceiver, NextSessionStream, $SessionReceiverStream doesn't need to be serializable -->
<Match>
<Class
name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver$NextSessionStream"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>
<Match>
<Class
name="com.azure.messaging.servicebus.ServiceBusSingleSessionManager$SessionReceiverStream"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
</Match>

<!-- Comment to force CI to run Spotbugs against all SDKs -->
</FindBugsFilter>
9 changes: 8 additions & 1 deletion eng/common/TestResources/New-TestResources.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,14 @@ function BuildDeploymentOutputs([string]$serviceName, [object]$azContext, [objec
}
}

return $deploymentOutputs
# Force capitalization of all keys to avoid Azure Pipelines confusion with
# variable auto-capitalization and OS env var capitalization differences
$capitalized = @{}
foreach ($item in $deploymentOutputs.GetEnumerator()) {
$capitalized[$item.Name.ToUpperInvariant()] = $item.Value
}

return $capitalized
}

function SetDeploymentOutputs(
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/codeowners-linter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stages:
vmImage: ubuntu-22.04

variables:
CodeownersLinterVersion: '1.0.0-dev.20231107.2'
CodeownersLinterVersion: '1.0.0-dev.20231120.3'
DotNetDevOpsFeed: "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
RepoLabelUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/repository-labels-blob"
TeamUserUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/azure-sdk-write-teams-blob"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/scripts/Cadl-Project-Generate.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param (
[ValidateNotNullOrEmpty()]
[string] $ProjectDirectory,
[Parameter(Position=1)]
[string] $CadlAdditionalOptions ## addtional cadl emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2
[string] $CadlAdditionalOptions ## additional cadl emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2
)

$ErrorActionPreference = "Stop"
Expand Down Expand Up @@ -98,4 +98,4 @@ finally {
$shouldCleanUp = $configuration["cleanup"] ?? $true
if ($shouldCleanUp) {
Remove-Item $tempFolder -Recurse -Force
}
}
Loading

0 comments on commit 2e23e25

Please sign in to comment.