Skip to content

Commit 7d6137d

Browse files
chore: rename ConfigurationAudience (Azure#48723)
1 parent e2f83e1 commit 7d6137d

File tree

6 files changed

+72
-73
lines changed

6 files changed

+72
-73
lines changed

sdk/appconfiguration/Azure.Data.AppConfiguration/api/Azure.Data.AppConfiguration.net8.0.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
namespace Azure.Data.AppConfiguration
22
{
33
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
4-
public readonly partial struct ConfigurationAudience : System.IEquatable<Azure.Data.AppConfiguration.ConfigurationAudience>
4+
public readonly partial struct AppConfigurationAudience : System.IEquatable<Azure.Data.AppConfiguration.AppConfigurationAudience>
55
{
66
private readonly object _dummy;
77
private readonly int _dummyPrimitive;
8-
public ConfigurationAudience(string value) { throw null; }
9-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzureChina { get { throw null; } }
10-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzureGovernment { get { throw null; } }
11-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzurePublicCloud { get { throw null; } }
12-
public bool Equals(Azure.Data.AppConfiguration.ConfigurationAudience other) { throw null; }
8+
public AppConfigurationAudience(string value) { throw null; }
9+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzureChina { get { throw null; } }
10+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzureGovernment { get { throw null; } }
11+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzurePublicCloud { get { throw null; } }
12+
public bool Equals(Azure.Data.AppConfiguration.AppConfigurationAudience other) { throw null; }
1313
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1414
public override bool Equals(object obj) { throw null; }
1515
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1616
public override int GetHashCode() { throw null; }
17-
public static bool operator ==(Azure.Data.AppConfiguration.ConfigurationAudience left, Azure.Data.AppConfiguration.ConfigurationAudience right) { throw null; }
18-
public static implicit operator Azure.Data.AppConfiguration.ConfigurationAudience (string value) { throw null; }
19-
public static bool operator !=(Azure.Data.AppConfiguration.ConfigurationAudience left, Azure.Data.AppConfiguration.ConfigurationAudience right) { throw null; }
17+
public static bool operator ==(Azure.Data.AppConfiguration.AppConfigurationAudience left, Azure.Data.AppConfiguration.AppConfigurationAudience right) { throw null; }
18+
public static implicit operator Azure.Data.AppConfiguration.AppConfigurationAudience (string value) { throw null; }
19+
public static bool operator !=(Azure.Data.AppConfiguration.AppConfigurationAudience left, Azure.Data.AppConfiguration.AppConfigurationAudience right) { throw null; }
2020
public override string ToString() { throw null; }
2121
}
2222
public partial class ConfigurationClient
@@ -93,7 +93,7 @@ public static partial class ConfigurationClientExtensions
9393
public partial class ConfigurationClientOptions : Azure.Core.ClientOptions
9494
{
9595
public ConfigurationClientOptions(Azure.Data.AppConfiguration.ConfigurationClientOptions.ServiceVersion version = Azure.Data.AppConfiguration.ConfigurationClientOptions.ServiceVersion.V2023_11_01) { }
96-
public Azure.Data.AppConfiguration.ConfigurationAudience? Audience { get { throw null; } set { } }
96+
public Azure.Data.AppConfiguration.AppConfigurationAudience? Audience { get { throw null; } set { } }
9797
public enum ServiceVersion
9898
{
9999
V1_0 = 0,

sdk/appconfiguration/Azure.Data.AppConfiguration/api/Azure.Data.AppConfiguration.netstandard2.0.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
namespace Azure.Data.AppConfiguration
22
{
33
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
4-
public readonly partial struct ConfigurationAudience : System.IEquatable<Azure.Data.AppConfiguration.ConfigurationAudience>
4+
public readonly partial struct AppConfigurationAudience : System.IEquatable<Azure.Data.AppConfiguration.AppConfigurationAudience>
55
{
66
private readonly object _dummy;
77
private readonly int _dummyPrimitive;
8-
public ConfigurationAudience(string value) { throw null; }
9-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzureChina { get { throw null; } }
10-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzureGovernment { get { throw null; } }
11-
public static Azure.Data.AppConfiguration.ConfigurationAudience AzurePublicCloud { get { throw null; } }
12-
public bool Equals(Azure.Data.AppConfiguration.ConfigurationAudience other) { throw null; }
8+
public AppConfigurationAudience(string value) { throw null; }
9+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzureChina { get { throw null; } }
10+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzureGovernment { get { throw null; } }
11+
public static Azure.Data.AppConfiguration.AppConfigurationAudience AzurePublicCloud { get { throw null; } }
12+
public bool Equals(Azure.Data.AppConfiguration.AppConfigurationAudience other) { throw null; }
1313
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1414
public override bool Equals(object obj) { throw null; }
1515
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1616
public override int GetHashCode() { throw null; }
17-
public static bool operator ==(Azure.Data.AppConfiguration.ConfigurationAudience left, Azure.Data.AppConfiguration.ConfigurationAudience right) { throw null; }
18-
public static implicit operator Azure.Data.AppConfiguration.ConfigurationAudience (string value) { throw null; }
19-
public static bool operator !=(Azure.Data.AppConfiguration.ConfigurationAudience left, Azure.Data.AppConfiguration.ConfigurationAudience right) { throw null; }
17+
public static bool operator ==(Azure.Data.AppConfiguration.AppConfigurationAudience left, Azure.Data.AppConfiguration.AppConfigurationAudience right) { throw null; }
18+
public static implicit operator Azure.Data.AppConfiguration.AppConfigurationAudience (string value) { throw null; }
19+
public static bool operator !=(Azure.Data.AppConfiguration.AppConfigurationAudience left, Azure.Data.AppConfiguration.AppConfigurationAudience right) { throw null; }
2020
public override string ToString() { throw null; }
2121
}
2222
public partial class ConfigurationClient
@@ -93,7 +93,7 @@ public static partial class ConfigurationClientExtensions
9393
public partial class ConfigurationClientOptions : Azure.Core.ClientOptions
9494
{
9595
public ConfigurationClientOptions(Azure.Data.AppConfiguration.ConfigurationClientOptions.ServiceVersion version = Azure.Data.AppConfiguration.ConfigurationClientOptions.ServiceVersion.V2023_11_01) { }
96-
public Azure.Data.AppConfiguration.ConfigurationAudience? Audience { get { throw null; } set { } }
96+
public Azure.Data.AppConfiguration.AppConfigurationAudience? Audience { get { throw null; } set { } }
9797
public enum ServiceVersion
9898
{
9999
V1_0 = 0,

sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationAudience.cs renamed to sdk/appconfiguration/Azure.Data.AppConfiguration/src/AppConfigurationAudience.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,47 @@
77
namespace Azure.Data.AppConfiguration
88
{
99
/// <summary> Cloud audiences available for AppConfiguration. </summary>
10-
public readonly struct ConfigurationAudience : IEquatable<ConfigurationAudience>
10+
public readonly struct AppConfigurationAudience : IEquatable<AppConfigurationAudience>
1111
{
1212
private readonly string _value;
1313
private const string AzureChinaValue = "https://appconfig.azure.cn";
1414
private const string AzureGovernmentValue = "https://appconfig.azure.us";
1515
private const string AzurePublicCloudValue = "https://appconfig.azure.com";
1616

1717
/// <summary>
18-
/// Initializes a new instance of the <see cref="ConfigurationAudience"/> object.
18+
/// Initializes a new instance of the <see cref="AppConfigurationAudience"/> object.
1919
/// </summary>
2020
/// <param name="value">The Microsoft Entra audience to use when forming authorization scopes.
2121
/// For the App Configuration service, this value corresponds to a URL that identifies the Azure cloud where the resource is located.</param>
2222
/// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
2323
/// <remarks>Please use one of the constant members over creating a custom value unless you have special needs for doing so.</remarks>
24-
public ConfigurationAudience(string value)
24+
public AppConfigurationAudience(string value)
2525
{
2626
Argument.AssertNotNullOrEmpty(value, nameof(value));
2727
_value = value;
2828
}
2929

3030
/// <summary> Azure China. </summary>
31-
public static ConfigurationAudience AzureChina { get; } = new ConfigurationAudience(AzureChinaValue);
31+
public static AppConfigurationAudience AzureChina { get; } = new AppConfigurationAudience(AzureChinaValue);
3232

3333
/// <summary> Azure Government. </summary>
34-
public static ConfigurationAudience AzureGovernment { get; } = new ConfigurationAudience(AzureGovernmentValue);
34+
public static AppConfigurationAudience AzureGovernment { get; } = new AppConfigurationAudience(AzureGovernmentValue);
3535

3636
/// <summary> Azure Public Cloud. </summary>
37-
public static ConfigurationAudience AzurePublicCloud { get; } = new ConfigurationAudience(AzurePublicCloudValue);
37+
public static AppConfigurationAudience AzurePublicCloud { get; } = new AppConfigurationAudience(AzurePublicCloudValue);
3838

39-
/// <summary> Determines if two <see cref="ConfigurationAudience"/> values are the same. </summary>
40-
public static bool operator ==(ConfigurationAudience left, ConfigurationAudience right) => left.Equals(right);
41-
/// <summary> Determines if two <see cref="ConfigurationAudience"/> values are not the same. </summary>
42-
public static bool operator !=(ConfigurationAudience left, ConfigurationAudience right) => !left.Equals(right);
43-
/// <summary> Converts a string to a <see cref="ConfigurationAudience"/>. </summary>
44-
public static implicit operator ConfigurationAudience(string value) => new ConfigurationAudience(value);
39+
/// <summary> Determines if two <see cref="AppConfigurationAudience"/> values are the same. </summary>
40+
public static bool operator ==(AppConfigurationAudience left, AppConfigurationAudience right) => left.Equals(right);
41+
/// <summary> Determines if two <see cref="AppConfigurationAudience"/> values are not the same. </summary>
42+
public static bool operator !=(AppConfigurationAudience left, AppConfigurationAudience right) => !left.Equals(right);
43+
/// <summary> Converts a string to a <see cref="AppConfigurationAudience"/>. </summary>
44+
public static implicit operator AppConfigurationAudience(string value) => new AppConfigurationAudience(value);
4545

4646
/// <inheritdoc />
4747
[EditorBrowsable(EditorBrowsableState.Never)]
48-
public override bool Equals(object obj) => obj is ConfigurationAudience other && Equals(other);
48+
public override bool Equals(object obj) => obj is AppConfigurationAudience other && Equals(other);
4949
/// <inheritdoc />
50-
public bool Equals(ConfigurationAudience other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
50+
public bool Equals(AppConfigurationAudience other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
5151

5252
/// <inheritdoc />
5353
[EditorBrowsable(EditorBrowsableState.Never)]

sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClientOptions.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ public enum ServiceVersion
4343
/// <summary>
4444
/// Gets or sets the Audience to use for authentication with Microsoft Entra. The audience is not considered when using a shared key.
4545
/// </summary>
46-
/// <value>If <c>null</c>, <see cref="ConfigurationAudience.AzurePublicCloud" /> will be assumed.</value>
47-
public ConfigurationAudience? Audience { get; set; }
46+
public AppConfigurationAudience? Audience { get; set; }
4847

4948
internal string Version { get; }
5049

@@ -77,10 +76,10 @@ internal string GetDefaultScope(Uri uri)
7776
return host switch
7877
{
7978
_ when host.EndsWith(AzConfigUsGovCloudHostName, StringComparison.InvariantCultureIgnoreCase) || host.EndsWith(AppConfigUsGovCloudHostName, StringComparison.InvariantCultureIgnoreCase)
80-
=> $"{ConfigurationAudience.AzureGovernment}/.default",
79+
=> $"{AppConfigurationAudience.AzureGovernment}/.default",
8180
_ when host.EndsWith(AzConfigChinaCloudHostName, StringComparison.InvariantCultureIgnoreCase) || host.EndsWith(AppConfigChinaCloudHostName, StringComparison.InvariantCultureIgnoreCase)
82-
=> $"{ConfigurationAudience.AzureChina}/.default",
83-
_ => $"{ConfigurationAudience.AzurePublicCloud}/.default"
81+
=> $"{AppConfigurationAudience.AzureChina}/.default",
82+
_ => $"{AppConfigurationAudience.AzurePublicCloud}/.default"
8483
};
8584
}
8685

sdk/appconfiguration/Azure.Data.AppConfiguration/tests/AppConfigurationTestEnvironment.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ public class AppConfigurationTestEnvironment : TestEnvironment
1313
public string Endpoint => GetRecordedVariable("APPCONFIGURATION_ENDPOINT_STRING");
1414
public string SecretId => GetRecordedVariable("KEYVAULT_SECRET_URL");
1515

16-
public ConfigurationAudience GetAudience()
16+
public AppConfigurationAudience GetAudience()
1717
{
1818
Uri authorityHost = new(AuthorityHostUrl);
1919

2020
if (authorityHost == AzureAuthorityHosts.AzurePublicCloud)
2121
{
22-
return ConfigurationAudience.AzurePublicCloud;
22+
return AppConfigurationAudience.AzurePublicCloud;
2323
}
2424

2525
if (authorityHost == AzureAuthorityHosts.AzureChina)
2626
{
27-
return ConfigurationAudience.AzureChina;
27+
return AppConfigurationAudience.AzureChina;
2828
}
2929

3030
if (authorityHost == AzureAuthorityHosts.AzureGovernment)
3131
{
32-
return ConfigurationAudience.AzureGovernment;
32+
return AppConfigurationAudience.AzureGovernment;
3333
}
3434

3535
throw new NotSupportedException($"Cloud for authority host {authorityHost} is not supported.");

0 commit comments

Comments
 (0)