Skip to content

Commit c3ef7e3

Browse files
sbomersbomer
committed
Add Name to DisplayAttribute
1 parent f49dfbb commit c3ef7e3

File tree

53 files changed

+275
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+275
-63
lines changed

‎src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,79 +11,94 @@ namespace Microsoft.Diagnostics.Monitoring.AzureBlobStorage
1111
internal sealed partial class AzureBlobEgressProviderOptions
1212
{
1313
[Display(
14+
Name = nameof(AccountUri),
1415
ResourceType = typeof(OptionsDisplayStrings),
1516
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountUri))]
1617
[Required]
1718
public Uri AccountUri { get; set; }
1819

1920
[Display(
21+
Name = nameof(AccountKey),
2022
ResourceType = typeof(OptionsDisplayStrings),
2123
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountKey))]
2224
public string AccountKey { get; set; }
2325

2426
[Display(
27+
Name = nameof(AccountKeyName),
2528
ResourceType = typeof(OptionsDisplayStrings),
2629
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountKeyName))]
2730
public string AccountKeyName { get; set; }
2831

2932
[Display(
33+
Name = nameof(SharedAccessSignature),
3034
ResourceType = typeof(OptionsDisplayStrings),
3135
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_SharedAccessSignature))]
3236
public string SharedAccessSignature { get; set; }
3337

3438
[Display(
39+
Name = nameof(SharedAccessSignatureName),
3540
ResourceType = typeof(OptionsDisplayStrings),
3641
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_SharedAccessSignatureName))]
3742
public string SharedAccessSignatureName { get; set; }
3843

3944
[Display(
45+
Name = nameof(ManagedIdentityClientId),
4046
ResourceType = typeof(OptionsDisplayStrings),
4147
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ManagedIdentityClientId))]
4248
public string ManagedIdentityClientId { get; set; }
4349

4450
[Display(
51+
Name = nameof(UseWorkloadIdentityFromEnvironment),
4552
ResourceType = typeof(OptionsDisplayStrings),
4653
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFromEnvironment))]
4754
public bool? UseWorkloadIdentityFromEnvironment { get; set; }
4855

4956
[Display(
57+
Name = nameof(ContainerName),
5058
ResourceType = typeof(OptionsDisplayStrings),
5159
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ContainerName))]
5260
[Required]
5361
public string ContainerName { get; set; }
5462

5563
[Display(
64+
Name = nameof(BlobPrefix),
5665
ResourceType = typeof(OptionsDisplayStrings),
5766
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_BlobPrefix))]
5867
public string BlobPrefix { get; set; }
5968

6069
[Display(
70+
Name = nameof(CopyBufferSize),
6171
ResourceType = typeof(OptionsDisplayStrings),
6272
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
6373
[Range(1, int.MaxValue)]
6474
public int? CopyBufferSize { get; set; }
6575

6676
[Display(
77+
Name = nameof(QueueName),
6778
ResourceType = typeof(OptionsDisplayStrings),
6879
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueName))]
6980
public string QueueName { get; set; }
7081

7182
[Display(
83+
Name = nameof(QueueAccountUri),
7284
ResourceType = typeof(OptionsDisplayStrings),
7385
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueAccountUri))]
7486
public Uri QueueAccountUri { get; set; }
7587

7688
[Display(
89+
Name = nameof(QueueSharedAccessSignature),
7790
ResourceType = typeof(OptionsDisplayStrings),
7891
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueSharedAccessSignature))]
7992
public string QueueSharedAccessSignature { get; set; }
8093

8194
[Display(
95+
Name = nameof(QueueSharedAccessSignatureName),
8296
ResourceType = typeof(OptionsDisplayStrings),
8397
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueSharedAccessSignatureName))]
8498
public string QueueSharedAccessSignatureName { get; set; }
8599

86100
[Display(
101+
Name = nameof(Metadata),
87102
ResourceType = typeof(OptionsDisplayStrings),
88103
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_Metadata))]
89104
public IDictionary<string, string> Metadata { get; set; }

‎src/Extensions/S3Storage/S3StorageEgressProviderOptions.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,77 @@ namespace Microsoft.Diagnostics.Monitoring.Extension.S3Storage
1313
internal sealed partial class S3StorageEgressProviderOptions
1414
{
1515
[Display(
16+
Name = nameof(Endpoint),
1617
ResourceType = typeof(OptionsDisplayStrings),
1718
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_Endpoint))]
1819
public string? Endpoint { get; set; }
1920

2021
[Display(
22+
Name = nameof(BucketName),
2123
ResourceType = typeof(OptionsDisplayStrings),
2224
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_BucketName))]
2325
[Required(AllowEmptyStrings = false)]
2426
public string BucketName { get; set; } = string.Empty;
2527

2628
[Display(
29+
Name = nameof(RegionName),
2730
ResourceType = typeof(OptionsDisplayStrings),
2831
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_RegionName))]
2932
public string? RegionName { get; set; }
3033

3134
[Display(
35+
Name = nameof(AccessKeyId),
3236
ResourceType = typeof(OptionsDisplayStrings),
3337
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AccessKeyId))]
3438
public string? AccessKeyId { get; set; }
3539

3640
[Display(
41+
Name = nameof(SecretAccessKey),
3742
ResourceType = typeof(OptionsDisplayStrings),
3843
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_SecretAccessKey))]
3944
public string? SecretAccessKey { get; set; }
4045

4146
[Display(
47+
Name = nameof(AwsProfileName),
4248
ResourceType = typeof(OptionsDisplayStrings),
4349
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AWSProfileName))]
4450
public string? AwsProfileName { get; set; }
4551

4652
[Display(
53+
Name = nameof(AwsProfilePath),
4754
ResourceType = typeof(OptionsDisplayStrings),
4855
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AWSProfilePath))]
4956
public string? AwsProfilePath { get; set; }
5057

5158
[Display(
59+
Name = nameof(PreSignedUrlExpiry),
5260
ResourceType = typeof(OptionsDisplayStrings),
5361
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_PreSignedUrlExpiry))]
5462
[Range(typeof(TimeSpan), "00:01:00", "1.00:00:00")]
5563
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Addressed by DynamicDependency on ValidationHelper.TryValidateOptions method")]
5664
public TimeSpan? PreSignedUrlExpiry { get; set; }
5765

5866
[Display(
67+
Name = nameof(ForcePathStyle),
5968
ResourceType = typeof(OptionsDisplayStrings),
6069
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_ForcePathStyle))]
6170
public bool ForcePathStyle { get; set; }
6271

6372
[Display(
73+
Name = nameof(CopyBufferSize),
6474
ResourceType = typeof(OptionsDisplayStrings),
6575
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
6676
[Range(1, int.MaxValue)]
6777
public int? CopyBufferSize { get; set; }
6878

6979
[Display(
80+
Name = nameof(UseKmsEncryption),
7081
ResourceType = typeof(OptionsDisplayStrings),
7182
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_UseKmsEncryption))]
7283
public bool UseKmsEncryption { get; set; }
7384

7485
[Display(
86+
Name = nameof(KmsEncryptionKey),
7587
ResourceType = typeof(OptionsDisplayStrings),
7688
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_KmsEncryptionKey))]
7789
public string? KmsEncryptionKey { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/AuthenticationOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ namespace Microsoft.Diagnostics.Tools.Monitor
99
internal sealed partial class AuthenticationOptions
1010
{
1111
[Display(
12+
Name = nameof(MonitorApiKey),
1213
ResourceType = typeof(OptionsDisplayStrings),
1314
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AuthenticationOptions_MonitorApiKey))]
1415
public MonitorApiKeyOptions? MonitorApiKey { get; set; }
1516

1617
[Display(
18+
Name = nameof(AzureAd),
1719
ResourceType = typeof(OptionsDisplayStrings),
1820
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AuthenticationOptions_AzureAd))]
1921
public AzureAdOptions? AzureAd { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,34 @@ namespace Microsoft.Diagnostics.Tools.Monitor
1111
internal sealed partial class AzureAdOptions
1212
{
1313
[Display(
14+
Name = nameof(Instance),
1415
ResourceType = typeof(OptionsDisplayStrings),
1516
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_Instance))]
1617
[DefaultValue(AzureAdOptionsDefaults.DefaultInstance)]
1718
public Uri? Instance { get; set; }
1819

1920
[Display(
21+
Name = nameof(TenantId),
2022
ResourceType = typeof(OptionsDisplayStrings),
2123
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_TenantId))]
2224
[Required]
2325
public string TenantId { get; set; } = string.Empty;
2426

2527
[Display(
28+
Name = nameof(ClientId),
2629
ResourceType = typeof(OptionsDisplayStrings),
2730
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_ClientId))]
2831
[Required]
2932
public string ClientId { get; set; } = string.Empty;
3033

3134
[Display(
35+
Name = nameof(AppIdUri),
3236
ResourceType = typeof(OptionsDisplayStrings),
3337
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_AppIdUri))]
3438
public Uri? AppIdUri { get; set; }
3539

3640
[Display(
41+
Name = nameof(RequiredRole),
3742
ResourceType = typeof(OptionsDisplayStrings),
3843
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_RequiredRole))]
3944
[Required]

‎src/Microsoft.Diagnostics.Monitoring.Options/CallStacksOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public sealed class CallStacksOptions :
1111
IInProcessFeatureOptions
1212
{
1313
[Display(
14+
Name = nameof(Enabled),
1415
ResourceType = typeof(OptionsDisplayStrings),
1516
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CallStacksOptions_Enabled))]
1617
[DefaultValue(CallStacksOptionsDefaults.Enabled)]

‎src/Microsoft.Diagnostics.Monitoring.Options/CorsConfigurationOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace Microsoft.Diagnostics.Monitoring.WebApi
88
public class CorsConfigurationOptions
99
{
1010
[Display(
11+
Name = nameof(AllowedOrigins),
1112
ResourceType = typeof(OptionsDisplayStrings),
1213
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CorsConfiguration_AllowedOrigins))]
1314
[Required]

‎src/Microsoft.Diagnostics.Monitoring.Options/DiagnosticPortOptions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,26 @@ namespace Microsoft.Diagnostics.Monitoring.WebApi
99
public class DiagnosticPortOptions
1010
{
1111
[Display(
12+
Name = nameof(ConnectionMode),
1213
ResourceType = typeof(OptionsDisplayStrings),
1314
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_ConnectionMode))]
1415
[DefaultValue(DiagnosticPortOptionsDefaults.ConnectionMode)]
1516
public DiagnosticPortConnectionMode? ConnectionMode { get; set; }
1617

1718
[Display(
19+
Name = nameof(EndpointName),
1820
ResourceType = typeof(OptionsDisplayStrings),
1921
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_EndpointName))]
2022
public string? EndpointName { get; set; }
2123

2224
[Display(
25+
Name = nameof(MaxConnections),
2326
ResourceType = typeof(OptionsDisplayStrings),
2427
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_MaxConnections))]
2528
public int? MaxConnections { get; set; }
2629

2730
[Display(
31+
Name = nameof(DeleteEndpointOnStartup),
2832
ResourceType = typeof(OptionsDisplayStrings),
2933
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_DeleteEndpointOnStartup))]
3034
[DefaultValue(DiagnosticPortOptionsDefaults.DeleteEndpointOnStartup)]

‎src/Microsoft.Diagnostics.Monitoring.Options/EgressOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ namespace Microsoft.Diagnostics.Tools.Monitor
1111
internal sealed class EgressOptions
1212
{
1313
[Display(
14+
Name = nameof(FileSystem),
1415
ResourceType = typeof(OptionsDisplayStrings),
1516
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_EgressOptions_FileSystem))]
1617
public IDictionary<string, FileSystemEgressProviderOptions>? FileSystem { get; set; }
1718

1819
[Display(
20+
Name = nameof(Properties),
1921
ResourceType = typeof(OptionsDisplayStrings),
2022
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_EgressOptions_Properties))]
2123
public IDictionary<string, string>? Properties { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/ExceptionsOptions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@ public sealed class ExceptionsOptions :
1111
IInProcessFeatureOptions
1212
{
1313
[Display(
14+
Name = nameof(Enabled),
1415
ResourceType = typeof(OptionsDisplayStrings),
1516
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_Enabled))]
1617
[DefaultValue(ExceptionsOptionsDefaults.Enabled)]
1718
public bool? Enabled { get; set; }
1819

1920
[Display(
21+
Name = nameof(TopLevelLimit),
2022
ResourceType = typeof(OptionsDisplayStrings),
2123
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_TopLevelLimit))]
2224
[Range(1, int.MaxValue)]
2325
[DefaultValue(ExceptionsOptionsDefaults.TopLevelLimit)]
2426
public int? TopLevelLimit { get; set; }
2527

2628
[Display(
29+
Name = nameof(CollectionFilters),
2730
ResourceType = typeof(OptionsDisplayStrings),
2831
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_CollectionFilters))]
2932
public ExceptionsConfiguration? CollectionFilters { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/FileSystemEgressProviderOptions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,20 @@ internal sealed class FileSystemEgressProviderOptions
1515
public const int CopyBufferSize_MaxValue = int.MaxValue;
1616

1717
[Display(
18+
Name = nameof(DirectoryPath),
1819
ResourceType = typeof(OptionsDisplayStrings),
1920
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_FileSystemEgressProviderOptions_DirectoryPath))]
2021
[Required]
2122
public string DirectoryPath { get; set; } = string.Empty;
2223

2324
[Display(
25+
Name = nameof(IntermediateDirectoryPath),
2426
ResourceType = typeof(OptionsDisplayStrings),
2527
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_FileSystemEgressProviderOptions_IntermediateDirectoryPath))]
2628
public string? IntermediateDirectoryPath { get; set; }
2729

2830
[Display(
31+
Name = nameof(CopyBufferSize),
2932
ResourceType = typeof(OptionsDisplayStrings),
3033
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
3134
[Range(CopyBufferSize_MinValue, CopyBufferSize_MaxValue)]

0 commit comments

Comments
 (0)