Skip to content

Commit 97c4a93

Browse files
xiangyan99xiangyan99
authored
Ma auth type support (Azure#18962)
* add auth type support * update * update * update * update
1 parent b6e6bc0 commit 97c4a93

24 files changed

+530
-378
lines changed

‎sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Added AzureLogAnalyticsDataFeedSource and AzureEventHubsDataFeedSource
77
- Update method now returns the updated object
88
- Added CredentialEntities and CredentialEntity operations
9+
- Added authentication type support for data feed
910

1011
**Breaking Changes**
1112

@@ -16,14 +17,14 @@
1617
- Renamed
1718
- AzureApplicationInsightsDataFeed -> AzureApplicationInsightsDataFeedSource
1819
- AzureBlobDataFeed -> AzureBlobDataFeedSource
19-
- AzureCosmosDBDataFeed -> AzureCosmosDBDataFeedSource
20+
- AzureCosmosDBDataFeed -> AzureCosmosDbDataFeedSource
2021
- AzureDataExplorerDataFeed -> AzureDataExplorerDataFeedSource
2122
- AzureTableDataFeed -> AzureTableDataFeedSource
22-
- InfluxDBDataFeed -> InfluxDBDataFeedSource
23+
- InfluxDBDataFeed -> InfluxDbDataFeedSource
2324
- MySqlDataFeed -> MySqlDataFeedSource
2425
- PostgreSqlDataFeed -> PostgreSqlDataFeedSource
25-
- SQLServerDataFeed -> SQLServerDataFeedSource
26-
- MongoDBDataFeed -> MongoDBDataFeedSource
26+
- SQLServerDataFeed -> SqlServerDataFeedSource
27+
- MongoDBDataFeed -> MongoDbDataFeedSource
2728
- AzureDataLakeStorageGen2DataFeed -> AzureDataLakeStorageGen2DataFeedSource
2829

2930
**Dependency Updates**

‎sdk/metricsadvisor/azure-ai-metricsadvisor/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ import os
120120
import datetime
121121
from azure.ai.metricsadvisor import MetricsAdvisorKeyCredential, MetricsAdvisorAdministrationClient
122122
from azure.ai.metricsadvisor.models import (
123-
SQLServerDataFeedSource,
123+
SqlServerDataFeedSource,
124124
DataFeedSchema,
125125
DataFeedMetric,
126126
DataFeedDimension,
@@ -142,7 +142,7 @@ client = MetricsAdvisorAdministrationClient(
142142

143143
data_feed = client.create_data_feed(
144144
name="My data feed",
145-
source=SQLServerDataFeedSource(
145+
source=SqlServerDataFeedSource(
146146
connection_string=sql_server_connection_string,
147147
query=query,
148148
),

‎sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
'MetricSeriesItem',
469469
'MetricSeriesList',
470470
'MetricSeriesQueryOptions',
471-
'MongoDBDataFeed',
471+
'MongoDbDataFeed',
472472
'MongoDBDataFeedPatch',
473473
'MongoDBParameter',
474474
'MongoDBParameterPatch',

‎sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
CommentFeedback,
2626
PeriodFeedback,
2727
DataFeedRollupType,
28-
SQLConnectionStringCredentialEntity,
28+
SqlConnectionStringCredentialEntity,
2929
DataLakeGen2SharedKeyCredentialEntity,
3030
ServicePrincipalCredentialEntity,
31-
ServicePrincipalInKVCredentialEntity
31+
ServicePrincipalInKeyVaultCredentialEntity
3232
)
3333
from ._metrics_advisor_key_credential import MetricsAdvisorKeyCredential
3434
from ._metrics_advisor_key_credential_policy import MetricsAdvisorKeyCredentialPolicy
@@ -50,7 +50,7 @@ def construct_alert_config_dict(update_kwargs):
5050
def construct_detection_config_dict(update_kwargs):
5151

5252
if "wholeMetricConfiguration" in update_kwargs:
53-
update_kwargs["wholeMetricConfiguration"] = update_kwargs["wholeMetricConfiguration"]._to_generated() \
53+
update_kwargs["wholeMetricConfiguration"] = update_kwargs["wholeMetricConfiguration"]._to_generated_patch() \
5454
if update_kwargs["wholeMetricConfiguration"] else None
5555
if "dimensionGroupOverrideConfigurations" in update_kwargs:
5656
update_kwargs["dimensionGroupOverrideConfigurations"] = [
@@ -95,6 +95,8 @@ def construct_data_feed_dict(update_kwargs):
9595
update_kwargs["dataStartFrom"] = Serializer.serialize_iso(update_kwargs["dataStartFrom"])
9696

9797
if "dataSourceParameter" in update_kwargs:
98+
update_kwargs["authenticationType"] = update_kwargs["dataSourceParameter"].authentication_type
99+
update_kwargs["credentialId"] = update_kwargs["dataSourceParameter"].credential_id
98100
update_kwargs["dataSourceParameter"] = update_kwargs["dataSourceParameter"]._to_generated_patch()
99101
return update_kwargs
100102

@@ -117,10 +119,10 @@ def convert_to_generated_data_feed_type(
117119
AzureEventHubsDataFeed]
118120
:param str name: Name for the data feed.
119121
:param source: The exposed model source of the data feed
120-
:type source: Union[AzureApplicationInsightsDataFeedSource, AzureBlobDataFeedSource, AzureCosmosDBDataFeedSource,
122+
:type source: Union[AzureApplicationInsightsDataFeedSource, AzureBlobDataFeedSource, AzureCosmosDbDataFeedSource,
121123
AzureDataExplorerDataFeedSource, AzureDataLakeStorageGen2DataFeedSource, AzureTableDataFeedSource,
122-
AzureLogAnalyticsDataFeedSource, InfluxDBDataFeedSource, MySqlDataFeedSource, PostgreSqlDataFeedSource,
123-
SQLServerDataFeedSource, MongoDBDataFeedSource, AzureEventHubsDataFeedSource]
124+
AzureLogAnalyticsDataFeedSource, InfluxDbDataFeedSource, MySqlDataFeedSource, PostgreSqlDataFeedSource,
125+
SqlServerDataFeedSource, MongoDbDataFeedSource, AzureEventHubsDataFeedSource]
124126
:param granularity: Granularity type and amount if using custom.
125127
:type granularity: ~azure.ai.metricsadvisor.models.DataFeedGranularity
126128
:param schema: Data feed schema
@@ -153,6 +155,8 @@ def convert_to_generated_data_feed_type(
153155

154156
return generated_feed_type(
155157
data_source_parameter=source._to_generated(),
158+
authentication_type=source.authentication_type,
159+
credential_id=source.credential_id,
156160
data_feed_name=name,
157161
granularity_name=granularity.granularity_type,
158162
granularity_amount=granularity.custom_granularity_value,
@@ -224,9 +228,9 @@ def get_authentication_policy(credential):
224228

225229
def convert_to_credential_entity(credential_entity):
226230
if credential_entity.data_source_credential_type == "AzureSQLConnectionString":
227-
return SQLConnectionStringCredentialEntity._from_generated(credential_entity)
231+
return SqlConnectionStringCredentialEntity._from_generated(credential_entity)
228232
if credential_entity.data_source_credential_type == "DataLakeGen2SharedKey":
229233
return DataLakeGen2SharedKeyCredentialEntity._from_generated(credential_entity)
230234
if credential_entity.data_source_credential_type == "ServicePrincipal":
231235
return ServicePrincipalCredentialEntity._from_generated(credential_entity)
232-
return ServicePrincipalInKVCredentialEntity._from_generated(credential_entity)
236+
return ServicePrincipalInKeyVaultCredentialEntity._from_generated(credential_entity)

‎sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@
7171
DataFeedIngestionProgress,
7272
AzureApplicationInsightsDataFeedSource,
7373
AzureBlobDataFeedSource,
74-
AzureCosmosDBDataFeedSource,
74+
AzureCosmosDbDataFeedSource,
7575
AzureDataExplorerDataFeedSource,
7676
AzureTableDataFeedSource,
7777
AzureLogAnalyticsDataFeedSource,
78-
InfluxDBDataFeedSource,
78+
InfluxDbDataFeedSource,
7979
MySqlDataFeedSource,
8080
PostgreSqlDataFeedSource,
81-
SQLServerDataFeedSource,
82-
MongoDBDataFeedSource,
81+
SqlServerDataFeedSource,
82+
MongoDbDataFeedSource,
8383
AzureDataLakeStorageGen2DataFeedSource,
8484
AzureEventHubsDataFeedSource,
85-
SQLConnectionStringCredentialEntity,
85+
SqlConnectionStringCredentialEntity,
8686
DataLakeGen2SharedKeyCredentialEntity,
8787
ServicePrincipalCredentialEntity,
88-
ServicePrincipalInKVCredentialEntity
88+
ServicePrincipalInKeyVaultCredentialEntity
8989
)
9090

9191
if TYPE_CHECKING:
@@ -105,24 +105,24 @@
105105
DataFeedSourceUnion = Union[
106106
AzureApplicationInsightsDataFeedSource,
107107
AzureBlobDataFeedSource,
108-
AzureCosmosDBDataFeedSource,
108+
AzureCosmosDbDataFeedSource,
109109
AzureDataExplorerDataFeedSource,
110110
AzureTableDataFeedSource,
111111
AzureLogAnalyticsDataFeedSource,
112-
InfluxDBDataFeedSource,
112+
InfluxDbDataFeedSource,
113113
MySqlDataFeedSource,
114114
PostgreSqlDataFeedSource,
115-
SQLServerDataFeedSource,
116-
MongoDBDataFeedSource,
115+
SqlServerDataFeedSource,
116+
MongoDbDataFeedSource,
117117
AzureDataLakeStorageGen2DataFeedSource,
118118
AzureEventHubsDataFeedSource,
119119
]
120120

121121
CredentialEntityUnion = Union[
122-
SQLConnectionStringCredentialEntity,
122+
SqlConnectionStringCredentialEntity,
123123
DataLakeGen2SharedKeyCredentialEntity,
124124
ServicePrincipalCredentialEntity,
125-
ServicePrincipalInKVCredentialEntity,
125+
ServicePrincipalInKeyVaultCredentialEntity,
126126
]
127127

128128
DATA_FEED = {
@@ -282,9 +282,9 @@ def create_data_feed(
282282
:param str name: Name for the data feed.
283283
:param source: The source of the data feed
284284
:type source: Union[AzureApplicationInsightsDataFeedSource, AzureBlobDataFeedSource,
285-
AzureCosmosDBDataFeedSource, AzureDataExplorerDataFeedSource, AzureDataLakeStorageGen2DataFeedSource,
286-
AzureTableDataFeedSource, AzureLogAnalyticsDataFeedSource, InfluxDBDataFeedSource, MySqlDataFeedSource,
287-
PostgreSqlDataFeedSource, SQLServerDataFeedSource, MongoDBDataFeedSource, AzureEventHubsDataFeedSource]
285+
AzureCosmosDbDataFeedSource, AzureDataExplorerDataFeedSource, AzureDataLakeStorageGen2DataFeedSource,
286+
AzureTableDataFeedSource, AzureLogAnalyticsDataFeedSource, InfluxDbDataFeedSource, MySqlDataFeedSource,
287+
PostgreSqlDataFeedSource, SqlServerDataFeedSource, MongoDbDataFeedSource, AzureEventHubsDataFeedSource]
288288
:param granularity: Granularity type. If using custom granularity, you must instantiate a DataFeedGranularity.
289289
:type granularity: Union[str, ~azure.ai.metricsadvisor.models.DataFeedGranularityType,
290290
~azure.ai.metricsadvisor.models.DataFeedGranularity]
@@ -745,9 +745,9 @@ def update_data_feed(
745745
:paramtype status: str or ~azure.ai.metricsadvisor.models.DataFeedStatus
746746
:keyword source: The source of the data feed for update
747747
:paramtype source: Union[AzureApplicationInsightsDataFeedSource, AzureBlobDataFeedSource,
748-
AzureCosmosDBDataFeedSource, AzureDataExplorerDataFeedSource, AzureDataLakeStorageGen2DataFeedSource,
749-
AzureTableDataFeedSource, AzureLogAnalyticsDataFeedSource, InfluxDBDataFeedSource, MySqlDataFeedSource,
750-
PostgreSqlDataFeedSource, SQLServerDataFeedSource, MongoDBDataFeedSource, AzureEventHubsDataFeedSource]
748+
AzureCosmosDbDataFeedSource, AzureDataExplorerDataFeedSource, AzureDataLakeStorageGen2DataFeedSource,
749+
AzureTableDataFeedSource, AzureLogAnalyticsDataFeedSource, InfluxDbDataFeedSource, MySqlDataFeedSource,
750+
PostgreSqlDataFeedSource, SqlServerDataFeedSource, MongoDbDataFeedSource, AzureEventHubsDataFeedSource]
751751
:rtype: ~azure.ai.metricsadvisor.models.DataFeed
752752
:raises ~azure.core.exceptions.HttpResponseError:
753753
@@ -1242,10 +1242,10 @@ def get_credential_entity(
12421242
:param credential_entity_id: Data source credential entity unique ID.
12431243
:type credential_entity_id: str
12441244
:return: The credential entity
1245-
:rtype: Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1245+
:rtype: Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
12461246
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
12471247
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1248-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]
1248+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]
12491249
:raises ~azure.core.exceptions.HttpResponseError:
12501250
12511251
.. admonition:: Example:
@@ -1270,15 +1270,15 @@ def create_credential_entity(
12701270
"""Create a new data source credential entity.
12711271
12721272
:param credential_entity: The data source credential entity to create
1273-
:type credential_entity: Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1273+
:type credential_entity: Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
12741274
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
12751275
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1276-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]
1276+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]
12771277
:return: The created data source credential entity
1278-
:rtype: Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1278+
:rtype: Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
12791279
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
12801280
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1281-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]
1281+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]
12821282
:raises ~azure.core.exceptions.HttpResponseError:
12831283
12841284
.. admonition:: Example:
@@ -1315,10 +1315,10 @@ def list_credential_entities(
13151315
:param skip: for paging, skipped number.
13161316
:type skip: int
13171317
:return: Pageable containing credential entities
1318-
:rtype: ~azure.core.paging.ItemPaged[Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1318+
:rtype: ~azure.core.paging.ItemPaged[Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
13191319
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
13201320
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1321-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]]
1321+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]]
13221322
:raises ~azure.core.exceptions.HttpResponseError:
13231323
13241324
.. admonition:: Example:
@@ -1347,14 +1347,14 @@ def update_credential_entity(
13471347
"""Update a credential entity.
13481348
13491349
:param credential_entity: The new credential entity object
1350-
:type credential_entity: Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1350+
:type credential_entity: Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
13511351
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
13521352
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1353-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]
1354-
:rtype: Union[~azure.ai.metricsadvisor.models.SQLConnectionStringCredentialEntity,
1353+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]
1354+
:rtype: Union[~azure.ai.metricsadvisor.models.SqlConnectionStringCredentialEntity,
13551355
~azure.ai.metricsadvisor.models.DataLakeGen2SharedKeyCredentialEntity,
13561356
~azure.ai.metricsadvisor.models.ServicePrincipalCredentialEntity,
1357-
~azure.ai.metricsadvisor.models.ServicePrincipalInKVCredentialEntity]
1357+
~azure.ai.metricsadvisor.models.ServicePrincipalInKeyVaultCredentialEntity]
13581358
:raises ~azure.core.exceptions.HttpResponseError:
13591359
13601360
.. admonition:: Example:

0 commit comments

Comments
 (0)