Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from Azure:main #435

Merged
merged 23 commits into from
Mar 14, 2023
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
870e952
[Automation] Generate Fluent Lite from storagecache#package-preview-2…
azure-sdk Mar 13, 2023
b033917
Increment versions for storagecache releases (#33978)
azure-sdk Mar 13, 2023
91765da
[Automation] Generate Fluent Lite from redisenterprise#package-previe…
azure-sdk Mar 13, 2023
95b07fd
Increment versions for redisenterprise releases (#33981)
azure-sdk Mar 13, 2023
aa14214
Validate Cognitive Search Code Generation in CI (#33961)
alzimmermsft Mar 13, 2023
739bafb
Communication Identity | Coverage improvement (#33896)
mjafferi-msft Mar 13, 2023
c901cdb
Fixing an issue with Direct Channels acquired/close metrics for idle …
FabianMeiswinkel Mar 13, 2023
2f75adf
Update samples for cosmos test (#33974)
xinlian12 Mar 13, 2023
5491713
3rd Party Libs in Samples (#33872)
ronniegeraghty Mar 13, 2023
0127a99
disable dynamic classify test and remove samples (#33984)
mssfang Mar 13, 2023
a078753
Fix Cognitive Search Javadocs in the Latest JDK Versions (#33960)
alzimmermsft Mar 13, 2023
bf2203a
Adding Storage libraries for automated patch release enrollment (#33968)
ibrahimrabab Mar 13, 2023
ac58928
ACR: consistency review and docs and samples (#33986)
lmolkova Mar 13, 2023
dad7ce3
enable true version override so that other tools also have a shot at …
azure-sdk Mar 13, 2023
fba64e7
STG87 Features (#33956)
ibrahimrabab Mar 13, 2023
734d97e
onboard to auto patch (#33989)
jiminwen-msft Mar 14, 2023
e5a8174
enroll to automated patch release (#33995)
devlie Mar 14, 2023
d902a4e
Add string comparison of tones (#33992)
wangrui-msft Mar 14, 2023
158c158
Cleanup Swagger Transforms and Customizations in Metrics Advisor (#33…
samvaity Mar 14, 2023
6c30f72
remove prohibited package (#34000)
lmolkova Mar 14, 2023
4e70054
Increment Azure Communication Services SMS from 1.1.10 to 1.1.11 (#33…
whisper6284 Mar 14, 2023
5a5226f
Upgrade ACS Phone Numbers beta from 1.1.0-beta.14 to 1.1.0-beta.15 (#…
whisper6284 Mar 14, 2023
388b720
App Configuration Spring Feature Management Usage (#33854)
mrm9084 Mar 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
@@ -249,6 +249,8 @@
"doclinting",
"doctitle",
"dlocal",
"dtlk",
"dtlksd",
"dummyrg",
"eastus",
"embedme",
@@ -292,6 +294,7 @@
"KUBERNETES",
"kubernetesconfiguration",
"kusto",
"kvlt",
"linecoverage",
"linksource",
"listbyconfigurationprofileassignments",
@@ -312,11 +315,13 @@
"OLTP",
"onboarded",
"onenote",
"premf",
"pwsh",
"protonj",
"PSQL",
"qpid",
"racdw",
"RAGRS",
"reimage",
"reimaging",
"Remediations",
@@ -331,6 +336,7 @@
"scalastyle",
"schemaregistryapacheavroserializer",
"servicebus",
"sftdl",
"skus",
"sonatype",
"Sonatype",
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
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
@@ -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'
15 changes: 9 additions & 6 deletions eng/common/testproxy/test-proxy-tool.yml
Original file line number Diff line number Diff line change
@@ -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 `
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
14 changes: 13 additions & 1 deletion eng/pipelines/patch_release_client.txt
Original file line number Diff line number Diff line change
@@ -14,19 +14,21 @@
# 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
@@ -41,3 +43,13 @@ 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/scripts/Invoke-Codegeneration.ps1
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ com.azure:azure-communication-callingserver;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-communication-callautomation;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-communication-common;1.2.6;1.3.0-beta.1
com.azure:azure-communication-common-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-sms;1.1.10;1.2.0-beta.1
com.azure:azure-communication-sms;1.1.10;1.1.11
com.azure:azure-communication-identity;1.4.4;1.5.0-beta.1
com.azure:azure-communication-phonenumbers;1.0.19;1.1.0-beta.15
com.azure:azure-communication-networktraversal;1.1.0-beta.2;1.1.0-beta.3
@@ -272,8 +272,8 @@ com.azure.resourcemanager:azure-resourcemanager-healthbot;1.0.0-beta.2;1.0.0-bet
com.azure.resourcemanager:azure-resourcemanager-confluent;1.0.0-beta.3;1.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-digitaltwins;1.1.0;1.2.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-netapp;1.0.0-beta.11;1.0.0-beta.12
com.azure.resourcemanager:azure-resourcemanager-storagecache;1.0.0-beta.7;1.0.0-beta.8
com.azure.resourcemanager:azure-resourcemanager-redisenterprise;1.0.0;1.1.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-storagecache;1.0.0-beta.8;1.0.0-beta.9
com.azure.resourcemanager:azure-resourcemanager-redisenterprise;1.0.0;1.1.0-beta.3
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

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
import com.azure.core.annotation.Fluent;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import java.util.stream.Collectors;

/** The CollectTonesResult model. */
@Fluent
@@ -36,4 +37,19 @@ public CollectTonesResult setTones(List<DtmfTone> dtmfTones) {
this.dtmfTones = dtmfTones;
return this;
}

/**
* Set the tones property: The tones property.
*
* @return the CollectTonesResult object itself.
*/
public String convertToString() {
if (this.dtmfTones == null) {
return "";
}

return this.dtmfTones.stream()
.map(x -> x.convertToString())
.collect(Collectors.joining());
}
}
Loading