Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
asaflevi-ms authored Mar 15, 2023
2 parents 6c1a8e3 + 5f63afe commit 26d0800
Show file tree
Hide file tree
Showing 1,732 changed files with 100,756 additions and 29,142 deletions.
35 changes: 22 additions & 13 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -1818,9 +1818,13 @@
],
"mentionees": [
"Drewm3",
"avirishuv",
"vaibhav-agar",
"amjads1"
"TravisCragg-MSFT",
"nikhilpatel909",
"sandeepraichura",
"hilaryw29",
"GabstaMSFT",
"ramankumarlive",
"ushnaarshadkhan"
]
},
{
Expand All @@ -1829,8 +1833,8 @@
"Compute - Extensions"
],
"mentionees": [
"Drewm3",
"amjads1"
"TravisCragg-MSFT",
"GabstaMSFT"
]
},
{
Expand All @@ -1839,8 +1843,8 @@
"Compute - Images"
],
"mentionees": [
"Drewm3",
"vaibhav-agar"
"TravisCragg-MSFT",
"sandeepraichura"
]
},
{
Expand All @@ -1849,8 +1853,9 @@
"Compute - Managed Disks"
],
"mentionees": [
"Drewm3",
"vaibhav-agar"
"TravisCragg-MSFT",
"ramankumarlive",
"ushnaarshadkhan"
]
},
{
Expand All @@ -1860,7 +1865,7 @@
],
"mentionees": [
"Drewm3",
"avirishuv"
"TravisCragg-MSFT"
]
},
{
Expand All @@ -1870,7 +1875,11 @@
],
"mentionees": [
"Drewm3",
"avirishuv"
"TravisCragg-MSFT",
"nikhilpatel909",
"sandeepraichura",
"hilaryw29",
"GabstaMSFT"
]
},
{
Expand All @@ -1879,8 +1888,8 @@
"Compute - VMSS"
],
"mentionees": [
"Drewm3",
"avirishuv"
"TravisCragg-MSFT",
"hilaryw29"
]
},
{
Expand Down
14 changes: 14 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@
"doclinting",
"doctitle",
"dlocal",
"dtlk",
"dtlksd",
"dummyrg",
"eastus",
"embedme",
Expand Down Expand Up @@ -296,6 +298,7 @@
"KUBERNETES",
"kubernetesconfiguration",
"kusto",
"kvlt",
"linecoverage",
"linksource",
"listbyconfigurationprofileassignments",
Expand All @@ -317,11 +320,13 @@
"onboarded",
"Onco",
"onenote",
"premf",
"pwsh",
"protonj",
"PSQL",
"qpid",
"racdw",
"RAGRS",
"reimage",
"reimaging",
"Remediations",
Expand All @@ -336,6 +341,7 @@
"scalastyle",
"schemaregistryapacheavroserializer",
"servicebus",
"sftdl",
"skus",
"sonatype",
"Sonatype",
Expand Down Expand Up @@ -635,6 +641,14 @@
"kevinb"
]
},
{
"filename": "**/sdk/cosmos/platform-matrix.json",
"words": [
"Pfast",
"Pdirect",
"Pmulti"
]
},
{
"filename": "**/sdk/remoterendering/TestResources/**",
"words": [
Expand Down
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,23 @@ For developers working within the repo, refer to the instructions above for upda
For developers wishing to use the daily packages for other purposes, refer to the [connect to feed instructions](https://dev.azure.com/azure-sdk/public/_packaging?_a=connect&feed=azure-sdk-for-java) in Azure Artifacts.

Note: the daily package feed is considered volatile and taking dependencies on a daily package should be considered a temporary arrangement. We reserve the right to remove packages from this feed at any point in time.

## Samples

### Third-party dependencies

Third party libraries should only be included in samples when necessary to demonstrate usage of an Azure SDK package; they should not be suggested or endorsed as alternatives to the Azure SDK.

When code samples take dependencies, readers should be able to use the material without significant license burden or research on terms. This goal requires restricting dependencies to certain types of open source or commercial licenses.

Samples may take the following categories of dependencies:

- **Open-source** : Open source offerings that use an [Open Source Initiative (OSI) approved license](https://opensource.org/licenses). Any component whose license isn't OSI-approved is considered a commercial offering. Prefer OSS projects that are members of any of the [OSS foundations that Microsoft is part of](https://opensource.microsoft.com/ecosystem/). Prefer permissive licenses for libraries, like [MIT](https://opensource.org/licenses/MIT) and [Apache 2](https://opensource.org/licenses/Apache-2.0). Copy-left licenses like [GPL](https://opensource.org/licenses/gpl-license) are acceptable for tools, and OSs. [Kubernetes](https://github.com/kubernetes/kubernetes), [Linux](https://github.com/torvalds/linux), and [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) are examples of this license type. Links to open source components should be to where the source is hosted, including any applicable license, such as a GitHub repository (or similar).

- **Commercial**: Commercial offerings that enable readers to learn from our content without unnecessary extra costs. Typically, the offering has some form of a community edition, or a free trial sufficient for its use in content. A commercial license may be a form of dual-license, or tiered license. Links to commercial components should be to the commercial site for the software, even if the source software is hosted publicly on GitHub (or similar).

- **Dual licensed**: Commercial offerings that enable readers to choose either license based on their needs. For example, if the offering has an OSS and commercial license, readers can choose between them. [MySql](https://github.com/mysql/mysql-server) is an example of this license type.

- **Tiered licensed**: Offerings that enable readers to use the license tier that corresponds to their characteristics. For example, tiers may be available for students, hobbyists, or companies with defined revenue thresholds. For offerings with tiered licenses, strive to limit our use in tutorials to the features available in the lowest tier. This policy enables the widest audience for the article. [Docker](https://www.docker.com/), [IdentityServer](https://duendesoftware.com/products/identityserver), [ImageSharp](https://sixlabors.com/products/imagesharp/), and [Visual Studio](https://visualstudio.com) are examples of this license type.

In general, we prefer taking dependencies on licensed components in the order of the listed categories. In cases where the category may not be well known, we'll document the category so that readers understand the choice that they're making by using that dependency.
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@
"new": "method void com.azure.spring.cloud.autoconfigure.aadb2c.AadB2cAutoConfiguration::<init>(org.springframework.boot.web.client.RestTemplateBuilder)",
"justification": "Bean configuration will not be used by customer in java code."
},
{
"ignore": true,
"code": "java.annotation.removed",
"new": "field com.azure.cosmos.models.PartitionKind.MULTI_HASH",
"justification": "removing beta tags on PartitionKind MultiHash for hierarchical partitioning GA"
},
{
"ignore": true,
"code": "java.method.addedToInterface",
Expand Down
1 change: 1 addition & 0 deletions eng/common/scripts/Test-SampleMetadata.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ begin {
"azure-genomics",
"azure-hdinsight",
"azure-hdinsight-rserver",
"azure-health-insights",
"azure-hpc-cache",
"azure-immersive-reader",
"azure-information-protection",
Expand Down
25 changes: 25 additions & 0 deletions eng/common/testproxy/override-proxy-version.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<#
.SYNOPSIS
Replaces target test-proxy version present in target_version.txt.
.PARAMETER TargetVersion
The replacement version. Used in its entirety, so don't exclude parts of the version definition.
#>
[cmdletbinding(SupportsShouldProcess=$True)]
param(
[Parameter(mandatory=$true)] [string] $TargetVersion
)

$versionFile = Join-Path $PSScriptRoot "target_version.txt"
$existingVersionText = Get-Content -Raw -Path $versionFile
$existingVersion = $existingVersionText.Trim()

if ($PSCmdLet.ShouldProcess($versionFile)){
Write-Host "Replacing version `"$existingVersion`" with version `"$TargetVersion`" in $versionFile."
Set-Content -Path $versionFile -Value "$TargetVersion`n"
}
else {
Write-Host "Would replace version `"$existingVersion`" with version `"$TargetVersion`" in $versionFile."
}


9 changes: 9 additions & 0 deletions eng/common/testproxy/test-proxy-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ steps:
displayName: 'Language Specific Certificate Trust'
condition: and(succeeded(), ${{ parameters.condition }})
- task: PowerShell@2
displayName: 'Override proxy version if necessary'
condition: and(succeeded(), ${{ parameters.condition }}, ne('${{ parameters.targetVersion }}', ''))
inputs:
targetType: filePath
filePath: '${{ parameters.templateRoot }}/eng/common/testproxy/override-proxy-version.ps1'
arguments: '-TargetVersion "${{ parameters.targetVersion }}"'
pwsh: true

- pwsh: |
docker info
displayName: 'Dump active docker information'
Expand Down
15 changes: 9 additions & 6 deletions eng/common/testproxy/test-proxy-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ steps:
displayName: 'Language Specific Certificate Trust'
condition: and(succeeded(), ${{ parameters.condition }})
- task: PowerShell@2
displayName: 'Override proxy version if necessary'
condition: and(succeeded(), ${{ parameters.condition }}, ne('${{ parameters.targetVersion }}', ''))
inputs:
targetType: filePath
filePath: '${{ parameters.templateRoot }}/eng/common/testproxy/override-proxy-version.ps1'
arguments: '-TargetVersion "${{ parameters.targetVersion }}"'
pwsh: true

- pwsh: |
$version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
$overrideVersion = "${{ parameters.targetVersion }}"
if($overrideVersion) {
Write-Host "Overriding default target proxy version of '$version' with override $overrideVersion."
$version = $overrideVersion
}
dotnet tool install azure.sdk.tools.testproxy `
--tool-path $(Build.BinariesDirectory)/test-proxy `
Expand Down
8 changes: 4 additions & 4 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-common</artifactId>
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
<version>1.3.0-beta.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.4.4</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
<version>1.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -88,7 +88,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-sms</artifactId>
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
<version>1.1.11</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -103,7 +103,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-containers-containerregistry</artifactId>
<version>1.1.0-beta.3</version> <!-- {x-version-update;com.azure:azure-containers-containerregistry;current} -->
<version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-containers-containerregistry;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
15 changes: 14 additions & 1 deletion eng/pipelines/patch_release_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,43 @@
# performance improvement or new features, they should go ahead with their release during release week and not worry
# about updating this file. The automated release process will happen the week after release week, followed by
# the release of the Azure SDK BOM the week after that.
#
#
# Test owners listed here are responsible for ensuring their library works properly before and after releases and for
# ensuring that all tests (recorded, live, etc.) are in a good state to ensure releases maintain quality and avoid
# performance regressions or bugs. They are also responsible for smoke testing their library after every release.

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-containers-containerregistry # Tests owner: lmolkova
com.azure:azure-data-appconfiguration # Tests owner: mssfang
com.azure:azure-data-schemaregistry # Tests owner: conniey
com.azure:azure-data-schemaregistry-apacheavro # Tests owner: conniey
com.azure:azure-data-tables # Tests owner: jairmyree
com.azure:azure-iot-deviceupdate # Tests owner: leolie, ryzhan
com.azure:azure-messaging-eventgrid # Tests owner: billwert
com.azure:azure-messaging-eventhubs # Tests owner: conniey
com.azure:azure-messaging-eventhubs-checkpointstore-blob # Tests owner: conniey
com.azure:azure-messaging-servicebus # Tests owner: ki1729
com.azure:azure-messaging-webpubsub # Tests owner: weidongxu-microsoft
com.azure:azure-mixedreality-authentication # Tests owner: craigktreasure, RamonArguelles
com.azure:azure-monitor-query # Tests owner: srnagar
com.azure:azure-remote-rendering # Tests owner: FlorianBorn71, MichaelZp0, jloehr
com.azure:azure-security-attestation # Tests owner: LarryOsterman
com.azure:azure-security-keyvault-administration # Tests owner: vcolin7
com.azure:azure-security-keyvault-certificates # Tests owner: vcolin7
com.azure:azure-security-keyvault-jca # Tests owner: chenrujun
com.azure:azure-security-keyvault-keys # Tests owner: vcolin7
com.azure:azure-security-keyvault-secrets # Tests owner: vcolin7
com.azure:azure-search-documents # Tests owner: jairmyree
com.azure:azure-storage-blob # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-blob-batch # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-blob-cryptography # Tests owner: ibrahimrabab, jaschrep-msft
com.azure:azure-storage-common # Tests owner: ibrahimrabab, jaschrep-msft
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


2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/install-graalvm-jdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ steps:
# Make the assumption here Linux is being used, if it's not it's a configuration issue that needs to be fixed there.
- task: Cache@2
inputs:
key: 'jdk | "$(JavaTestVersion)" | "$(CacheSalt)" | "$(Agent.OS)"'
key: 'jdk | "${{ parameters.GraalVMJdkVersion }}" | "$(CacheSalt)" | "$(Agent.OS)"'
path: $(Agent.BuildDirectory)/graalvm-${{ parameters.GraalVMJdkVersion }}
displayName: 'Cache GraalVM JDK'

Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/Invoke-Codegeneration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ try {
Push-Location $Directory
if ($AutorestOptions) {
Write-Host "Running 'autorest $AutorestOptions' in directory '$Directory'."
& "autorest $AutorestOptions"
Invoke-Expression "autorest $AutorestOptions"
} else {
Write-Host "Running 'autorest' in directory '$Directory'."
& autorest
Expand Down
Loading

0 comments on commit 26d0800

Please sign in to comment.