From 69b022906afaffa3d0e7301ab935154cb0205bfb Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 20 Jun 2022 03:27:28 +0000 Subject: [PATCH] CodeGen from PR 19518 in Azure/azure-rest-api-specs java adf, avoid unnecessary breaking changes in SDK (#19518) --- .../azure-mgmt-datafactory/_meta.json | 4 ++-- .../azure/mgmt/datafactory/_version.py | 2 +- .../azure/mgmt/datafactory/models/__init__.py | 2 ++ .../_data_factory_management_client_enums.py | 6 ++++++ .../mgmt/datafactory/models/_models_py3.py | 18 ++++++++++-------- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/_meta.json b/sdk/datafactory/azure-mgmt-datafactory/_meta.json index 568c3ab30aa5..13e860dee7a6 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/_meta.json +++ b/sdk/datafactory/azure-mgmt-datafactory/_meta.json @@ -4,8 +4,8 @@ "@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3" ], - "commit": "6dc6ded9bad45a876f4a6e96df2d4f4eb5c26b12", + "commit": "f108180f8a62ed664733f716182c51b8d1f5cb03", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", + "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", "readme": "specification/datafactory/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py index b457a55ac9da..c47f66669f1b 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.7.0" +VERSION = "1.0.0" diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index a1eba2e4eb49..e4d0ceceecc2 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -819,6 +819,7 @@ TriggerRunStatus, TriggerRuntimeState, TumblingWindowFrequency, + Type, VariableType, WebActivityMethod, WebAuthenticationType, @@ -1639,6 +1640,7 @@ 'TriggerRunStatus', 'TriggerRuntimeState', 'TumblingWindowFrequency', + 'Type', 'VariableType', 'WebActivityMethod', 'WebAuthenticationType', diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py index 5dfcf00dba93..b542c50a49e6 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py @@ -864,6 +864,12 @@ class TumblingWindowFrequency(str, Enum, metaclass=CaseInsensitiveEnumMeta): HOUR = "Hour" MONTH = "Month" +class Type(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Linked service reference type. + """ + + LINKED_SERVICE_REFERENCE = "LinkedServiceReference" + class VariableType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Variable type. """ diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index 27cfed066848..c0383e0d7cf9 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -450,7 +450,7 @@ def __init__( class LinkedService(msrest.serialization.Model): - """The Azure Data Factory nested object which contains the information and credential which can be used to connect with related store or compute resource. + """The nested object which contains the information and credential which can be used to connect with related store or compute resource. You probably want to use the sub-classes and not this class directly. Known sub-classes are: AmazonMWSLinkedService, AmazonRdsForOracleLinkedService, AmazonRdsForSqlServerLinkedService, AmazonRedshiftLinkedService, AmazonS3LinkedService, AmazonS3CompatibleLinkedService, AppFiguresLinkedService, AsanaLinkedService, AzureBatchLinkedService, AzureBlobFSLinkedService, AzureBlobStorageLinkedService, AzureDataExplorerLinkedService, AzureDataLakeAnalyticsLinkedService, AzureDataLakeStoreLinkedService, AzureDatabricksLinkedService, AzureDatabricksDeltaLakeLinkedService, AzureFileStorageLinkedService, AzureFunctionLinkedService, AzureKeyVaultLinkedService, AzureMLLinkedService, AzureMLServiceLinkedService, AzureMariaDBLinkedService, AzureMySqlLinkedService, AzurePostgreSqlLinkedService, AzureSearchLinkedService, AzureSqlDWLinkedService, AzureSqlDatabaseLinkedService, AzureSqlMILinkedService, AzureStorageLinkedService, AzureTableStorageLinkedService, CassandraLinkedService, CommonDataServiceForAppsLinkedService, ConcurLinkedService, CosmosDbLinkedService, CosmosDbMongoDbApiLinkedService, CouchbaseLinkedService, CustomDataSourceLinkedService, DataworldLinkedService, Db2LinkedService, DrillLinkedService, DynamicsLinkedService, DynamicsAXLinkedService, DynamicsCrmLinkedService, EloquaLinkedService, FileServerLinkedService, FtpServerLinkedService, GoogleAdWordsLinkedService, GoogleBigQueryLinkedService, GoogleCloudStorageLinkedService, GreenplumLinkedService, HBaseLinkedService, HDInsightLinkedService, HDInsightOnDemandLinkedService, HdfsLinkedService, HiveLinkedService, HttpLinkedService, HubspotLinkedService, ImpalaLinkedService, InformixLinkedService, JiraLinkedService, MagentoLinkedService, MariaDBLinkedService, MarketoLinkedService, MicrosoftAccessLinkedService, MongoDbLinkedService, MongoDbAtlasLinkedService, MongoDbV2LinkedService, MySqlLinkedService, NetezzaLinkedService, ODataLinkedService, OdbcLinkedService, Office365LinkedService, OracleLinkedService, OracleCloudStorageLinkedService, OracleServiceCloudLinkedService, PaypalLinkedService, PhoenixLinkedService, PostgreSqlLinkedService, PrestoLinkedService, QuickBooksLinkedService, QuickbaseLinkedService, ResponsysLinkedService, RestServiceLinkedService, SalesforceLinkedService, SalesforceMarketingCloudLinkedService, SalesforceServiceCloudLinkedService, SapBWLinkedService, SapCloudForCustomerLinkedService, SapEccLinkedService, SapHanaLinkedService, SapOdpLinkedService, SapOpenHubLinkedService, SapTableLinkedService, ServiceNowLinkedService, SftpServerLinkedService, SharePointOnlineListLinkedService, ShopifyLinkedService, SmartsheetLinkedService, SnowflakeLinkedService, SparkLinkedService, SqlServerLinkedService, SquareLinkedService, SybaseLinkedService, TeamDeskLinkedService, TeradataLinkedService, TwilioLinkedService, VerticaLinkedService, WebLinkedService, XeroLinkedService, ZendeskLinkedService, ZohoLinkedService. @@ -33406,12 +33406,11 @@ def __init__( class LinkedServiceReference(msrest.serialization.Model): """Linked service reference type. - Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - :ivar type: Linked service reference type. Has constant value: "LinkedServiceReference". - :vartype type: str + :ivar type: Required. Linked service reference type. Known values are: + "LinkedServiceReference". + :vartype type: str or ~azure.mgmt.datafactory.models.Type :ivar reference_name: Required. Reference LinkedService name. :vartype reference_name: str :ivar parameters: Arguments for LinkedService. @@ -33419,7 +33418,7 @@ class LinkedServiceReference(msrest.serialization.Model): """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'reference_name': {'required': True}, } @@ -33429,22 +33428,25 @@ class LinkedServiceReference(msrest.serialization.Model): 'parameters': {'key': 'parameters', 'type': '{object}'}, } - type = "LinkedServiceReference" - def __init__( self, *, + type: Union[str, "_models.Type"], reference_name: str, parameters: Optional[Dict[str, Any]] = None, **kwargs ): """ + :keyword type: Required. Linked service reference type. Known values are: + "LinkedServiceReference". + :paramtype type: str or ~azure.mgmt.datafactory.models.Type :keyword reference_name: Required. Reference LinkedService name. :paramtype reference_name: str :keyword parameters: Arguments for LinkedService. :paramtype parameters: dict[str, any] """ super(LinkedServiceReference, self).__init__(**kwargs) + self.type = type self.reference_name = reference_name self.parameters = parameters