Skip to content

Commit

Permalink
Merge branch 'upstream-main' into kv-test-proxy-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
vcolin7 committed Apr 5, 2023
2 parents 21b840f + ec9d534 commit 48546db
Show file tree
Hide file tree
Showing 805 changed files with 38,566 additions and 17,031 deletions.
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
/sdk/core/ @alzimmermsft @srnagar @anuchandy @lmolkova @vcolin7 @mssfang @jonathangiles @billwert

# PRLabel: %Azure.Core.AMQP
/sdk/core/azure-core-amqp/ @conniey @anuchandy @ki1729 @srnagar @jonathangiles @haolingdong-msft @liukun-msft @weidongxu-microsoft @ZejiaJiang
/sdk/core/azure-core-amqp/ @conniey @anuchandy @lmolkova

# PRLabel: %Azure.Core
/sdk/core/azure-core-tracing-opentelemetry/ @samvaity @alzimmermsft @trask @lmolkova
Expand Down Expand Up @@ -124,7 +124,7 @@
/sdk/eventgrid/ @mssfang @srnagar @lmolkova @billwert

# PRLabel: %Event Hubs
/sdk/eventhubs/ @conniey @anuchandy @liukun-msft @ZejiaJiang
/sdk/eventhubs/ @conniey @anuchandy @lmolkova

# PRLabel: %Event Hubs
/sdk/eventhubs/microsoft-azure-eventhubs-eph/ @JamesBirdsall @sjkwak
Expand Down Expand Up @@ -154,16 +154,16 @@
# PRLabel: %azure-spring
/sdk/keyvault/azure-security-keyvault-jca/ @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423

/sdk/loganalytics/microsoft-azure-loganalytics/ @divyajay @alongafni
/sdk/loganalytics/microsoft-azure-loganalytics/ @ischrei

# PRLabel: %Monitor - Exporter
/sdk/monitor/azure-monitor-opentelemetry-exporter/ @trask @ramthi @heyams @jeanbisutti

# PRLabel: %Monitor
/sdk/monitor/azure-monitor-query*/ @srnagar @lmolkova @ki1729
/sdk/monitor/azure-monitor-query*/ @srnagar @lmolkova @jairmyree

# PRLabel: %Monitor
/sdk/monitor/azure-monitor-ingestion*/ @srnagar @lmolkova @ki1729
/sdk/monitor/azure-monitor-ingestion*/ @srnagar @lmolkova @jairmyree

# PRLabel: %Mixed Reality Authentication
/sdk/mixedreality/azure-mixedreality-authentication/ @craigktreasure
Expand All @@ -178,7 +178,7 @@
/sdk/search/ @alzimmermsft @jairmyree

# PRLabel: %Service Bus
/sdk/servicebus/ @anuchandy @ki1729 @conniey @liukun-msft @ZejiaJiang
/sdk/servicebus/ @anuchandy @conniey @lmolkova

# PRLabel: %Service Bus
/sdk/servicebus/microsoft-azure-servicebus/ @shankarsama @yvgopal
Expand All @@ -187,7 +187,7 @@
/sdk/storage/ @ibrahimrabab @jaschrep-msft @alzimmermsft

# PRLabel: %Tables
/sdk/tables/ @vcolin7 @conniey @jairmyree
/sdk/tables/ @jairmyree @vcolin7

# PRLabel: %EngSys
/sdk/template/ @hallipr @weshaggard @JimSuplizio
Expand All @@ -208,7 +208,7 @@

# end to end tests
# PRLabel: %Azure.Identity
/sdk/e2e/ @g2vinay @joshfree @alzimmermsft
/sdk/e2e/ @g2vinay @billwert
/common/smoke-tests/ @joshfree @jonathangiles @alzimmermsft @g2vinay @conniey @srnagar

# Management Plane
Expand Down
6 changes: 6 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@
],
"words": [
"adal",
"akhtabar",
"amqp",
"Amqp",
"AMQP",
Expand Down Expand Up @@ -258,6 +259,7 @@
"embedme",
"encryptor",
"endtoend",
"Esto",
"etag",
"eventhub",
"eventhubs",
Expand All @@ -274,6 +276,7 @@
"hanaonazure",
"hdfs",
"hdinsight",
"hudha",
"hvac",
"hybridkubernetes",
"insights",
Expand Down Expand Up @@ -309,6 +312,7 @@
"mibps",
"Mirena",
"Mockito",
"mosca",
"msal",
"msix",
"MSRC",
Expand All @@ -324,6 +328,7 @@
"premf",
"pwsh",
"protonj",
"prueba",
"PSQL",
"qpid",
"racdw",
Expand Down Expand Up @@ -367,6 +372,7 @@
"westcentralus",
"westus",
"windowtitle",
"wordomatic",
"xlint",
"XLint"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ the main ServiceBusClientBuilder. -->
<!-- Suppress ReverseProxyPolicy being package private. It may get moved into azure-core. -->
<suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy"
files="com.azure.messaging.webpubsub.ReverseProxyPolicy.java"/>
<suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy"
files="com.azure.ai.translation.text.TranslatorRegionAuthenticationPolicy.java"/>

<!-- Suppress the check on code-gen classes -->
<suppress checks="Indentation" files="com.azure.security.keyvault.administration.implementation.(RoleAssignmentsImpl|RoleDefinitionsImpl)"/>
Expand Down Expand Up @@ -546,6 +548,8 @@ the main ServiceBusClientBuilder. -->
<!-- Field additionallyAllowedTenants is not set in constructor and can be changed using the builder option. -->
<suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.identity.DefaultAzureCredentialBuilder"/>

<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files=".*(DeviceCodeCredential|InteractiveBrowserCredential|AzureCliCredential|AzureDeveloperCliCredential|ClientCertificateCredential|ClientSecretCredential|EnvironmentCredential|OnBehalfOfCredential|ChainedTokenCredential|ClientAssertionCredential|UsernamePasswordCredential).java"/>
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files=".*(DeviceCodeCredential|InteractiveBrowserCredential|AzureCliCredential|AzureDeveloperCliCredential|ClientCertificateCredential|ClientSecretCredential|EnvironmentCredential|OnBehalfOfCredential|ChainedTokenCredential|ClientAssertionCredential|UsernamePasswordCredential).java"/>

<suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.search.documents.indexes.models.SynonymMap"/>

</suppressions>
1 change: 1 addition & 0 deletions eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2061,6 +2061,7 @@
<Match>
<Or>
<Class name="~com.azure.cosmos.implementation.ImplementationBridgeHelpers(\$.*)?"/>
<Class name="~com.azure.cosmos.implementation.DiagnosticsProvider(\$.*)?"/>
<Class name="~com.azure.cosmos.test.implementation.ImplementationBridgeHelpers(\$.*)?"/>
</Or>
<Bug pattern="DM_EXIT"/>
Expand Down
12 changes: 6 additions & 6 deletions eng/common/TestResources/SubConfig-Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ function GetBaseAndResourceGroupNames(
[string]$serviceDirectoryName,
[bool]$CI
) {
if ($baseNameDefault) {
$base = $baseNameDefault.ToLowerInvariant()
$group = $resourceGroupNameDefault ? $resourceGroupNameDefault : ("rg-$baseNameDefault".ToLowerInvariant())
return $base, $group
}

if ($CI) {
$base = 't' + (New-Guid).ToString('n').Substring(0, 16)
# Format the resource group name based on resource group naming recommendations and limitations.
Expand All @@ -37,12 +43,6 @@ function GetBaseAndResourceGroupNames(
return $base, $group
}

if ($baseNameDefault) {
$base = $baseNameDefault.ToLowerInvariant()
$group = $resourceGroupNameDefault ? $resourceGroupNameDefault : ("rg-$baseNameDefault".ToLowerInvariant())
return $base, $group
}

# Handle service directories in nested directories, e.g. `data/aztables`
$serviceDirectorySafeName = $serviceDirectoryName -replace '[\./\\]', ''
# Seed off resource group name if set to avoid name conflicts with deployments where it is not set
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/steps/credscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
displayName: CredScan running
condition: and(succeededOrFailed(), ne(variables['SKIP_CREDSCAN'], true))
inputs:
toolVersion: 2.2.7.8
toolVersion: 2.3.12.23
scanFolder: "${{ parameters.SourceDirectory }}/credscan.tsv"
suppressionsFile: ${{ parameters.SuppressionFilePath }}
- task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
Expand Down
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.9.0-beta.2</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.9.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/patch_release_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ com.azure:azure-ai-formrecognizer # Tests owner: samvaity
com.azure:azure-ai-metricsadvisor # Tests owner: samvaity
com.azure:azure-ai-textanalytics # Tests owner: mssfang
com.azure:azure-communication-chat # Tests owner: jiminwen
com.azure:azure-communication-common # Tests owner: AikoBB, maximrytych-ms, mjafferi-msft
com.azure:azure-communication-identity # Tests owner: AikoBB, maximrytych-ms, mjafferi-msft
com.azure:azure-containers-containerregistry # Tests owner: lmolkova
com.azure:azure-data-appconfiguration # Tests owner: mssfang
com.azure:azure-data-schemaregistry # Tests owner: conniey
Expand Down Expand Up @@ -53,5 +55,3 @@ com.azure:azure-storage-file-datalake # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-file-share # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-internal-avro # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-queue # Tests owner: ibrahimrabab, jaschrep-msft


3 changes: 3 additions & 0 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,9 @@ org.testcontainers:junit-jupiter;1.17.6
# sdk\keyvault\microsoft-azure-keyvault-test\pom.xml
test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT

# sdk\attestation\azure-security-attestation
attestation_com.nimbusds:nimbus-jose-jwt;9.22

# everything under sdk\cosmos
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.13.5
cosmos_com.google.guava:guava;30.1.1-jre
Expand Down
6 changes: 4 additions & 2 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ com.azure:azure-ai-formrecognizer;4.0.5;4.1.0-beta.1
com.azure:azure-ai-formrecognizer-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-personalizer;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-documenttranslator;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-translation-text;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-metricsadvisor;1.1.12;1.2.0-beta.1
com.azure:azure-ai-metricsadvisor-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-textanalytics;5.2.5;5.3.0-beta.3
Expand Down Expand Up @@ -110,7 +111,7 @@ com.azure:azure-developer-devcenter;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-health-insights-clinicalmatching;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-health-insights-cancerprofiling;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-identity;1.8.1;1.9.0-beta.2
com.azure:azure-identity;1.8.1;1.9.0-beta.3
com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-iot-deviceupdate;1.0.5;1.1.0-beta.1
com.azure:azure-iot-modelsrepository;1.0.0-beta.1;1.0.0-beta.2
Expand Down Expand Up @@ -280,7 +281,7 @@ com.azure.resourcemanager:azure-resourcemanager-redisenterprise;1.0.0;1.1.0-beta
com.azure.resourcemanager:azure-resourcemanager-hybridkubernetes;1.0.0-beta.3;1.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-iothub;1.1.0;1.2.0-beta.3
com.azure.resourcemanager:azure-resourcemanager-datadog;1.0.0-beta.4;1.0.0-beta.5
com.azure.resourcemanager:azure-resourcemanager-communication;1.0.0;1.1.0-beta.5
com.azure.resourcemanager:azure-resourcemanager-communication;2.0.0;2.1.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-apimanagement;1.0.0-beta.3;1.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration;1.0.0-beta.3;1.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-resourcegraph;1.0.0;1.1.0-beta.1
Expand Down Expand Up @@ -415,6 +416,7 @@ com.azure.tools:azure-sdk-build-tool;1.0.0-beta.1;1.0.0-beta.2
# In the pom, the version update tag after the version should name the unreleased package and the dependency version:
# <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
unreleased_com.azure:azure-core;1.38.0-beta.1
unreleased_com.azure:azure-core-test;1.16.0-beta.1

# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
# version and set the version to the released beta. Released beta dependencies are only valid
Expand Down
3 changes: 2 additions & 1 deletion sdk/aot/azure-aot-graalvm-support-netty/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Release History

## 1.0.0-beta.3 (2022-05-17)
## 1.0.0-beta.3 (2023-04-04)

### Other Changes
- Marked this library as deprecated. Please refer to the [blog post](https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries/) for more details on GraalVM support in Azure SDK for Java.

#### Dependency Updates
- Updated `azure-aot-graalvm-support` version to 1.0.0-beta.3
Expand Down
5 changes: 5 additions & 0 deletions sdk/aot/azure-aot-graalvm-support-netty/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Azure GraalVM Netty Support client library for Java

> **IMPORTANT** Please note that this package is deprecated and will no longer be updated. The necessary configuration files to support
> native image compilation using GraalVM is now directly available on respective client libraries. It is no longer required
> to add this package as a dependency to build native images with Azure SDK for Java. - Marked this library as deprecated.
> Please refer to the [blog post](https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries/) for more details on GraalVM support in Azure SDK for Java.
The Azure GraalVM Netty Support client library provides support for applications using
[Azure client libraries](https://azure.github.io/azure-sdk/releases/latest/java.html) that take a dependency on
[azure-core-http-netty](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/core/azure-core-http-netty) to be
Expand Down
5 changes: 4 additions & 1 deletion sdk/aot/azure-aot-graalvm-support-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

<packaging>jar</packaging>
<name>Microsoft Azure SDK for GraalVM Netty support</name>
<description>This package contains Microsoft Azure GraalVM Netty Support SDK.</description>
<description>
This package is deprecated will have no further updates. Dependency on this library is no longer required to build native images with Azure SDK for Java.
For more details, please refer to https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries
</description>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion sdk/aot/azure-aot-graalvm-support/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Release History

## 1.0.0-beta.3 (2022-05-17)
## 1.0.0-beta.3 (2023-04-04)

### Other Changes
- Marked this library as deprecated. Please refer to the [blog post](https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries/) for more details on GraalVM support in Azure SDK for Java.
- Changed the proxy interface package names to match the 1.28.0 version of `azure-core`

## 1.0.0-beta.2 (2022-04-25)
Expand Down
5 changes: 5 additions & 0 deletions sdk/aot/azure-aot-graalvm-support/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Azure GraalVM Support client library for Java

> **IMPORTANT** Please note that this package is deprecated and will no longer be updated. The necessary configuration files to support
> native image compilation using GraalVM is now directly available on respective client libraries. It is no longer required
> to add this package as a dependency to build native images with Azure SDK for Java.
> Please refer to the [blog post](https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries/) for more details on GraalVM support in Azure SDK for Java.
The Azure GraalVM Support client library provides support for applications using [Azure client libraries](https://azure.github.io/azure-sdk/releases/latest/java.html) to be built as [GraalVM native
images](https://www.graalvm.org/22.0/reference-manual/native-image/). The library contains all the necessary
[configuration files](https://www.graalvm.org/22.0/reference-manual/native-image/BuildConfiguration/) and [GraalVM
Expand Down
5 changes: 4 additions & 1 deletion sdk/aot/azure-aot-graalvm-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

<packaging>jar</packaging>
<name>Microsoft Azure GraalVM support</name>
<description>This package contains GraalVM Support configuration for Azure SDKs.</description>
<description>
This package is deprecated will have no further updates. Dependency on this library is no longer required to build native images with Azure SDK for Java.
For more details, please refer to https://devblogs.microsoft.com/azure-sdk/announcing-graalvm-support-in-azure-sdk-for-java-and-spring-cloud-azure-libraries
</description>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
Expand Down
Loading

0 comments on commit 48546db

Please sign in to comment.