Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR datafactory/resource-manager] Remove enum from catalogPricingTier #4439

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions azure-mgmt-datafactory/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
3 changes: 3 additions & 0 deletions azure-mgmt-datafactory/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ Provide Feedback
If you encounter any bugs or have suggestions, please file an issue in the
`Issues <https://github.com/Azure/azure-sdk-for-python/issues>`__
section of the project.


.. image:: https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-datafactory%2FREADME.png
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@
from .mongo_db_v2_collection_dataset_py3 import MongoDbV2CollectionDataset
from .mongo_db_collection_dataset_py3 import MongoDbCollectionDataset
from .file_share_dataset_py3 import FileShareDataset
from .azure_data_lake_store_cosmos_structured_stream_dataset_py3 import AzureDataLakeStoreCosmosStructuredStreamDataset
from .office365_dataset_py3 import Office365Dataset
from .azure_blob_fs_dataset_py3 import AzureBlobFSDataset
from .azure_data_lake_store_dataset_py3 import AzureDataLakeStoreDataset
Expand Down Expand Up @@ -644,7 +643,6 @@
from .mongo_db_v2_collection_dataset import MongoDbV2CollectionDataset
from .mongo_db_collection_dataset import MongoDbCollectionDataset
from .file_share_dataset import FileShareDataset
from .azure_data_lake_store_cosmos_structured_stream_dataset import AzureDataLakeStoreCosmosStructuredStreamDataset
from .office365_dataset import Office365Dataset
from .azure_blob_fs_dataset import AzureBlobFSDataset
from .azure_data_lake_store_dataset import AzureDataLakeStoreDataset
Expand Down Expand Up @@ -1118,7 +1116,6 @@
'MongoDbV2CollectionDataset',
'MongoDbCollectionDataset',
'FileShareDataset',
'AzureDataLakeStoreCosmosStructuredStreamDataset',
'Office365Dataset',
'AzureBlobFSDataset',
'AzureDataLakeStoreDataset',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonMWSLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonMWSLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonRedshiftLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonRedshiftLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonS3LinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AmazonS3LinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBatchLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBatchLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBlobFSLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBlobFSLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBlobStorageLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBlobStorageLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureDataExplorerLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureDataExplorerLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
:type parameters: dict[str,
~azure.mgmt.datafactory.models.ParameterSpecification]
:param annotations: List of tags that can be used for describing the
Dataset.
linked service.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class AzureDataLakeStoreDataset(Dataset):
:type folder: ~azure.mgmt.datafactory.models.DatasetFolder
:param type: Required. Constant filled by server.
:type type: str
:param folder_path: Required. Path to the folder in the Azure Data Lake
Store. Type: string (or Expression with resultType string).
:param folder_path: Path to the folder in the Azure Data Lake Store. Type:
string (or Expression with resultType string).
:type folder_path: object
:param file_name: The name of the file in the Azure Data Lake Store. Type:
string (or Expression with resultType string).
Expand All @@ -59,7 +59,6 @@ class AzureDataLakeStoreDataset(Dataset):
_validation = {
'linked_service_name': {'required': True},
'type': {'required': True},
'folder_path': {'required': True},
}

_attribute_map = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class AzureDataLakeStoreDataset(Dataset):
:type folder: ~azure.mgmt.datafactory.models.DatasetFolder
:param type: Required. Constant filled by server.
:type type: str
:param folder_path: Required. Path to the folder in the Azure Data Lake
Store. Type: string (or Expression with resultType string).
:param folder_path: Path to the folder in the Azure Data Lake Store. Type:
string (or Expression with resultType string).
:type folder_path: object
:param file_name: The name of the file in the Azure Data Lake Store. Type:
string (or Expression with resultType string).
Expand All @@ -59,7 +59,6 @@ class AzureDataLakeStoreDataset(Dataset):
_validation = {
'linked_service_name': {'required': True},
'type': {'required': True},
'folder_path': {'required': True},
}

_attribute_map = {
Expand All @@ -78,7 +77,7 @@ class AzureDataLakeStoreDataset(Dataset):
'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'},
}

def __init__(self, *, linked_service_name, folder_path, additional_properties=None, description: str=None, structure=None, schema=None, parameters=None, annotations=None, folder=None, file_name=None, format=None, compression=None, **kwargs) -> None:
def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, schema=None, parameters=None, annotations=None, folder=None, folder_path=None, file_name=None, format=None, compression=None, **kwargs) -> None:
super(AzureDataLakeStoreDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, schema=schema, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, folder=folder, **kwargs)
self.folder_path = folder_path
self.file_name = file_name
Expand Down
Loading