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

POC v1: CredentialProvider #48207

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -970,12 +970,6 @@
# ServiceLabel: %Astronomer %Mgmt
# ServiceOwners: @banggaurav

# PRLabel: %Azure Stack Hci
/sdk/azurestackhci/Azure.ResourceManager.Hci/ @priyjain358

# ServiceLabel: %Azure Stack Hci %Mgmt
# ServiceOwners: @priyjain358

# PRLabel: %Communication - Resource Manager
/sdk/communication/Azure.ResourceManager.Communication/ @archerzz @ArcturusZhang @ArthurMa1978

Expand Down
3 changes: 2 additions & 1 deletion eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
<PackageReference Update="Azure.Storage.Blobs" Version="12.23.0" />
<PackageReference Update="Azure.Storage.Queues" Version="12.21.0" />
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.21.0" />
<PackageReference Update="Azure.Storage.DataMovement" Version="12.0.0" />
<PackageReference Update="Azure.ResourceManager" Version="1.13.0" />
<PackageReference Update="Azure.ResourceManager.AppConfiguration" Version="1.3.2" />
<PackageReference Update="Azure.ResourceManager.ApplicationInsights" Version="1.0.0" />
Expand Down Expand Up @@ -189,7 +190,7 @@
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
<PackageReference Update="OpenAI" Version="2.1.0" />
<PackageReference Update="OpenAI" Version="2.2.0-beta.1" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.MicrosoftPlaywrightTesting'))">
Expand Down
29 changes: 24 additions & 5 deletions eng/common/scripts/Helpers/Package-Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,33 @@ function Group-ByObjectKey {
$groupedDictionary = @{}

foreach ($item in $Items) {
$key = Get-ObjectKey $item."$GroupByProperty"
# if the item is an array, we need to group by each element in the array
# however if it's an empty array we want to treat it as a single item
if ($item."$GroupByProperty" -and $item."$GroupByProperty" -is [array]) {
foreach ($GroupByPropertyValue in $item."$GroupByProperty") {
$key = Get-ObjectKey $GroupByPropertyValue

if (-not $groupedDictionary.ContainsKey($key)) {
$groupedDictionary[$key] = @()
if (-not $groupedDictionary.ContainsKey($key)) {
$groupedDictionary[$key] = @()
}

$groupedDictionary[$key] += $item
}
}
else {
if ($item."$GroupByProperty") {
$key = Get-ObjectKey $item."$GroupByProperty"
}
else {
$key = "unset"
}

if (-not $groupedDictionary.ContainsKey($key)) {
$groupedDictionary[$key] = @()
}

# Add the current item to the array for this key
$groupedDictionary[$key] += $item
$groupedDictionary[$key] += $item
}
}

return $groupedDictionary
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/ci.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:

- pwsh: |
if ("$(ProjectNames)" -like "*storage*") {
&"$(Build.SourcesDirectory)/eng/scripts/install_azurite.ps1" -AzuriteLocation "$(AzuriteLocation)" -AzuriteVersion "$(AzuriteVersion)"
&"$(Build.SourcesDirectory)/eng/scripts/Install-Azurite.ps1" -AzuriteLocation "$(AzuriteLocation)" -AzuriteVersion "$(AzuriteVersion)"
}
displayName: Install Azurite If Necessary
condition: ne(variables['ProjectNames'], '')
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
/p:ServiceDirectory=* `
/p:ProjectListOverrideFile=$(ProjectListOverrideFile) `
$(DiagnosticArguments)
displayName: "Build and Package"
displayName: "Build and Package for PR"
- ${{ else }}:
- pwsh: |
if (Test-Path "$(ProjectListOverrideFile)") {
Expand All @@ -160,7 +160,7 @@ jobs:
/p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory)
/p:ProjectListOverrideFile=$(ProjectListOverrideFile)
$(DiagnosticArguments)
displayName: "Build and Package"
displayName: "Build and Package Service Directory"

# save package properties again, this time honoring the dev version number
- ${{ if ne(parameters.ServiceDirectory, 'auto') }}:
Expand Down
11 changes: 8 additions & 3 deletions eng/scripts/Language-Settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,20 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
if ($pkgProp.Name -in $DependencyCalculationPackages -and $env:DISCOVER_DEPENDENT_PACKAGES) {
Write-Host "Calculating dependencies for $($pkgProp.Name)"
$outputFilePath = Join-Path $RepoRoot "$($pkgProp.Name)_dependencylist.txt"
$buildOutputPath = Join-Path $RepoRoot "$($pkgProp.Name)_dependencylistoutput.txt"

if (!(Test-Path $outputFilePath)) {
try {
Invoke-LoggedCommand "dotnet build /t:ProjectDependsOn ./eng/service.proj /p:TestDependsOnDependency=`"$($pkgProp.Name)`" /p:IncludeSrc=false " +
$command = "dotnet build /t:ProjectDependsOn ./eng/service.proj /p:TestDependsOnDependency=`"$($pkgProp.Name)`" /p:IncludeSrc=false " +
"/p:IncludeStress=false /p:IncludeSamples=false /p:IncludePerf=false /p:RunApiCompat=false /p:InheritDocEnabled=false /p:BuildProjectReferences=false" +
" /p:OutputProjectFilePath=`"$outputFilePath`""
" /p:OutputProjectFilePath=`"$outputFilePath`" > $buildOutputPath 2>&1"

Invoke-LoggedCommand $command | Out-Null
}
catch {
Write-Host "Failed calculating dependencies for $($pkgProp.Name), continuing."
Write-Host "Failed calculating dependencies for $($pkgProp.Name). Exit code $LASTEXITCODE."
Write-Host "Dumping erroring build output."
Write-Host (Get-Content -Raw $buildOutputPath)
continue
}
}
Expand Down
7 changes: 2 additions & 5 deletions eng/service.proj
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,10 @@
<Import Project="..\sdk\$(ServiceDirectory)\*.projects" />
<Import Project="$(RepoRoot)$(ProjectListOverrideFile)" Condition="'$(ProjectListOverrideFile)' != '' " />

<!-- Remove all track1 SDKs from Regen -->
<ItemGroup Condition="'$(ProjectListOverrideFile)' != '' ">
<ItemGroup Condition="'$(ProjectListOverrideFile)' != '' and '$(EnableOverrideExclusions)' != ''">
<!-- Remove all track1 SDKs from Regen -->
<Track1ProjectsToRemove Include="$(MSBuildThisFileDirectory)..\sdk\*\Microsoft.*.Management.*\**\*.csproj;$(MSBuildThisFileDirectory)..\sdk\*mgmt*\**\*.csproj;$(MSBuildThisFileDirectory)..\sdk\*\Microsoft.Azure.*\**\*.csproj" />
<ProjectReference Remove="@(Track1ProjectsToRemove)" />
</ItemGroup>

<ItemGroup Condition="'$(ProjectListOverrideFile)' != '' and '$(EnableOverrideExclusions)' != ''">
<TestProjects Include="..\sdk\$(ServiceDirectory)\$(Project)\tests\**\*.csproj" Exclude="@(MgmtExcludePaths)" />
<SamplesProjects Include="..\sdk\$(ServiceDirectory)\$(Project)\samples\**\*.csproj;..\sdk\$(ServiceDirectory)\samples\**\*.csproj" Exclude="@(MgmtExcludePaths)" />
<PerfProjects Include="..\sdk\$(ServiceDirectory)\$(Project)\perf\**\*.csproj" Exclude="@(MgmtExcludePaths)" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Release History

## 1.3.0-beta.6 (Unreleased)
## 1.3.0 (2025-02-11)

### Features Added

### Breaking Changes
- GA release of Number Insight.
- API version `(2025-02-11)` is the default

### Bugs Fixed

### Other Changes
- OperatorDetails.Name is now optional in OperatorInformation Response.

## 1.3.0-beta.5 (2024-03-01)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,15 @@ public PhoneNumbersClient(System.Uri endpoint, Azure.Core.TokenCredential tokenC
}
public partial class PhoneNumbersClientOptions : Azure.Core.ClientOptions
{
public PhoneNumbersClientOptions(Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion version = Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion.V2024_03_01_Preview) { }
public PhoneNumbersClientOptions(Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion version = Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion.V2025_02_11) { }
public string? AcceptedLanguage { get { throw null; } set { } }
public enum ServiceVersion
{
V2021_03_07 = 1,
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
V2022_01_11_Preview_2 = 2,
V2022_12_01 = 3,
V2024_03_01_Preview = 4,
V2025_02_11 = 4,
}
}
public partial class PhoneNumberSearchOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,15 @@ public PhoneNumbersClient(System.Uri endpoint, Azure.Core.TokenCredential tokenC
}
public partial class PhoneNumbersClientOptions : Azure.Core.ClientOptions
{
public PhoneNumbersClientOptions(Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion version = Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion.V2024_03_01_Preview) { }
public PhoneNumbersClientOptions(Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion version = Azure.Communication.PhoneNumbers.PhoneNumbersClientOptions.ServiceVersion.V2025_02_11) { }
public string? AcceptedLanguage { get { throw null; } set { } }
public enum ServiceVersion
{
V2021_03_07 = 1,
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
V2022_01_11_Preview_2 = 2,
V2022_12_01 = 3,
V2024_03_01_Preview = 4,
V2025_02_11 = 4,
}
}
public partial class PhoneNumberSearchOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "net",
"TagPrefix": "net/communication/Azure.Communication.PhoneNumbers",
"Tag": "net/communication/Azure.Communication.PhoneNumbers_ab86664f5c"
"Tag": "net/communication/Azure.Communication.PhoneNumbers_e59e79351e"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
For this release, see notes - https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/communication/Azure.Communication.PhoneNumbers/README.md and https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/communication/Azure.Communication.PhoneNumbers/CHANGELOG.md.
</Description>
<AssemblyTitle>Azure Communication Phone Numbers Service</AssemblyTitle>
<Version>1.3.0-beta.6</Version>
<Version>1.3.0</Version>
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
<ApiCompatVersion>1.1.0</ApiCompatVersion>
<PackageTags>Microsoft Azure Communication Phone Numbers Service;Microsoft;Azure;Azure Communication Service;Azure Communication Phone Numbers Service;Phone Numbers;Communication;$(PackageCommonTags)</PackageTags>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

using System;
using Azure.Core;
using System.ComponentModel;

[assembly: CodeGenSuppressType("PhoneNumbersClientOptions")]
namespace Azure.Communication.PhoneNumbers
{
/// <summary> Client options for PhoneNumbersClient. </summary>
public class PhoneNumbersClientOptions : ClientOptions
{
private const ServiceVersion LatestVersion = ServiceVersion.V2024_03_01_Preview;
private const ServiceVersion LatestVersion = ServiceVersion.V2025_02_11;

/// <summary> The version of the service to use. </summary>
public enum ServiceVersion
Expand All @@ -21,11 +22,12 @@ public enum ServiceVersion
/// <summary> Service version "2021-03-07". </summary>
V2021_03_07 = 1,
/// <summary> Service version "2022-01-11-preview". </summary>
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
V2022_01_11_Preview_2 = 2,
/// <summary> Service version "2022-12-01. </summary>
V2022_12_01 = 3,
/// <summary> Service version "2024-03-01-preview". </summary>
V2024_03_01_Preview = 4,
/// <summary> Service version "2025-02-11". </summary>
V2025_02_11 = 4,
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand All @@ -47,7 +49,7 @@ public PhoneNumbersClientOptions(ServiceVersion version = LatestVersion)
ServiceVersion.V2021_03_07 => "2021-03-07",
ServiceVersion.V2022_01_11_Preview_2 => "2022-01-11-preview2",
ServiceVersion.V2022_12_01 => "2022-12-01",
ServiceVersion.V2024_03_01_Preview => "2024-03-01-preview",
ServiceVersion.V2025_02_11 => "2025-02-11",
_ => throw new NotSupportedException()
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Run `dotnet msbuild /t:GenerateCode` to generate code.

``` yaml
public-clients: true
tag: package-phonenumber-2024-03-01-preview
tag: package-phonenumber-2025-02-11
model-namespace: false
require:
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b56afb26c5450157006a3a1d9be57bae429051a2/specification/communication/data-plane/PhoneNumbers/readme.md
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/dfb05962145923b65a277a1c48458983d227e04b/specification/communication/data-plane/PhoneNumbers/readme.md
title: Phone numbers
payload-flattening-threshold: 3
generation1-convenience-client: true
Expand Down
Loading
Loading