diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md index 2fc47fbf3d12..5dfb122cbe7a 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md @@ -3,7 +3,12 @@ ## 1.0.0-beta.5 (Unreleased) ### Breaking Changes -- The whole `DatasourceCredential` API has been renamed to `DataSourceCredential`. This includes renames in types, methods, and properties. +- The whole `DatasourceCredential` API has been renamed to `DataSourceCredential`. This includes renames in methods, method parameters, and properties. + - Renamed class `DatasourceCredential` to `DataSourceCredentialEntity`. + - Renamed class `DataLakeGen2SharedKeyDatasourceCredential` to `DataSourceDataLakeGen2SharedKey`. + - Renamed class `ServicePrincipalDatasourceCredential` to `DataSourceServicePrincipal`. + - Renamed class `ServicePrincipalInKeyVaultDatasourceCredential` to `DataSourceServicePrincipalInKeyVault`. + - Renamed class `SqlConnectionStringDatasourceCredential` to `DataSourceSqlConnectionString`. - Split the method `GetAnomalies` into two different methods: `GetAnomaliesForAlert` and `GetAnomaliesForDetectionConfiguration`. - Split the method `GetIncidents` into two different methods: `GetIncidentsForAlert` and `GetIncidentsForDetectionConfiguration`. - `DataFeedIngestionSettings` constructor now takes the required `ingestionStartTime` parameter. For this reason, the property `IngestionStartTime` is not nullable anymore. diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs index 5cf2eebcf1f7..6850e59b21c6 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs @@ -309,18 +309,40 @@ public abstract partial class DataFeedSource internal DataFeedSource() { } public Azure.AI.MetricsAdvisor.Models.DataFeedSourceType DataSourceType { get { throw null; } } } - public partial class DataLakeGen2SharedKeyDataSourceCredential : Azure.AI.MetricsAdvisor.Administration.DataSourceCredential + public partial class DataSourceCredentialEntity { - public DataLakeGen2SharedKeyDataSourceCredential(string name, string accountKey) { } - public void UpdateAccountKey(string accountKey) { } - } - public partial class DataSourceCredential - { - internal DataSourceCredential() { } + internal DataSourceCredentialEntity() { } public string Description { get { throw null; } set { } } public string Id { get { throw null; } } public string Name { get { throw null; } set { } } } + public partial class DataSourceDataLakeGen2SharedKey : Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity + { + public DataSourceDataLakeGen2SharedKey(string name, string accountKey) { } + public void UpdateAccountKey(string accountKey) { } + } + public partial class DataSourceServicePrincipal : Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity + { + public DataSourceServicePrincipal(string name, string clientId, string clientSecret, string tenantId) { } + public string ClientId { get { throw null; } set { } } + public string TenantId { get { throw null; } set { } } + public void UpdateClientSecret(string clientSecret) { } + } + public partial class DataSourceServicePrincipalInKeyVault : Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity + { + public DataSourceServicePrincipalInKeyVault(string name, System.Uri endpoint, string keyVaultClientId, string keyVaultClientSecret, string tenantId, string secretNameForClientId, string secretNameForClientSecret) { } + public System.Uri Endpoint { get { throw null; } set { } } + public string KeyVaultClientId { get { throw null; } set { } } + public string SecretNameForClientId { get { throw null; } set { } } + public string SecretNameForClientSecret { get { throw null; } set { } } + public string TenantId { get { throw null; } set { } } + public void UpdateKeyVaultClientSecret(string keyVaultClientSecret) { } + } + public partial class DataSourceSqlConnectionString : Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity + { + public DataSourceSqlConnectionString(string name, string connectionString) { } + public void UpdateConnectionString(string connectionString) { } + } public partial class EmailNotificationHook : Azure.AI.MetricsAdvisor.Administration.NotificationHook { public EmailNotificationHook(string name) { } @@ -405,8 +427,8 @@ public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.Core.TokenC public virtual System.Threading.Tasks.Task> CreateAlertConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response CreateDataFeed(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> CreateDataFeedAsync(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Response CreateDataSourceCredential(Azure.AI.MetricsAdvisor.Administration.DataSourceCredential dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateDataSourceCredentialAsync(Azure.AI.MetricsAdvisor.Administration.DataSourceCredential dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Response CreateDataSourceCredential(Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateDataSourceCredentialAsync(Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response CreateDetectionConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> CreateDetectionConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response CreateHook(Azure.AI.MetricsAdvisor.Administration.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } @@ -433,10 +455,10 @@ public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.Core.TokenC public virtual Azure.AsyncPageable GetDataFeedIngestionStatusesAsync(string dataFeedId, Azure.AI.MetricsAdvisor.Administration.GetDataFeedIngestionStatusesOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Pageable GetDataFeeds(Azure.AI.MetricsAdvisor.Administration.GetDataFeedsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.AsyncPageable GetDataFeedsAsync(Azure.AI.MetricsAdvisor.Administration.GetDataFeedsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Response GetDataSourceCredential(string dataSourceCredentialId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetDataSourceCredentialAsync(string dataSourceCredentialId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Pageable GetDataSourceCredentials(Azure.AI.MetricsAdvisor.Administration.GetDataSourceCredentialsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetDataSourceCredentialsAsync(Azure.AI.MetricsAdvisor.Administration.GetDataSourceCredentialsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Response GetDataSourceCredential(string dataSourceCredentialId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetDataSourceCredentialAsync(string dataSourceCredentialId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Pageable GetDataSourceCredentials(Azure.AI.MetricsAdvisor.Administration.GetDataSourceCredentialsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetDataSourceCredentialsAsync(Azure.AI.MetricsAdvisor.Administration.GetDataSourceCredentialsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response GetDetectionConfiguration(string detectionConfigurationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> GetDetectionConfigurationAsync(string detectionConfigurationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Pageable GetDetectionConfigurations(string metricId, Azure.AI.MetricsAdvisor.Administration.GetDetectionConfigurationsOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } @@ -451,8 +473,8 @@ public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.Core.TokenC public virtual System.Threading.Tasks.Task> UpdateAlertConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response UpdateDataFeed(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> UpdateDataFeedAsync(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Response UpdateDataSourceCredential(Azure.AI.MetricsAdvisor.Administration.DataSourceCredential dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> UpdateDataSourceCredentialAsync(Azure.AI.MetricsAdvisor.Administration.DataSourceCredential dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Response UpdateDataSourceCredential(Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> UpdateDataSourceCredentialAsync(Azure.AI.MetricsAdvisor.Administration.DataSourceCredentialEntity dataSourceCredential, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response UpdateDetectionConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> UpdateDetectionConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response UpdateHook(Azure.AI.MetricsAdvisor.Administration.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } @@ -486,28 +508,6 @@ public PostgreSqlDataFeedSource(string connectionString, string query) { } public string Query { get { throw null; } set { } } public void UpdateConnectionString(string connectionString) { } } - public partial class ServicePrincipalDataSourceCredential : Azure.AI.MetricsAdvisor.Administration.DataSourceCredential - { - public ServicePrincipalDataSourceCredential(string name, string clientId, string clientSecret, string tenantId) { } - public string ClientId { get { throw null; } set { } } - public string TenantId { get { throw null; } set { } } - public void UpdateClientSecret(string clientSecret) { } - } - public partial class ServicePrincipalInKeyVaultDataSourceCredential : Azure.AI.MetricsAdvisor.Administration.DataSourceCredential - { - public ServicePrincipalInKeyVaultDataSourceCredential(string name, System.Uri endpoint, string keyVaultClientId, string keyVaultClientSecret, string tenantId, string secretNameForClientId, string secretNameForClientSecret) { } - public System.Uri Endpoint { get { throw null; } set { } } - public string KeyVaultClientId { get { throw null; } set { } } - public string SecretNameForClientId { get { throw null; } set { } } - public string SecretNameForClientSecret { get { throw null; } set { } } - public string TenantId { get { throw null; } set { } } - public void UpdateKeyVaultClientSecret(string keyVaultClientSecret) { } - } - public partial class SqlConnectionStringDataSourceCredential : Azure.AI.MetricsAdvisor.Administration.DataSourceCredential - { - public SqlConnectionStringDataSourceCredential(string name, string connectionString) { } - public void UpdateConnectionString(string connectionString) { } - } public partial class SqlServerDataFeedSource : Azure.AI.MetricsAdvisor.Administration.DataFeedSource { public SqlServerDataFeedSource(string connectionString, string query) { } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2RestClient.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2RestClient.cs index 3cce3cfd3490..222a6116ef88 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2RestClient.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2RestClient.cs @@ -1388,7 +1388,7 @@ public Response GetRootCauseOfIncidentByAnomalyDetectionConfigura } } - internal HttpMessage CreateCreateCredentialRequest(DataSourceCredential body) + internal HttpMessage CreateCreateCredentialRequest(DataSourceCredentialEntity body) { var message = _pipeline.CreateMessage(); var request = message.Request; @@ -1410,7 +1410,7 @@ internal HttpMessage CreateCreateCredentialRequest(DataSourceCredential body) /// Create data source credential request. /// The cancellation token to use. /// is null. - public async Task> CreateCredentialAsync(DataSourceCredential body, CancellationToken cancellationToken = default) + public async Task> CreateCredentialAsync(DataSourceCredentialEntity body, CancellationToken cancellationToken = default) { if (body == null) { @@ -1433,7 +1433,7 @@ public async Task Create data source credential request. /// The cancellation token to use. /// is null. - public ResponseWithHeaders CreateCredential(DataSourceCredential body, CancellationToken cancellationToken = default) + public ResponseWithHeaders CreateCredential(DataSourceCredentialEntity body, CancellationToken cancellationToken = default) { if (body == null) { @@ -1542,7 +1542,7 @@ internal HttpMessage CreateUpdateCredentialRequest(Guid credentialId, DataSource /// Update data source credential request. /// The cancellation token to use. /// is null. - public async Task> UpdateCredentialAsync(Guid credentialId, DataSourceCredentialPatch body, CancellationToken cancellationToken = default) + public async Task> UpdateCredentialAsync(Guid credentialId, DataSourceCredentialPatch body, CancellationToken cancellationToken = default) { if (body == null) { @@ -1555,9 +1555,9 @@ public async Task> UpdateCredentialAsync(Guid cre { case 200: { - DataSourceCredential value = default; + DataSourceCredentialEntity value = default; using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false); - value = DataSourceCredential.DeserializeDataSourceCredential(document.RootElement); + value = DataSourceCredentialEntity.DeserializeDataSourceCredentialEntity(document.RootElement); return Response.FromValue(value, message.Response); } default: @@ -1570,7 +1570,7 @@ public async Task> UpdateCredentialAsync(Guid cre /// Update data source credential request. /// The cancellation token to use. /// is null. - public Response UpdateCredential(Guid credentialId, DataSourceCredentialPatch body, CancellationToken cancellationToken = default) + public Response UpdateCredential(Guid credentialId, DataSourceCredentialPatch body, CancellationToken cancellationToken = default) { if (body == null) { @@ -1583,9 +1583,9 @@ public Response UpdateCredential(Guid credentialId, DataSo { case 200: { - DataSourceCredential value = default; + DataSourceCredentialEntity value = default; using var document = JsonDocument.Parse(message.Response.ContentStream); - value = DataSourceCredential.DeserializeDataSourceCredential(document.RootElement); + value = DataSourceCredentialEntity.DeserializeDataSourceCredentialEntity(document.RootElement); return Response.FromValue(value, message.Response); } default: @@ -1658,7 +1658,7 @@ internal HttpMessage CreateGetCredentialRequest(Guid credentialId) /// Get a data source credential. /// Data source credential unique ID. /// The cancellation token to use. - public async Task> GetCredentialAsync(Guid credentialId, CancellationToken cancellationToken = default) + public async Task> GetCredentialAsync(Guid credentialId, CancellationToken cancellationToken = default) { using var message = CreateGetCredentialRequest(credentialId); await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); @@ -1666,9 +1666,9 @@ public async Task> GetCredentialAsync(Guid creden { case 200: { - DataSourceCredential value = default; + DataSourceCredentialEntity value = default; using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false); - value = DataSourceCredential.DeserializeDataSourceCredential(document.RootElement); + value = DataSourceCredentialEntity.DeserializeDataSourceCredentialEntity(document.RootElement); return Response.FromValue(value, message.Response); } default: @@ -1679,7 +1679,7 @@ public async Task> GetCredentialAsync(Guid creden /// Get a data source credential. /// Data source credential unique ID. /// The cancellation token to use. - public Response GetCredential(Guid credentialId, CancellationToken cancellationToken = default) + public Response GetCredential(Guid credentialId, CancellationToken cancellationToken = default) { using var message = CreateGetCredentialRequest(credentialId); _pipeline.Send(message, cancellationToken); @@ -1687,9 +1687,9 @@ public Response GetCredential(Guid credentialId, Cancellat { case 200: { - DataSourceCredential value = default; + DataSourceCredentialEntity value = default; using var document = JsonDocument.Parse(message.Response.ContentStream); - value = DataSourceCredential.DeserializeDataSourceCredential(document.RootElement); + value = DataSourceCredentialEntity.DeserializeDataSourceCredentialEntity(document.RootElement); return Response.FromValue(value, message.Response); } default: diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.Serialization.cs similarity index 70% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.Serialization.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.Serialization.cs index 3dfbf437cc1c..cbf1102f521d 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.Serialization.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { - public partial class DataSourceCredential : IUtf8JsonSerializable + public partial class DataSourceCredentialEntity : IUtf8JsonSerializable { void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { @@ -28,16 +28,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static DataSourceCredential DeserializeDataSourceCredential(JsonElement element) + internal static DataSourceCredentialEntity DeserializeDataSourceCredentialEntity(JsonElement element) { if (element.TryGetProperty("dataSourceCredentialType", out JsonElement discriminator)) { switch (discriminator.GetString()) { - case "AzureSQLConnectionString": return SqlConnectionStringDataSourceCredential.DeserializeSqlConnectionStringDataSourceCredential(element); - case "DataLakeGen2SharedKey": return DataLakeGen2SharedKeyDataSourceCredential.DeserializeDataLakeGen2SharedKeyDataSourceCredential(element); - case "ServicePrincipal": return ServicePrincipalDataSourceCredential.DeserializeServicePrincipalDataSourceCredential(element); - case "ServicePrincipalInKV": return ServicePrincipalInKeyVaultDataSourceCredential.DeserializeServicePrincipalInKeyVaultDataSourceCredential(element); + case "AzureSQLConnectionString": return DataSourceSqlConnectionString.DeserializeDataSourceSqlConnectionString(element); + case "DataLakeGen2SharedKey": return DataSourceDataLakeGen2SharedKey.DeserializeDataSourceDataLakeGen2SharedKey(element); + case "ServicePrincipal": return DataSourceServicePrincipal.DeserializeDataSourceServicePrincipal(element); + case "ServicePrincipalInKV": return DataSourceServicePrincipalInKeyVault.DeserializeDataSourceServicePrincipalInKeyVault(element); } } DataSourceCredentialType dataSourceCredentialType = default; @@ -67,7 +67,7 @@ internal static DataSourceCredential DeserializeDataSourceCredential(JsonElement continue; } } - return new DataSourceCredential(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value); + return new DataSourceCredentialEntity(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value); } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.cs similarity index 82% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.cs index 60db2f31eac1..ca208a892795 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialEntity.cs @@ -11,15 +11,15 @@ namespace Azure.AI.MetricsAdvisor.Administration { /// The DataSourceCredential. - public partial class DataSourceCredential + public partial class DataSourceCredentialEntity { - /// Initializes a new instance of DataSourceCredential. + /// Initializes a new instance of DataSourceCredentialEntity. /// Type of data source credential. /// Unique id of data source credential. /// Name of data source credential. /// Description of data source credential. - internal DataSourceCredential(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description) + internal DataSourceCredentialEntity(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description) { DataSourceCredentialType = dataSourceCredentialType; Id = id; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.Serialization.cs index 11f0e905458e..46ec6afaa91e 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.Serialization.cs @@ -17,7 +17,7 @@ internal partial class DataSourceCredentialList internal static DataSourceCredentialList DeserializeDataSourceCredentialList(JsonElement element) { Optional nextLink = default; - Optional> value = default; + Optional> value = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("@nextLink")) @@ -32,10 +32,10 @@ internal static DataSourceCredentialList DeserializeDataSourceCredentialList(Jso property.ThrowNonNullablePropertyIsNull(); continue; } - List array = new List(); + List array = new List(); foreach (var item in property.Value.EnumerateArray()) { - array.Add(DataSourceCredential.DeserializeDataSourceCredential(item)); + array.Add(DataSourceCredentialEntity.DeserializeDataSourceCredentialEntity(item)); } value = array; continue; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.cs index 148a4073c71f..85246aa9bb57 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceCredentialList.cs @@ -17,19 +17,19 @@ internal partial class DataSourceCredentialList /// Initializes a new instance of DataSourceCredentialList. internal DataSourceCredentialList() { - Value = new ChangeTrackingList(); + Value = new ChangeTrackingList(); } /// Initializes a new instance of DataSourceCredentialList. /// . /// . - internal DataSourceCredentialList(string nextLink, IReadOnlyList value) + internal DataSourceCredentialList(string nextLink, IReadOnlyList value) { NextLink = nextLink; Value = value; } public string NextLink { get; } - public IReadOnlyList Value { get; } + public IReadOnlyList Value { get; } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.Serialization.cs similarity index 85% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.Serialization.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.Serialization.cs index e92990a928ab..7bae6ee201be 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.Serialization.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { - public partial class DataLakeGen2SharedKeyDataSourceCredential : IUtf8JsonSerializable + public partial class DataSourceDataLakeGen2SharedKey : IUtf8JsonSerializable { void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { @@ -30,7 +30,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static DataLakeGen2SharedKeyDataSourceCredential DeserializeDataLakeGen2SharedKeyDataSourceCredential(JsonElement element) + internal static DataSourceDataLakeGen2SharedKey DeserializeDataSourceDataLakeGen2SharedKey(JsonElement element) { DataLakeGen2SharedKeyParam parameters = default; DataSourceCredentialType dataSourceCredentialType = default; @@ -65,7 +65,7 @@ internal static DataLakeGen2SharedKeyDataSourceCredential DeserializeDataLakeGen continue; } } - return new DataLakeGen2SharedKeyDataSourceCredential(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); + return new DataSourceDataLakeGen2SharedKey(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.cs similarity index 78% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.cs index 32fe244e52ee..0ee01a4b08b7 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataLakeGen2SharedKeyDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceDataLakeGen2SharedKey.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { /// The DataLakeGen2SharedKeyCredential. - public partial class DataLakeGen2SharedKeyDataSourceCredential : DataSourceCredential + public partial class DataSourceDataLakeGen2SharedKey : DataSourceCredentialEntity { } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.Serialization.cs similarity index 86% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.Serialization.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.Serialization.cs index 6a0fb09f1963..f2cd68938d59 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.Serialization.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { - public partial class ServicePrincipalDataSourceCredential : IUtf8JsonSerializable + public partial class DataSourceServicePrincipal : IUtf8JsonSerializable { void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { @@ -30,7 +30,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static ServicePrincipalDataSourceCredential DeserializeServicePrincipalDataSourceCredential(JsonElement element) + internal static DataSourceServicePrincipal DeserializeDataSourceServicePrincipal(JsonElement element) { ServicePrincipalParam parameters = default; DataSourceCredentialType dataSourceCredentialType = default; @@ -65,7 +65,7 @@ internal static ServicePrincipalDataSourceCredential DeserializeServicePrincipal continue; } } - return new ServicePrincipalDataSourceCredential(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); + return new DataSourceServicePrincipal(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.cs similarity index 78% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.cs index 4178cb2da836..bc0fa1d8cfc7 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipal.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { /// The ServicePrincipalCredential. - public partial class ServicePrincipalDataSourceCredential : DataSourceCredential + public partial class DataSourceServicePrincipal : DataSourceCredentialEntity { } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.Serialization.cs similarity index 85% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.Serialization.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.Serialization.cs index 3c90c87219e8..2e9ab5e46e2d 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.Serialization.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { - public partial class ServicePrincipalInKeyVaultDataSourceCredential : IUtf8JsonSerializable + public partial class DataSourceServicePrincipalInKeyVault : IUtf8JsonSerializable { void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { @@ -30,7 +30,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static ServicePrincipalInKeyVaultDataSourceCredential DeserializeServicePrincipalInKeyVaultDataSourceCredential(JsonElement element) + internal static DataSourceServicePrincipalInKeyVault DeserializeDataSourceServicePrincipalInKeyVault(JsonElement element) { ServicePrincipalInKVParam parameters = default; DataSourceCredentialType dataSourceCredentialType = default; @@ -65,7 +65,7 @@ internal static ServicePrincipalInKeyVaultDataSourceCredential DeserializeServic continue; } } - return new ServicePrincipalInKeyVaultDataSourceCredential(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); + return new DataSourceServicePrincipalInKeyVault(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.cs similarity index 77% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.cs index 5518b2dccb82..80eff1981911 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/ServicePrincipalInKeyVaultDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceServicePrincipalInKeyVault.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { /// The ServicePrincipalInKVCredential. - public partial class ServicePrincipalInKeyVaultDataSourceCredential : DataSourceCredential + public partial class DataSourceServicePrincipalInKeyVault : DataSourceCredentialEntity { } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.Serialization.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.Serialization.cs similarity index 85% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.Serialization.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.Serialization.cs index 68594615311e..20b5e859e9f7 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.Serialization.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.Serialization.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { - public partial class SqlConnectionStringDataSourceCredential : IUtf8JsonSerializable + public partial class DataSourceSqlConnectionString : IUtf8JsonSerializable { void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { @@ -30,7 +30,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static SqlConnectionStringDataSourceCredential DeserializeSqlConnectionStringDataSourceCredential(JsonElement element) + internal static DataSourceSqlConnectionString DeserializeDataSourceSqlConnectionString(JsonElement element) { AzureSQLConnectionStringParam parameters = default; DataSourceCredentialType dataSourceCredentialType = default; @@ -65,7 +65,7 @@ internal static SqlConnectionStringDataSourceCredential DeserializeSqlConnection continue; } } - return new SqlConnectionStringDataSourceCredential(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); + return new DataSourceSqlConnectionString(dataSourceCredentialType, dataSourceCredentialId.Value, dataSourceCredentialName, dataSourceCredentialDescription.Value, parameters); } } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.cs similarity index 78% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.cs index a4480915d81b..58ba2fe92687 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/SqlConnectionStringDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/Models/DataSourceSqlConnectionString.cs @@ -11,7 +11,7 @@ namespace Azure.AI.MetricsAdvisor.Administration { /// The AzureSQLConnectionStringCredential. - public partial class SqlConnectionStringDataSourceCredential : DataSourceCredential + public partial class DataSourceSqlConnectionString : DataSourceCredentialEntity { } } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs index 6a9aa17a550f..e561d27aabe0 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs @@ -1884,18 +1884,18 @@ private static void ValidateHookToCreate(NotificationHook hook, string paramName #region Credential /// - /// Creates a and assigns it a unique ID. This API provides different ways of + /// Creates a and assigns it a unique ID. This API provides different ways of /// authenticating to a for data ingestion when the default authentication method does not suffice. - /// Please see for a list of supported credentials. + /// Please see for a list of supported credentials. /// - /// Specifies how the created should be configured. + /// Specifies how the created should be configured. /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a - /// instance containing information about the created data source credential. + /// A containing the result of the operation. The result is a + /// instance containing information about the created data source credential entity. /// /// is null. - public virtual async Task> CreateDataSourceCredentialAsync(DataSourceCredential dataSourceCredential, CancellationToken cancellationToken = default) + public virtual async Task> CreateDataSourceCredentialAsync(DataSourceCredentialEntity dataSourceCredential, CancellationToken cancellationToken = default) { Argument.AssertNotNull(dataSourceCredential, nameof(dataSourceCredential)); @@ -1926,18 +1926,18 @@ public virtual async Task> CreateDataSourceCreden } /// - /// Creates a and assigns it a unique ID. This API provides different ways of + /// Creates a and assigns it a unique ID. This API provides different ways of /// authenticating to a for data ingestion when the default authentication method does not suffice. - /// Please see for a list of supported credentials. + /// Please see for a list of supported credentials. /// - /// Specifies how the created should be configured. + /// Specifies how the created should be configured. /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a - /// instance containing information about the created data source credential. + /// A containing the result of the operation. The result is a + /// instance containing information about the created data source credential entity. /// /// is null. - public virtual Response CreateDataSourceCredential(DataSourceCredential dataSourceCredential, CancellationToken cancellationToken = default) + public virtual Response CreateDataSourceCredential(DataSourceCredentialEntity dataSourceCredential, CancellationToken cancellationToken = default) { Argument.AssertNotNull(dataSourceCredential, nameof(dataSourceCredential)); @@ -1968,18 +1968,18 @@ public virtual Response CreateDataSourceCredential(DataSou } /// - /// Updates an existing . In order to update your credential, you cannot create a + /// Updates an existing . In order to update your credential, you cannot create a /// directly from its constructor. You need to obtain an instance via or another CRUD operation and update /// it before calling this method. /// - /// The model containing the updates to be applied. + /// The model containing the updates to be applied. /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a + /// A containing the result of the operation. The result is a /// instance containing information about the updated credential. /// /// or .Id is null. - public virtual async Task> UpdateDataSourceCredentialAsync(DataSourceCredential dataSourceCredential, CancellationToken cancellationToken = default) + public virtual async Task> UpdateDataSourceCredentialAsync(DataSourceCredentialEntity dataSourceCredential, CancellationToken cancellationToken = default) { Argument.AssertNotNull(dataSourceCredential, nameof(dataSourceCredential)); @@ -2007,18 +2007,18 @@ public virtual async Task> UpdateDataSourceCreden } /// - /// Updates an existing . In order to update your credential, you cannot create a + /// Updates an existing . In order to update your credential, you cannot create a /// directly from its constructor. You need to obtain an instance via or another CRUD operation and update /// it before calling this method. /// - /// The model containing the updates to be applied. + /// The model containing the updates to be applied. /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a + /// A containing the result of the operation. The result is a /// instance containing information about the updated credential. /// /// or .Id is null. - public virtual Response UpdateDataSourceCredential(DataSourceCredential dataSourceCredential, CancellationToken cancellationToken = default) + public virtual Response UpdateDataSourceCredential(DataSourceCredentialEntity dataSourceCredential, CancellationToken cancellationToken = default) { Argument.AssertNotNull(dataSourceCredential, nameof(dataSourceCredential)); @@ -2046,17 +2046,17 @@ public virtual Response UpdateDataSourceCredential(DataSou } /// - /// Gets an existing . + /// Gets an existing . /// - /// The unique identifier of the . + /// The unique identifier of the . /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a + /// A containing the result of the operation. The result is a /// instance containing the requested information. /// /// is null. /// is empty or not a valid GUID. - public virtual async Task> GetDataSourceCredentialAsync(string dataSourceCredentialId, CancellationToken cancellationToken = default) + public virtual async Task> GetDataSourceCredentialAsync(string dataSourceCredentialId, CancellationToken cancellationToken = default) { Guid credentialGuid = ClientCommon.ValidateGuid(dataSourceCredentialId, nameof(dataSourceCredentialId)); @@ -2075,17 +2075,17 @@ public virtual async Task> GetDataSourceCredentia } /// - /// Gets an existing . + /// Gets an existing . /// - /// The unique identifier of the . + /// The unique identifier of the . /// A controlling the request lifetime. /// - /// A containing the result of the operation. The result is a + /// A containing the result of the operation. The result is a /// instance containing the requested information. /// /// is null. /// is empty or not a valid GUID. - public virtual Response GetDataSourceCredential(string dataSourceCredentialId, CancellationToken cancellationToken = default) + public virtual Response GetDataSourceCredential(string dataSourceCredentialId, CancellationToken cancellationToken = default) { Guid credentialGuid = ClientCommon.ValidateGuid(dataSourceCredentialId, nameof(dataSourceCredentialId)); @@ -2104,18 +2104,18 @@ public virtual Response GetDataSourceCredential(string dat } /// - /// Gets a collection of items describing the existing instances in this Metrics + /// Gets a collection of items describing the existing instances in this Metrics /// Advisor resource. /// /// An optional set of options used to configure the request's behavior. /// A controlling the request lifetime. - /// An containing the collection of instances. - public virtual AsyncPageable GetDataSourceCredentialsAsync(GetDataSourceCredentialsOptions options = default, CancellationToken cancellationToken = default) + /// An containing the collection of instances. + public virtual AsyncPageable GetDataSourceCredentialsAsync(GetDataSourceCredentialsOptions options = default, CancellationToken cancellationToken = default) { int? skip = options?.Skip; int? maxPageSize = options?.MaxPageSize; - async Task> FirstPageFunc(int? pageSizeHint) + async Task> FirstPageFunc(int? pageSizeHint) { using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(MetricsAdvisorAdministrationClient)}.{nameof(GetDataSourceCredentials)}"); scope.Start(); @@ -2132,7 +2132,7 @@ async Task> FirstPageFunc(int? pageSizeHint) } } - async Task> NextPageFunc(string nextLink, int? pageSizeHint) + async Task> NextPageFunc(string nextLink, int? pageSizeHint) { using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(MetricsAdvisorAdministrationClient)}.{nameof(GetDataSourceCredentials)}"); scope.Start(); @@ -2153,18 +2153,18 @@ async Task> NextPageFunc(string nextLink, int? pageSi } /// - /// Gets a collection of items describing the existing instances in this Metrics + /// Gets a collection of items describing the existing instances in this Metrics /// Advisor resource. /// /// An optional set of options used to configure the request's behavior. /// A controlling the request lifetime. - /// An containing the collection of instances. - public virtual Pageable GetDataSourceCredentials(GetDataSourceCredentialsOptions options = default, CancellationToken cancellationToken = default) + /// An containing the collection of instances. + public virtual Pageable GetDataSourceCredentials(GetDataSourceCredentialsOptions options = default, CancellationToken cancellationToken = default) { int? skip = options?.Skip; int? maxPageSize = options?.MaxPageSize; - Page FirstPageFunc(int? pageSizeHint) + Page FirstPageFunc(int? pageSizeHint) { using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(MetricsAdvisorAdministrationClient)}.{nameof(GetDataSourceCredentials)}"); scope.Start(); @@ -2181,7 +2181,7 @@ Page FirstPageFunc(int? pageSizeHint) } } - Page NextPageFunc(string nextLink, int? pageSizeHint) + Page NextPageFunc(string nextLink, int? pageSizeHint) { using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(MetricsAdvisorAdministrationClient)}.{nameof(GetDataSourceCredentials)}"); scope.Start(); @@ -2202,9 +2202,9 @@ Page NextPageFunc(string nextLink, int? pageSizeHint) } /// - /// Deletes an existing . + /// Deletes an existing . /// - /// The unique identifier of the to be deleted. + /// The unique identifier of the to be deleted. /// A controlling the request lifetime. /// /// A containing the result of the operation. @@ -2230,9 +2230,9 @@ public virtual async Task DeleteDataSourceCredentialAsync(string dataS } /// - /// Deletes an existing . + /// Deletes an existing . /// - /// The unique identifier of the to be deleted. + /// The unique identifier of the to be deleted. /// A controlling the request lifetime. /// /// A containing the result of the operation. diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredentialEntity.cs similarity index 74% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredentialEntity.cs index a7794c893bde..7fed8c77d7d7 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceCredentialEntity.cs @@ -11,19 +11,19 @@ namespace Azure.AI.MetricsAdvisor.Administration /// Provides different ways of authenticating to a for data ingestion when the /// default authentication method does not suffice. The supported credentials are: /// - /// - /// - /// - /// + /// + /// + /// + /// /// /// [CodeGenModel("DataSourceCredential")] - public partial class DataSourceCredential + public partial class DataSourceCredentialEntity { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - internal DataSourceCredential(string name) + internal DataSourceCredentialEntity(string name) { Argument.AssertNotNullOrEmpty(name, nameof(name)); @@ -31,19 +31,19 @@ internal DataSourceCredential(string name) } /// - /// The unique identifier of this . Set by the service. + /// The unique identifier of this . Set by the service. /// [CodeGenMember("DataSourceCredentialId")] public string Id { get; } /// - /// A custom unique name for this to be displayed on the web portal. + /// A custom unique name for this to be displayed on the web portal. /// [CodeGenMember("DataSourceCredentialName")] public string Name { get; set; } /// - /// A description of this . + /// A description of this . /// [CodeGenMember("DataSourceCredentialDescription")] public string Description { get; set; } @@ -52,15 +52,15 @@ internal DataSourceCredentialPatch GetPatchModel() { DataSourceCredentialPatch patch = this switch { - DataLakeGen2SharedKeyDataSourceCredential c => new DataLakeGen2SharedKeyCredentialPatch() + DataSourceDataLakeGen2SharedKey c => new DataLakeGen2SharedKeyCredentialPatch() { Parameters = new() { AccountKey = c.AccountKey } }, - ServicePrincipalDataSourceCredential c => new ServicePrincipalCredentialPatch() + DataSourceServicePrincipal c => new ServicePrincipalCredentialPatch() { Parameters = new() { ClientId = c.ClientId, ClientSecret = c.ClientSecret, TenantId = c.TenantId } }, - ServicePrincipalInKeyVaultDataSourceCredential c => new ServicePrincipalInKVCredentialPatch() + DataSourceServicePrincipalInKeyVault c => new ServicePrincipalInKVCredentialPatch() { Parameters = new() { @@ -72,7 +72,7 @@ internal DataSourceCredentialPatch GetPatchModel() ServicePrincipalSecretNameInKV = c.SecretNameForClientSecret } }, - SqlConnectionStringDataSourceCredential c => new AzureSQLConnectionStringCredentialPatch() + DataSourceSqlConnectionString c => new AzureSQLConnectionStringCredentialPatch() { Parameters = new() { ConnectionString = c.ConnectionString } }, diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataLakeGen2SharedKeyDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceDataLakeGen2SharedKey.cs similarity index 75% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataLakeGen2SharedKeyDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceDataLakeGen2SharedKey.cs index 7cbba34f13af..7e6f83350a48 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataLakeGen2SharedKeyDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceDataLakeGen2SharedKey.cs @@ -12,17 +12,17 @@ namespace Azure.AI.MetricsAdvisor.Administration /// Authenticates to a Data Lake Storage Gen2 resource via shared key. /// [CodeGenModel("DataLakeGen2SharedKeyCredential")] - [CodeGenSuppress(nameof(DataLakeGen2SharedKeyDataSourceCredential), typeof(string), typeof(DataLakeGen2SharedKeyParam))] - public partial class DataLakeGen2SharedKeyDataSourceCredential + [CodeGenSuppress(nameof(DataSourceDataLakeGen2SharedKey), typeof(string), typeof(DataLakeGen2SharedKeyParam))] + public partial class DataSourceDataLakeGen2SharedKey { private string _accountKey; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// A custom unique name for this to be displayed on the web portal. + /// A custom unique name for this to be displayed on the web portal. /// The account key to be used for authentication. - public DataLakeGen2SharedKeyDataSourceCredential(string name, string accountKey) + public DataSourceDataLakeGen2SharedKey(string name, string accountKey) : base(name) { Argument.AssertNotNullOrEmpty(accountKey, nameof(accountKey)); @@ -31,7 +31,7 @@ public DataLakeGen2SharedKeyDataSourceCredential(string name, string accountKey) AccountKey = accountKey; } - internal DataLakeGen2SharedKeyDataSourceCredential(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, DataLakeGen2SharedKeyParam parameters) + internal DataSourceDataLakeGen2SharedKey(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, DataLakeGen2SharedKeyParam parameters) : base(dataSourceCredentialType, id, name, description) { DataSourceCredentialType = dataSourceCredentialType; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipal.cs similarity index 82% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipal.cs index 7b82890c8c38..ae448dc600da 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipal.cs @@ -12,19 +12,19 @@ namespace Azure.AI.MetricsAdvisor.Administration /// Authenticates to an Azure service via service principal. /// [CodeGenModel("ServicePrincipalCredential")] - [CodeGenSuppress(nameof(ServicePrincipalDataSourceCredential), typeof(string), typeof(ServicePrincipalParam))] - public partial class ServicePrincipalDataSourceCredential + [CodeGenSuppress(nameof(DataSourceServicePrincipal), typeof(string), typeof(ServicePrincipalParam))] + public partial class DataSourceServicePrincipal { private string _clientSecret; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// A custom unique name for this to be displayed on the web portal. + /// A custom unique name for this to be displayed on the web portal. /// The client ID of the service principal used for authentication. /// The client secret of the service principal used for authentication. /// The tenant ID of the service principal used for authentication. - public ServicePrincipalDataSourceCredential(string name, string clientId, string clientSecret, string tenantId) + public DataSourceServicePrincipal(string name, string clientId, string clientSecret, string tenantId) : base(name) { Argument.AssertNotNullOrEmpty(clientId, nameof(clientId)); @@ -37,7 +37,7 @@ public ServicePrincipalDataSourceCredential(string name, string clientId, string TenantId = tenantId; } - internal ServicePrincipalDataSourceCredential(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, ServicePrincipalParam parameters) + internal DataSourceServicePrincipal(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, ServicePrincipalParam parameters) : base(dataSourceCredentialType, id, name, description) { DataSourceCredentialType = dataSourceCredentialType; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalInKeyVaultDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipalInKeyVault.cs similarity index 86% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalInKeyVaultDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipalInKeyVault.cs index 2233b0e394de..4af9882e8f91 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/ServicePrincipalInKeyVaultDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceServicePrincipalInKeyVault.cs @@ -14,22 +14,22 @@ namespace Azure.AI.MetricsAdvisor.Administration /// must also be provided. /// [CodeGenModel("ServicePrincipalInKVCredential")] - [CodeGenSuppress(nameof(ServicePrincipalInKeyVaultDataSourceCredential), typeof(string), typeof(ServicePrincipalInKVParam))] - public partial class ServicePrincipalInKeyVaultDataSourceCredential + [CodeGenSuppress(nameof(DataSourceServicePrincipalInKeyVault), typeof(string), typeof(ServicePrincipalInKVParam))] + public partial class DataSourceServicePrincipalInKeyVault { private string _keyVaultClientSecret; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// A custom unique name for this to be displayed on the web portal. + /// A custom unique name for this to be displayed on the web portal. /// The endpoint to connect to the Key Vault resource where the secrets are stored. /// The client ID to authenticate to the Key Vault resource. /// The client secret to authenticate to the Key Vault resource. /// The tenant ID of the service principals used for authentication. /// The name of the Key Vault secret storing the client ID used for data source authentication. /// The name of the Key Vault secret storing the client secret used for data source authentication. - public ServicePrincipalInKeyVaultDataSourceCredential(string name, Uri endpoint, string keyVaultClientId, string keyVaultClientSecret, string tenantId, string secretNameForClientId, string secretNameForClientSecret) + public DataSourceServicePrincipalInKeyVault(string name, Uri endpoint, string keyVaultClientId, string keyVaultClientSecret, string tenantId, string secretNameForClientId, string secretNameForClientSecret) : base(name) { Argument.AssertNotNull(endpoint, nameof(endpoint)); @@ -48,7 +48,7 @@ public ServicePrincipalInKeyVaultDataSourceCredential(string name, Uri endpoint, SecretNameForClientSecret = secretNameForClientSecret; } - internal ServicePrincipalInKeyVaultDataSourceCredential(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, ServicePrincipalInKVParam parameters) + internal DataSourceServicePrincipalInKeyVault(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, ServicePrincipalInKVParam parameters) : base(dataSourceCredentialType, id, name, description) { DataSourceCredentialType = dataSourceCredentialType; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/SqlConnectionStringDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceSqlConnectionString.cs similarity index 76% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/SqlConnectionStringDataSourceCredential.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceSqlConnectionString.cs index 1c3e5cf9e332..c826bdfa06e7 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/SqlConnectionStringDataSourceCredential.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/Credential/DataSourceSqlConnectionString.cs @@ -12,17 +12,17 @@ namespace Azure.AI.MetricsAdvisor.Administration /// Authenticates to an SQL server via connection string. /// [CodeGenModel("AzureSQLConnectionStringCredential")] - [CodeGenSuppress(nameof(SqlConnectionStringDataSourceCredential), typeof(string), typeof(AzureSQLConnectionStringParam))] - public partial class SqlConnectionStringDataSourceCredential + [CodeGenSuppress(nameof(DataSourceSqlConnectionString), typeof(string), typeof(AzureSQLConnectionStringParam))] + public partial class DataSourceSqlConnectionString { private string _connectionString; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// A custom unique name for this to be displayed on the web portal. + /// A custom unique name for this to be displayed on the web portal. /// The connection string to be used for authentication. - public SqlConnectionStringDataSourceCredential(string name, string connectionString) + public DataSourceSqlConnectionString(string name, string connectionString) : base(name) { Argument.AssertNotNullOrEmpty(connectionString, nameof(connectionString)); @@ -31,7 +31,7 @@ public SqlConnectionStringDataSourceCredential(string name, string connectionStr ConnectionString = connectionString; } - internal SqlConnectionStringDataSourceCredential(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, AzureSQLConnectionStringParam parameters) + internal DataSourceSqlConnectionString(DataSourceCredentialType dataSourceCredentialType, string id, string name, string description, AzureSQLConnectionStringParam parameters) : base(dataSourceCredentialType, id, name, description) { DataSourceCredentialType = dataSourceCredentialType; diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataExplorerDataFeedSource.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataExplorerDataFeedSource.cs index 5e327464224c..e29b970f0e0b 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataExplorerDataFeedSource.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataExplorerDataFeedSource.cs @@ -46,7 +46,7 @@ internal AzureDataExplorerDataFeedSource(SqlSourceParameter parameter, Authentic /// /// The different ways of authenticating to an . Be aware that - /// some authentication types require you to have a in the service. In this + /// some authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// @@ -64,14 +64,14 @@ public enum AuthenticationType ManagedIdentity, /// - /// Uses Service Principal authentication. You need to have a + /// Uses Service Principal authentication. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipal, /// /// Uses Service Principal authentication, but the client ID and the client secret must be - /// stored in a Key Vault resource. You need to have a + /// stored in a Key Vault resource. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipalInKeyVault @@ -79,14 +79,14 @@ public enum AuthenticationType /// /// The method used to authenticate to this . Be aware that some - /// authentication types require you to have a in the service. In this + /// authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// public AuthenticationType? Authentication { get; set; } /// - /// The ID of the to use for authentication. The type of authentication to use + /// The ID of the to use for authentication. The type of authentication to use /// must also be specified in the property . /// public string DataSourceCredentialId { get; set; } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataLakeStorageGen2DataFeedSource.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataLakeStorageGen2DataFeedSource.cs index 4ddb50421154..b6e988c0eb05 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataLakeStorageGen2DataFeedSource.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/AzureDataLakeStorageGen2DataFeedSource.cs @@ -82,7 +82,7 @@ internal AzureDataLakeStorageGen2DataFeedSource(AzureDataLakeStorageGen2Paramete /// /// The different ways of authenticating to an . Be aware that - /// some authentication types require you to have a in the service. In this + /// some authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// @@ -96,19 +96,19 @@ public enum AuthenticationType /// /// Uses a Data Lake Storage Gen 2 shared key for authentication. You need to have a - /// in the server in order to use this type of authentication. + /// in the server in order to use this type of authentication. /// SharedKey, /// - /// Uses Service Principal authentication. You need to have a + /// Uses Service Principal authentication. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipal, /// /// Uses Service Principal authentication, but the client ID and the client secret must be - /// stored in a Key Vault resource. You need to have a + /// stored in a Key Vault resource. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipalInKeyVault @@ -116,14 +116,14 @@ public enum AuthenticationType /// /// The method used to authenticate to this . Be aware that some - /// authentication types require you to have a in the service. In this + /// authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// public AuthenticationType? Authentication { get; set; } /// - /// The ID of the to use for authentication. The type of authentication to use + /// The ID of the to use for authentication. The type of authentication to use /// must also be specified in the property . /// public string DataSourceCredentialId { get; set; } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/SqlServerDataFeedSource.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/SqlServerDataFeedSource.cs index 8375bd6aefa9..b41eeceed16d 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/SqlServerDataFeedSource.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeedSources/SqlServerDataFeedSource.cs @@ -46,7 +46,7 @@ internal SqlServerDataFeedSource(SqlSourceParameter parameter, AuthenticationTyp /// /// The different ways of authenticating to a . Be aware that - /// some authentication types require you to have a in the service. In this + /// some authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// @@ -65,20 +65,20 @@ public enum AuthenticationType /// /// Uses a SQL Server connection string for authentication. You need to have a - /// in the server in order to use this type of + /// in the server in order to use this type of /// authentication. /// SqlConnectionString, /// - /// Uses Service Principal authentication. You need to have a + /// Uses Service Principal authentication. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipal, /// /// Uses Service Principal authentication, but the client ID and the client secret must be - /// stored in a Key Vault resource. You need to have a + /// stored in a Key Vault resource. You need to have a /// in the server in order to use this type of authentication. /// ServicePrincipalInKeyVault @@ -86,14 +86,14 @@ public enum AuthenticationType /// /// The method used to authenticate to this . Be aware that some - /// authentication types require you to have a in the service. In this + /// authentication types require you to have a in the service. In this /// case, you also need to set the property to specify which credential /// to use. Defaults to . /// public AuthenticationType? Authentication { get; set; } /// - /// The ID of the to use for authentication. The type of authentication to use + /// The ID of the to use for authentication. The type of authentication to use /// must also be specified in the property . /// public string DataSourceCredentialId { get; set; } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredential.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredential.cs deleted file mode 100644 index 714f7834b95d..000000000000 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredential.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Threading.Tasks; -using Azure.AI.MetricsAdvisor.Administration; -using Azure.AI.MetricsAdvisor.Models; - -namespace Azure.AI.MetricsAdvisor.Tests -{ - /// - /// Represents an that has been created for testing purposes. - /// In order to create a new instance of this class, the - /// static method must be invoked. The created data source credential will be deleted upon disposal. - /// - public class DisposableDataSourceCredential : IAsyncDisposable - { - /// - /// The client to use for deleting the data source credential upon disposal. - /// - private readonly MetricsAdvisorAdministrationClient _adminClient; - - /// - /// Initializes a new instance of the class. - /// - /// The client to use for deleting the credential entity upon disposal. - /// The data source credential this instance is associated with. - private DisposableDataSourceCredential(MetricsAdvisorAdministrationClient adminClient, DataSourceCredential credential) - { - _adminClient = adminClient; - Credential = credential; - } - - /// - /// The data source credential this instance is associated with. - /// - public DataSourceCredential Credential { get; } - - /// - /// Creates a data source credential using the specified . - /// A instance is returned, from which the created credential - /// can be obtained. Upon disposal, the created credential will be deleted. - /// - /// The client to use for creating and for deleting the data source credential. - /// Specifies how the created should be configured. - /// A instance from which the created credential can be obtained. - public static async Task CreateDataSourceCredentialAsync(MetricsAdvisorAdministrationClient adminClient, DataSourceCredential credential) - { - DataSourceCredential createdCredential = await adminClient.CreateDataSourceCredentialAsync(credential); - return new DisposableDataSourceCredential(adminClient, createdCredential); - } - - /// - /// Creates a data source credential using the specified . - /// A instance is returned, from which the created credential can - /// be obtained. Except for the name, all of its required properties are initialized with mock values. Upon disposal, - /// the created credential will be deleted. - /// - /// The client to use for creating and for deleting the data source credential. - /// The name of the data source credential to be created. - /// Specifies which type of should be created. - /// A instance from which the created credential can be obtained. - public static async Task CreateDataSourceCredentialAsync(MetricsAdvisorAdministrationClient adminClient, string name, string authenticationType) - { - DataSourceCredential credential = authenticationType switch - { - "ServicePrincipal" => new ServicePrincipalDataSourceCredential(name, "mock", "mock", "mock"), - "ServicePrincipalInKeyVault" => new ServicePrincipalInKeyVaultDataSourceCredential(name, new Uri("https://mock.com/"), "mock", "mock", "mock", "mock", "mock"), - "SharedKey" => new DataLakeGen2SharedKeyDataSourceCredential(name, "mock"), - "SqlConnectionString" => new SqlConnectionStringDataSourceCredential(name, "mock"), - _ => throw new ArgumentOutOfRangeException($"Invalid data source credential type: {authenticationType}") - }; - - return await CreateDataSourceCredentialAsync(adminClient, credential).ConfigureAwait(false); - } - - /// - /// Deletes the data source credential this instance is associated with. - /// - public async ValueTask DisposeAsync() => await _adminClient.DeleteDataSourceCredentialAsync(Credential.Id); - } -} diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredentialEntity.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredentialEntity.cs new file mode 100644 index 000000000000..5f3bcae691de --- /dev/null +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataSourceCredentialEntity.cs @@ -0,0 +1,82 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Threading.Tasks; +using Azure.AI.MetricsAdvisor.Administration; +using Azure.AI.MetricsAdvisor.Models; + +namespace Azure.AI.MetricsAdvisor.Tests +{ + /// + /// Represents an that has been created for testing purposes. + /// In order to create a new instance of this class, the + /// static method must be invoked. The created data source credential entity will be deleted upon disposal. + /// + public class DisposableDataSourceCredentialEntity : IAsyncDisposable + { + /// + /// The client to use for deleting the data source credential entity upon disposal. + /// + private readonly MetricsAdvisorAdministrationClient _adminClient; + + /// + /// Initializes a new instance of the class. + /// + /// The client to use for deleting the credential entity upon disposal. + /// The data source credential entity this instance is associated with. + private DisposableDataSourceCredentialEntity(MetricsAdvisorAdministrationClient adminClient, DataSourceCredentialEntity credential) + { + _adminClient = adminClient; + Credential = credential; + } + + /// + /// The data source credential entity this instance is associated with. + /// + public DataSourceCredentialEntity Credential { get; } + + /// + /// Creates a data source credential entity using the specified . + /// A is returned, from which the created credential + /// can be obtained. Upon disposal, the created credential will be deleted. + /// + /// The client to use for creating and for deleting the data source credential entity. + /// Specifies how the created should be configured. + /// A instance from which the created credential entity can be obtained. + public static async Task CreateDataSourceCredentialEntityAsync(MetricsAdvisorAdministrationClient adminClient, DataSourceCredentialEntity credential) + { + DataSourceCredentialEntity createdCredential = await adminClient.CreateDataSourceCredentialAsync(credential); + return new DisposableDataSourceCredentialEntity(adminClient, createdCredential); + } + + /// + /// Creates a data source credential entity using the specified . + /// A instance is returned, from which the created credential can + /// be obtained. Except for the name, all of its required properties are initialized with mock values. Upon disposal, + /// the created credential will be deleted. + /// + /// The client to use for creating and for deleting the data source credential entity. + /// The name of the data source credential entity to be created. + /// Specifies which type of should be created. + /// A instance from which the created credential can be obtained. + public static async Task CreateDataSourceCredentialEntityAsync(MetricsAdvisorAdministrationClient adminClient, string name, string authenticationType) + { + DataSourceCredentialEntity credential = authenticationType switch + { + "ServicePrincipal" => new DataSourceServicePrincipal(name, "mock", "mock", "mock"), + "ServicePrincipalInKeyVault" => new DataSourceServicePrincipalInKeyVault(name, new Uri("https://mock.com/"), "mock", "mock", "mock", "mock", "mock"), + "SharedKey" => new DataSourceDataLakeGen2SharedKey(name, "mock"), + "SqlConnectionString" => new DataSourceSqlConnectionString(name, "mock"), + _ => throw new ArgumentOutOfRangeException($"Invalid data source credential type: {authenticationType}") + }; + + return await CreateDataSourceCredentialEntityAsync(adminClient, credential).ConfigureAwait(false); + } + + /// + /// Deletes the data source credential entity this instance is associated with. + /// + public async ValueTask DisposeAsync() => await _adminClient.DeleteDataSourceCredentialAsync(Credential.Id); + } +} diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs index cb762672e59e..472f8da54aff 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs @@ -538,7 +538,7 @@ public async Task CreateAndGetAzureDataExplorerDataFeedWithCredentialAuthenticat MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); @@ -587,7 +587,7 @@ public async Task CreateAndGetAzureDataLakeStorageGen2DataFeedWithCredentialAuth MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); @@ -638,7 +638,7 @@ public async Task CreateAndGetSqlServerDataFeedWithCredentialAuthentication(SqlS MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); @@ -1290,7 +1290,7 @@ public async Task UpdateAzureDataExplorerDataFeedWithCredentialAuthentication(Az MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); @@ -1343,7 +1343,7 @@ public async Task UpdateAzureDataLakeStorageGen2DataFeedWithCredentialAuthentica MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); @@ -1398,7 +1398,7 @@ public async Task UpdateSqlServerDataFeedWithCredentialAuthentication(SqlServerD MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialName, authentication.ToString()); + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialName, authentication.ToString()); string credentialId = disposableCredential.Credential.Id; var dataFeedName = Recording.GenerateAlphaNumericId("dataFeed"); diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityLiveTests.cs similarity index 62% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialLiveTests.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityLiveTests.cs index 0013ca851384..b98bd81e7204 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialLiveTests.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityLiveTests.cs @@ -4,13 +4,12 @@ using System; using System.Threading.Tasks; using Azure.AI.MetricsAdvisor.Administration; -using Azure.AI.MetricsAdvisor.Models; using Azure.Core.TestFramework; using NUnit.Framework; namespace Azure.AI.MetricsAdvisor.Tests { - public class DataSourceCredentialLiveTests : MetricsAdvisorLiveTestBase + public class DataSourceCredentialEntityLiveTests : MetricsAdvisorLiveTestBase { private const string ClientId = "clientId"; private const string TenantId = "tenantId"; @@ -18,37 +17,37 @@ public class DataSourceCredentialLiveTests : MetricsAdvisorLiveTestBase private const string ClientIdSecretName = "clientIdSecretName"; private const string ClientSecretSecretName = "clientSecretSecretName"; - public DataSourceCredentialLiveTests(bool isAsync) : base(isAsync) + public DataSourceCredentialEntityLiveTests(bool isAsync) : base(isAsync) { } [RecordedTest] - [TestCase(nameof(DataLakeGen2SharedKeyDataSourceCredential))] - [TestCase(nameof(ServicePrincipalDataSourceCredential))] - [TestCase(nameof(ServicePrincipalInKeyVaultDataSourceCredential))] - [TestCase(nameof(SqlConnectionStringDataSourceCredential))] + [TestCase(nameof(DataSourceDataLakeGen2SharedKey))] + [TestCase(nameof(DataSourceServicePrincipal))] + [TestCase(nameof(DataSourceServicePrincipalInKeyVault))] + [TestCase(nameof(DataSourceSqlConnectionString))] public async Task CreateAndGetDataSourceCredential(string credentialTypeName) { MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); string credentialName = Recording.GenerateAlphaNumericId("credential"); - DataSourceCredential credentialToCreate = GetDataSourceCredentialTestCase(credentialTypeName, credentialName); + DataSourceCredentialEntity credentialToCreate = GetDataSourceCredentialEntityTestCase(credentialTypeName, credentialName); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialToCreate); - DataSourceCredential createdCredential = disposableCredential.Credential; + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialToCreate); + DataSourceCredentialEntity createdCredential = disposableCredential.Credential; Assert.That(createdCredential.Id, Is.Not.Empty.And.Not.Null); Assert.That(createdCredential.Name, Is.EqualTo(credentialName)); Assert.That(createdCredential.Description, Is.Empty); - ValidateTestCaseDataSourceCredential(createdCredential); + ValidateTestCaseDataSourceCredentialEntity(createdCredential); } [RecordedTest] - [TestCase(nameof(DataLakeGen2SharedKeyDataSourceCredential))] - [TestCase(nameof(ServicePrincipalDataSourceCredential))] - [TestCase(nameof(ServicePrincipalInKeyVaultDataSourceCredential))] - [TestCase(nameof(SqlConnectionStringDataSourceCredential))] + [TestCase(nameof(DataSourceDataLakeGen2SharedKey))] + [TestCase(nameof(DataSourceServicePrincipal))] + [TestCase(nameof(DataSourceServicePrincipalInKeyVault))] + [TestCase(nameof(DataSourceSqlConnectionString))] public async Task CreateAndGetDataSourceCredentialWithDescription(string credentialTypeName) { MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); @@ -56,31 +55,31 @@ public async Task CreateAndGetDataSourceCredentialWithDescription(string credent string credentialName = Recording.GenerateAlphaNumericId("credential"); string expectedDescription = "This is a description"; - DataSourceCredential credentialToCreate = GetDataSourceCredentialTestCase(credentialTypeName, credentialName); + DataSourceCredentialEntity credentialToCreate = GetDataSourceCredentialEntityTestCase(credentialTypeName, credentialName); credentialToCreate.Description = expectedDescription; - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialToCreate); - DataSourceCredential createdCredential = disposableCredential.Credential; + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialToCreate); + DataSourceCredentialEntity createdCredential = disposableCredential.Credential; Assert.That(createdCredential.Description, Is.EqualTo(expectedDescription)); } [RecordedTest] - [TestCase(nameof(DataLakeGen2SharedKeyDataSourceCredential))] - [TestCase(nameof(ServicePrincipalDataSourceCredential))] - [TestCase(nameof(ServicePrincipalInKeyVaultDataSourceCredential))] - [TestCase(nameof(SqlConnectionStringDataSourceCredential))] + [TestCase(nameof(DataSourceDataLakeGen2SharedKey))] + [TestCase(nameof(DataSourceServicePrincipal))] + [TestCase(nameof(DataSourceServicePrincipalInKeyVault))] + [TestCase(nameof(DataSourceSqlConnectionString))] public async Task UpdateDataSourceCredentialCommonProperties(string credentialTypeName) { MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); string credentialName = Recording.GenerateAlphaNumericId("credential"); - DataSourceCredential credentialToCreate = GetDataSourceCredentialTestCase(credentialTypeName, credentialName); + DataSourceCredentialEntity credentialToCreate = GetDataSourceCredentialEntityTestCase(credentialTypeName, credentialName); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialToCreate); - DataSourceCredential credentialToUpdate = disposableCredential.Credential; + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialToCreate); + DataSourceCredentialEntity credentialToUpdate = disposableCredential.Credential; string expectedName = Recording.GenerateAlphaNumericId("credential"); string expectedDescription = "This description was created by a .NET test"; @@ -88,7 +87,7 @@ public async Task UpdateDataSourceCredentialCommonProperties(string credentialTy credentialToUpdate.Name = expectedName; credentialToUpdate.Description = expectedDescription; - DataSourceCredential updatedCredential = await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate); + DataSourceCredentialEntity updatedCredential = await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate); Assert.That(updatedCredential.Id, Is.EqualTo(credentialToUpdate.Id)); Assert.That(updatedCredential.Name, Is.EqualTo(expectedName)); @@ -102,15 +101,15 @@ public async Task UpdateServicePrincipalDataSourceCredential() string credentialName = Recording.GenerateAlphaNumericId("credential"); - DataSourceCredential credentialToCreate = new ServicePrincipalDataSourceCredential(credentialName, "mock", "mock", "mock"); + DataSourceCredentialEntity credentialToCreate = new DataSourceServicePrincipal(credentialName, "mock", "mock", "mock"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialToCreate); - var credentialToUpdate = disposableCredential.Credential as ServicePrincipalDataSourceCredential; + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialToCreate); + var credentialToUpdate = disposableCredential.Credential as DataSourceServicePrincipal; credentialToUpdate.ClientId = ClientId; credentialToUpdate.TenantId = TenantId; - var updatedCredential = (await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate)).Value as ServicePrincipalDataSourceCredential; + var updatedCredential = (await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate)).Value as DataSourceServicePrincipal; Assert.That(updatedCredential.ClientId, Is.EqualTo(ClientId)); Assert.That(updatedCredential.TenantId, Is.EqualTo(TenantId)); @@ -123,10 +122,10 @@ public async Task UpdateServicePrincipalInKeyVaultDataSourceCredential() string credentialName = Recording.GenerateAlphaNumericId("credential"); - DataSourceCredential credentialToCreate = new ServicePrincipalInKeyVaultDataSourceCredential(credentialName, new Uri("https://mock.com/"), "mock", "mock", "mock", "mock", "mock"); + DataSourceCredentialEntity credentialToCreate = new DataSourceServicePrincipalInKeyVault(credentialName, new Uri("https://mock.com/"), "mock", "mock", "mock", "mock", "mock"); - await using var disposableCredential = await DisposableDataSourceCredential.CreateDataSourceCredentialAsync(adminClient, credentialToCreate); - var credentialToUpdate = disposableCredential.Credential as ServicePrincipalInKeyVaultDataSourceCredential; + await using var disposableCredential = await DisposableDataSourceCredentialEntity.CreateDataSourceCredentialEntityAsync(adminClient, credentialToCreate); + var credentialToUpdate = disposableCredential.Credential as DataSourceServicePrincipalInKeyVault; credentialToUpdate.Endpoint = new Uri(Endpoint); credentialToUpdate.KeyVaultClientId = ClientId; @@ -134,7 +133,7 @@ public async Task UpdateServicePrincipalInKeyVaultDataSourceCredential() credentialToUpdate.SecretNameForClientId = ClientIdSecretName; credentialToUpdate.SecretNameForClientSecret = ClientSecretSecretName; - var updatedCredential = (await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate)).Value as ServicePrincipalInKeyVaultDataSourceCredential; + var updatedCredential = (await adminClient.UpdateDataSourceCredentialAsync(credentialToUpdate)).Value as DataSourceServicePrincipalInKeyVault; Assert.That(updatedCredential.Endpoint.AbsoluteUri, Is.EqualTo(Endpoint)); Assert.That(updatedCredential.KeyVaultClientId, Is.EqualTo(ClientId)); @@ -150,13 +149,13 @@ public async Task GetDataSourceCredentials() var credentialCount = 0; - await foreach (DataSourceCredential credential in adminClient.GetDataSourceCredentialsAsync()) + await foreach (DataSourceCredentialEntity credential in adminClient.GetDataSourceCredentialsAsync()) { Assert.That(credential.Id, Is.Not.Null.And.Not.Empty); Assert.That(credential.Name, Is.Not.Null.And.Not.Empty); Assert.That(credential.Description, Is.Not.Null); - ValidateGenericDataSourceCredential(credential); + ValidateGenericDataSourceCredentialEntity(credential); if (++credentialCount >= MaximumSamplesCount) { @@ -173,13 +172,13 @@ public async Task DeleteDataSourceCredential() MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); var credentialName = Recording.GenerateAlphaNumericId("credential"); - var credentialToCreate = new ServicePrincipalDataSourceCredential(credentialName, "clientId", "clientSecret", "tenantId"); + var credentialToCreate = new DataSourceServicePrincipal(credentialName, "clientId", "clientSecret", "tenantId"); string credentialId = null; try { - DataSourceCredential createdCredential = await adminClient.CreateDataSourceCredentialAsync(credentialToCreate); + DataSourceCredentialEntity createdCredential = await adminClient.CreateDataSourceCredentialAsync(credentialToCreate); credentialId = createdCredential.Id; Assert.That(credentialId, Is.Not.Null.And.Not.Empty); @@ -196,14 +195,14 @@ public async Task DeleteDataSourceCredential() } } - private void ValidateGenericDataSourceCredential(DataSourceCredential credential) + private void ValidateGenericDataSourceCredentialEntity(DataSourceCredentialEntity credential) { - if (credential is ServicePrincipalDataSourceCredential spCredential) + if (credential is DataSourceServicePrincipal spCredential) { Assert.That(spCredential.ClientId, Is.Not.Null.And.Not.Empty); Assert.That(spCredential.TenantId, Is.Not.Null.And.Not.Empty); } - else if (credential is ServicePrincipalInKeyVaultDataSourceCredential kvCredential) + else if (credential is DataSourceServicePrincipalInKeyVault kvCredential) { Assert.That(kvCredential.Endpoint.AbsoluteUri, Is.Not.Null.And.Not.Empty); Assert.That(kvCredential.KeyVaultClientId, Is.Not.Null.And.Not.Empty); @@ -211,8 +210,8 @@ private void ValidateGenericDataSourceCredential(DataSourceCredential credential Assert.That(kvCredential.SecretNameForClientId, Is.Not.Null.And.Not.Empty); Assert.That(kvCredential.SecretNameForClientSecret, Is.Not.Null.And.Not.Empty); } - else if (credential is DataLakeGen2SharedKeyDataSourceCredential || - credential is SqlConnectionStringDataSourceCredential) + else if (credential is DataSourceDataLakeGen2SharedKey || + credential is DataSourceSqlConnectionString) { // There's nothing to validate since these credential types do not have public properties. } @@ -222,14 +221,14 @@ private void ValidateGenericDataSourceCredential(DataSourceCredential credential } } - private void ValidateTestCaseDataSourceCredential(DataSourceCredential credential) + private void ValidateTestCaseDataSourceCredentialEntity(DataSourceCredentialEntity credential) { - if (credential is ServicePrincipalDataSourceCredential spCredential) + if (credential is DataSourceServicePrincipal spCredential) { Assert.That(spCredential.ClientId, Is.EqualTo(ClientId)); Assert.That(spCredential.TenantId, Is.EqualTo(TenantId)); } - else if (credential is ServicePrincipalInKeyVaultDataSourceCredential kvCredential) + else if (credential is DataSourceServicePrincipalInKeyVault kvCredential) { Assert.That(kvCredential.Endpoint.AbsoluteUri, Is.EqualTo(Endpoint)); Assert.That(kvCredential.KeyVaultClientId, Is.EqualTo(ClientId)); @@ -237,8 +236,8 @@ private void ValidateTestCaseDataSourceCredential(DataSourceCredential credentia Assert.That(kvCredential.SecretNameForClientId, Is.EqualTo(ClientIdSecretName)); Assert.That(kvCredential.SecretNameForClientSecret, Is.EqualTo(ClientSecretSecretName)); } - else if (credential is DataLakeGen2SharedKeyDataSourceCredential || - credential is SqlConnectionStringDataSourceCredential) + else if (credential is DataSourceDataLakeGen2SharedKey || + credential is DataSourceSqlConnectionString) { // There's nothing to validate since these credential types do not have public properties. } @@ -248,12 +247,12 @@ private void ValidateTestCaseDataSourceCredential(DataSourceCredential credentia } } - private static DataSourceCredential GetDataSourceCredentialTestCase(string credentialTypeName, string credentialName) => credentialTypeName switch + private static DataSourceCredentialEntity GetDataSourceCredentialEntityTestCase(string credentialTypeName, string credentialName) => credentialTypeName switch { - nameof(DataLakeGen2SharedKeyDataSourceCredential) => new DataLakeGen2SharedKeyDataSourceCredential(credentialName, "accountKey"), - nameof(ServicePrincipalDataSourceCredential) => new ServicePrincipalDataSourceCredential(credentialName, ClientId, "clientSecret", TenantId), - nameof(ServicePrincipalInKeyVaultDataSourceCredential) => new ServicePrincipalInKeyVaultDataSourceCredential(credentialName, new Uri(Endpoint), ClientId, "clientSecret", TenantId, ClientIdSecretName, ClientSecretSecretName), - nameof(SqlConnectionStringDataSourceCredential) => new SqlConnectionStringDataSourceCredential(credentialName, "connectionString"), + nameof(DataSourceDataLakeGen2SharedKey) => new DataSourceDataLakeGen2SharedKey(credentialName, "accountKey"), + nameof(DataSourceServicePrincipal) => new DataSourceServicePrincipal(credentialName, ClientId, "clientSecret", TenantId), + nameof(DataSourceServicePrincipalInKeyVault) => new DataSourceServicePrincipalInKeyVault(credentialName, new Uri(Endpoint), ClientId, "clientSecret", TenantId, ClientIdSecretName, ClientSecretSecretName), + nameof(DataSourceSqlConnectionString) => new DataSourceSqlConnectionString(credentialName, "connectionString"), _ => throw new ArgumentOutOfRangeException($"Unknown credential type: {credentialTypeName}") }; } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityTests.cs similarity index 89% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialTests.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityTests.cs index 5a925c571d75..318fc2418212 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialTests.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataSourceCredentialEntityTests.cs @@ -11,9 +11,9 @@ namespace Azure.AI.MetricsAdvisor.Tests { - public class DataSourceCredentialTests : ClientTestBase + public class DataSourceCredentialEntityTests : ClientTestBase { - public DataSourceCredentialTests(bool isAsync) : base(isAsync) + public DataSourceCredentialEntityTests(bool isAsync) : base(isAsync) { } @@ -33,7 +33,7 @@ public void CreateDataSourceCredentialRespectsTheCancellationToken() { MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); - var credential = new ServicePrincipalDataSourceCredential("credentialName", "clientId", "clientSecret", "tenantId"); + var credential = new DataSourceServicePrincipal("credentialName", "clientId", "clientSecret", "tenantId"); using var cancellationSource = new CancellationTokenSource(); cancellationSource.Cancel(); @@ -50,7 +50,7 @@ public void UpdateDataSourceCredentialValidatesArguments() Assert.That(() => adminClient.UpdateDataSourceCredentialAsync(null), Throws.InstanceOf()); Assert.That(() => adminClient.UpdateDataSourceCredential(null), Throws.InstanceOf()); - var credentialWithNullId = new ServicePrincipalDataSourceCredential("name", "clientId", "clientSecret", "tenantId"); + var credentialWithNullId = new DataSourceServicePrincipal("name", "clientId", "clientSecret", "tenantId"); Assert.That(() => adminClient.UpdateDataSourceCredentialAsync(credentialWithNullId), Throws.InstanceOf()); Assert.That(() => adminClient.UpdateDataSourceCredential(credentialWithNullId), Throws.InstanceOf()); @@ -61,7 +61,7 @@ public void UpdateDataSourceCredentialRespectsTheCancellationToken() { MetricsAdvisorAdministrationClient adminClient = GetMetricsAdvisorAdministrationClient(); - var credential = new ServicePrincipalDataSourceCredential(default, FakeGuid, default, default, new ServicePrincipalParam("clientId", "clientSecret")); + var credential = new DataSourceServicePrincipal(default, FakeGuid, default, default, new ServicePrincipalParam("clientId", "clientSecret")); using var cancellationSource = new CancellationTokenSource(); cancellationSource.Cancel(); @@ -104,10 +104,10 @@ public void GetDataSourceCredentialsRespectsTheCancellationToken() using var cancellationSource = new CancellationTokenSource(); cancellationSource.Cancel(); - IAsyncEnumerator asyncEnumerator = adminClient.GetDataSourceCredentialsAsync(cancellationToken: cancellationSource.Token).GetAsyncEnumerator(); + IAsyncEnumerator asyncEnumerator = adminClient.GetDataSourceCredentialsAsync(cancellationToken: cancellationSource.Token).GetAsyncEnumerator(); Assert.That(async () => await asyncEnumerator.MoveNextAsync(), Throws.InstanceOf()); - IEnumerator enumerator = adminClient.GetDataSourceCredentials(cancellationToken: cancellationSource.Token).GetEnumerator(); + IEnumerator enumerator = adminClient.GetDataSourceCredentials(cancellationToken: cancellationSource.Token).GetEnumerator(); Assert.That(() => enumerator.MoveNext(), Throws.InstanceOf()); } diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialsTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialEntitiesTests.cs similarity index 70% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialsTests.cs rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialEntitiesTests.cs index d8a59efca596..835836233550 100644 --- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialsTests.cs +++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Models/DataSourceCredentialEntitiesTests.cs @@ -15,23 +15,23 @@ namespace Azure.AI.MetricsAdvisor.Tests { - public class DataSourceCredentialsTests : MockClientTestBase + public class DataSourceCredentialEntitiesTests : MockClientTestBase { private static Uri FakeUri = new Uri("https://fakeuri.com"); - private static object[] DataSourceCredentialTestCases = + private static object[] DataSourceCredentialEntityTestCases = { - new object[] { new DataLakeGen2SharedKeyDataSourceCredential("mock", "secret"), "\"accountKey\":\"secret\"" }, - new object[] { new ServicePrincipalDataSourceCredential("mock", "mock", "secret", "mock"), "\"clientSecret\":\"secret\"" }, - new object[] { new ServicePrincipalInKeyVaultDataSourceCredential("mock", FakeUri, "mock", "secret", "mock", "mock", "mock"), "\"keyVaultClientSecret\":\"secret\"" }, - new object[] { new SqlConnectionStringDataSourceCredential("mock", "secret"), "\"connectionString\":\"secret\"" }, + new object[] { new DataSourceDataLakeGen2SharedKey("mock", "secret"), "\"accountKey\":\"secret\"" }, + new object[] { new DataSourceServicePrincipal("mock", "mock", "secret", "mock"), "\"clientSecret\":\"secret\"" }, + new object[] { new DataSourceServicePrincipalInKeyVault("mock", FakeUri, "mock", "secret", "mock", "mock", "mock"), "\"keyVaultClientSecret\":\"secret\"" }, + new object[] { new DataSourceSqlConnectionString("mock", "secret"), "\"connectionString\":\"secret\"" }, }; - public DataSourceCredentialsTests(bool isAsync) : base(isAsync) + public DataSourceCredentialEntitiesTests(bool isAsync) : base(isAsync) { } - private string DataSourceCredentialResponseContent => @" + private string DataSourceCredentialEntityResponseContent => @" { ""dataSourceCredentialType"": ""ServicePrincipal"", ""parameters"": { @@ -42,14 +42,14 @@ public DataSourceCredentialsTests(bool isAsync) : base(isAsync) "; [Test] - [TestCaseSource(nameof(DataSourceCredentialTestCases))] - public async Task DataSourceCredentialSendsSecretDuringCreation(DataSourceCredential credential, string expectedSubstring) + [TestCaseSource(nameof(DataSourceCredentialEntityTestCases))] + public async Task DataSourceCredentialEntitySendsSecretDuringCreation(DataSourceCredentialEntity credential, string expectedSubstring) { MockResponse createResponse = new MockResponse(201); createResponse.AddHeader(new HttpHeader("Location", $"https://fakeresource.cognitiveservices.azure.com/metricsadvisor/v1.0/credentials/{FakeGuid}")); MockResponse getResponse = new MockResponse(200); - getResponse.SetContent(DataSourceCredentialResponseContent); + getResponse.SetContent(DataSourceCredentialEntityResponseContent); MockTransport mockTransport = new MockTransport(createResponse, getResponse); MetricsAdvisorAdministrationClient adminClient = CreateInstrumentedAdministrationClient(mockTransport); @@ -63,15 +63,15 @@ public async Task DataSourceCredentialSendsSecretDuringCreation(DataSourceCreden } [Test] - public async Task DataLakeGen2SharedKeyDataSourceCredentialSendsSecretDuringUpdate() + public async Task DataLakeGen2SharedKeyDataSourceCredentialEntitySendsSecretDuringUpdate() { MockResponse updateResponse = new MockResponse(200); - updateResponse.SetContent(DataSourceCredentialResponseContent); + updateResponse.SetContent(DataSourceCredentialEntityResponseContent); MockTransport mockTransport = new MockTransport(updateResponse); MetricsAdvisorAdministrationClient adminClient = CreateInstrumentedAdministrationClient(mockTransport); - var credential = new DataLakeGen2SharedKeyDataSourceCredential(DataSourceCredentialType.DataLakeGen2SharedKey, FakeGuid, + var credential = new DataSourceDataLakeGen2SharedKey(DataSourceCredentialType.DataLakeGen2SharedKey, FakeGuid, default, default, new DataLakeGen2SharedKeyParam()); Assert.That(credential.AccountKey, Is.Null); @@ -87,15 +87,15 @@ public async Task DataLakeGen2SharedKeyDataSourceCredentialSendsSecretDuringUpda } [Test] - public async Task ServicePrincipalDataSourceCredentialSendsSecretDuringUpdate() + public async Task ServicePrincipalDataSourceCredentialEntitySendsSecretDuringUpdate() { MockResponse updateResponse = new MockResponse(200); - updateResponse.SetContent(DataSourceCredentialResponseContent); + updateResponse.SetContent(DataSourceCredentialEntityResponseContent); MockTransport mockTransport = new MockTransport(updateResponse); MetricsAdvisorAdministrationClient adminClient = CreateInstrumentedAdministrationClient(mockTransport); - var credential = new ServicePrincipalDataSourceCredential(DataSourceCredentialType.ServicePrincipal, FakeGuid, + var credential = new DataSourceServicePrincipal(DataSourceCredentialType.ServicePrincipal, FakeGuid, default, default, new ServicePrincipalParam("mock", "mock")); Assert.That(credential.ClientSecret, Is.Null); @@ -111,15 +111,15 @@ public async Task ServicePrincipalDataSourceCredentialSendsSecretDuringUpdate() } [Test] - public async Task ServicePrincipalInKeyVaultDataSourceCredentialSendsSecretDuringUpdate() + public async Task ServicePrincipalInKeyVaultDataSourceCredentialEntitySendsSecretDuringUpdate() { MockResponse updateResponse = new MockResponse(200); - updateResponse.SetContent(DataSourceCredentialResponseContent); + updateResponse.SetContent(DataSourceCredentialEntityResponseContent); MockTransport mockTransport = new MockTransport(updateResponse); MetricsAdvisorAdministrationClient adminClient = CreateInstrumentedAdministrationClient(mockTransport); - var credential = new ServicePrincipalInKeyVaultDataSourceCredential(DataSourceCredentialType.ServicePrincipal, FakeGuid, + var credential = new DataSourceServicePrincipalInKeyVault(DataSourceCredentialType.ServicePrincipal, FakeGuid, default, default, new ServicePrincipalInKVParam(FakeUri.AbsoluteUri, "mock", "mock", "mock", "mock")); Assert.That(credential.KeyVaultClientSecret, Is.Null); @@ -135,15 +135,15 @@ public async Task ServicePrincipalInKeyVaultDataSourceCredentialSendsSecretDurin } [Test] - public async Task SqlConnectionStringDataSourceCredentialSendsSecretDuringUpdate() + public async Task SqlConnectionStringDataSourceCredentialEntitySendsSecretDuringUpdate() { MockResponse updateResponse = new MockResponse(200); - updateResponse.SetContent(DataSourceCredentialResponseContent); + updateResponse.SetContent(DataSourceCredentialEntityResponseContent); MockTransport mockTransport = new MockTransport(updateResponse); MetricsAdvisorAdministrationClient adminClient = CreateInstrumentedAdministrationClient(mockTransport); - var credential = new SqlConnectionStringDataSourceCredential(DataSourceCredentialType.AzureSQLConnectionString, FakeGuid, + var credential = new DataSourceSqlConnectionString(DataSourceCredentialType.AzureSQLConnectionString, FakeGuid, default, default, new AzureSQLConnectionStringParam()); Assert.That(credential.ConnectionString, Is.Null); diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%DataLakeGen2SharedKeyDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceDataLakeGen2SharedKey%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%DataLakeGen2SharedKeyDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceDataLakeGen2SharedKey%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceDataLakeGen2SharedKey%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceDataLakeGen2SharedKey%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipal%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipal%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipal%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipal%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalInKeyVaultDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipalInKeyVault%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalInKeyVaultDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipalInKeyVault%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipalInKeyVault%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceServicePrincipalInKeyVault%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%SqlConnectionStringDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceSqlConnectionString%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%SqlConnectionStringDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceSqlConnectionString%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%SqlConnectionStringDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceSqlConnectionString%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredential(%SqlConnectionStringDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredential(%DataSourceSqlConnectionString%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataLakeGen2SharedKeyDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceDataLakeGen2SharedKey%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataLakeGen2SharedKeyDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceDataLakeGen2SharedKey%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceDataLakeGen2SharedKey%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceDataLakeGen2SharedKey%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipal%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipal%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipal%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipal%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalInKeyVaultDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipalInKeyVault%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalInKeyVaultDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipalInKeyVault%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipalInKeyVault%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceServicePrincipalInKeyVault%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%SqlConnectionStringDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceSqlConnectionString%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%SqlConnectionStringDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceSqlConnectionString%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%SqlConnectionStringDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceSqlConnectionString%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/CreateAndGetDataSourceCredentialWithDescription(%SqlConnectionStringDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/CreateAndGetDataSourceCredentialWithDescription(%DataSourceSqlConnectionString%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/DeleteDataSourceCredential.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/DeleteDataSourceCredential.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/DeleteDataSourceCredential.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/DeleteDataSourceCredential.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/DeleteDataSourceCredentialAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/DeleteDataSourceCredentialAsync.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/DeleteDataSourceCredentialAsync.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/DeleteDataSourceCredentialAsync.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/GetDataSourceCredentials.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/GetDataSourceCredentials.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/GetDataSourceCredentials.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/GetDataSourceCredentials.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/GetDataSourceCredentialsAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/GetDataSourceCredentialsAsync.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/GetDataSourceCredentialsAsync.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/GetDataSourceCredentialsAsync.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%DataLakeGen2SharedKeyDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceDataLakeGen2SharedKey%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%DataLakeGen2SharedKeyDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceDataLakeGen2SharedKey%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceDataLakeGen2SharedKey%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%DataLakeGen2SharedKeyDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceDataLakeGen2SharedKey%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipal%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipal%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipal%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipal%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalInKeyVaultDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipalInKeyVault%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalInKeyVaultDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipalInKeyVault%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipalInKeyVault%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%ServicePrincipalInKeyVaultDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceServicePrincipalInKeyVault%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%SqlConnectionStringDataSourceCredential%).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceSqlConnectionString%).json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%SqlConnectionStringDataSourceCredential%).json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceSqlConnectionString%).json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%SqlConnectionStringDataSourceCredential%)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceSqlConnectionString%)Async.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateDataSourceCredentialCommonProperties(%SqlConnectionStringDataSourceCredential%)Async.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateDataSourceCredentialCommonProperties(%DataSourceSqlConnectionString%)Async.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalDataSourceCredential.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalDataSourceCredential.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalDataSourceCredential.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalDataSourceCredential.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalDataSourceCredentialAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalDataSourceCredentialAsync.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalDataSourceCredentialAsync.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalDataSourceCredentialAsync.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredential.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredential.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredential.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredential.json diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredentialAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredentialAsync.json similarity index 100% rename from sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredentialAsync.json rename to sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataSourceCredentialEntityLiveTests/UpdateServicePrincipalInKeyVaultDataSourceCredentialAsync.json