From 8f6d42cbf531c65e491fe14288e08d4931201fbd Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 12 May 2020 07:48:25 +0000 Subject: [PATCH 1/2] Update from master --- .../azure-mgmt-loganalytics/CHANGELOG.md | 33 ------------------- .../azure/mgmt/loganalytics/__init__.py | 6 ++-- .../azure/mgmt/loganalytics/_configuration.py | 6 ++-- ...operational_insights_management_client.py} | 12 +++---- .../mgmt/loganalytics/models/__init__.py | 2 +- ...ional_insights_management_client_enums.py} | 0 .../azure/mgmt/loganalytics/version.py | 2 +- .../dev_requirements.txt | 2 -- 8 files changed, 14 insertions(+), 49 deletions(-) rename sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/{_log_analytics_management_client.py => _operational_insights_management_client.py} (93%) rename sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/{_log_analytics_management_client_enums.py => _operational_insights_management_client_enums.py} (100%) delete mode 100644 sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md b/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md index fd2e5cf5e7ca..8f3939b95eab 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md +++ b/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md @@ -1,38 +1,5 @@ # Release History -## 0.5.0 (2020-04-22) - -**Breaking changes** - - - Reverted client name back to LogAnalyticsManagementClient as previous change was not intentional - -## 0.4.0 (2020-04-20) - -**Features** - - - Model LinkedService has a new parameter provisioning_state - - Added operation WorkspacesOperations.available_service_tiers - - Added operation group ManagementGroupsOperations - - Added operation group GatewaysOperations - - Added operation group OperationStatusesOperations - - Added operation group SchemaOperations - - Added operation group WorkspacePurgeOperations - - Added operation group UsagesOperations - - Added operation group SharedKeysOperations - - Added operation group StorageInsightConfigsOperations - - Added operation group IntelligencePacksOperations - -**Breaking changes** - - - Removed operation WorkspacesOperations.list_usages - - Removed operation WorkspacesOperations.get_shared_keys - - Removed operation WorkspacesOperations.disable_intelligence_pack - - Removed operation WorkspacesOperations.list_intelligence_packs - - Removed operation WorkspacesOperations.list_management_groups - - Removed operation WorkspacesOperations.enable_intelligence_pack - - Removed operation group StorageInsightsOperations - - Removed operation group OperationalInsightsManagementClientOperationsMixin - ## 0.3.0 (2020-04-08) **Features** diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py index 3fe34932d797..28fa03f15cf7 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py @@ -9,9 +9,9 @@ # regenerated. # -------------------------------------------------------------------------- -from ._configuration import LogAnalyticsManagementClientConfiguration -from ._log_analytics_management_client import LogAnalyticsManagementClient -__all__ = ['LogAnalyticsManagementClient', 'LogAnalyticsManagementClientConfiguration'] +from ._configuration import OperationalInsightsManagementClientConfiguration +from ._operational_insights_management_client import OperationalInsightsManagementClient +__all__ = ['OperationalInsightsManagementClient', 'OperationalInsightsManagementClientConfiguration'] from .version import VERSION diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py index 95ddffd673a7..894d9329a60a 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py @@ -13,8 +13,8 @@ from .version import VERSION -class LogAnalyticsManagementClientConfiguration(AzureConfiguration): - """Configuration for LogAnalyticsManagementClient +class OperationalInsightsManagementClientConfiguration(AzureConfiguration): + """Configuration for OperationalInsightsManagementClient Note that all parameters used to create this instance are saved as instance attributes. @@ -36,7 +36,7 @@ def __init__( if not base_url: base_url = 'https://management.azure.com' - super(LogAnalyticsManagementClientConfiguration, self).__init__(base_url) + super(OperationalInsightsManagementClientConfiguration, self).__init__(base_url) # Starting Autorest.Python 4.0.64, make connection pool activated by default self.keep_alive = True diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py similarity index 93% rename from sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py rename to sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py index 362afbc9ad03..5a0407ade5c4 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py @@ -12,7 +12,7 @@ from msrest.service_client import SDKClient from msrest import Serializer, Deserializer -from ._configuration import LogAnalyticsManagementClientConfiguration +from ._configuration import OperationalInsightsManagementClientConfiguration from .operations import DataExportsOperations from .operations import DataSourcesOperations from .operations import IntelligencePacksOperations @@ -33,11 +33,11 @@ from . import models -class LogAnalyticsManagementClient(SDKClient): - """The Log Analytics Client. +class OperationalInsightsManagementClient(SDKClient): + """Operational Insights Client :ivar config: Configuration for client. - :vartype config: LogAnalyticsManagementClientConfiguration + :vartype config: OperationalInsightsManagementClientConfiguration :ivar data_exports: DataExports operations :vartype data_exports: azure.mgmt.loganalytics.operations.DataExportsOperations @@ -85,8 +85,8 @@ class LogAnalyticsManagementClient(SDKClient): def __init__( self, credentials, subscription_id, base_url=None): - self.config = LogAnalyticsManagementClientConfiguration(credentials, subscription_id, base_url) - super(LogAnalyticsManagementClient, self).__init__(self.config.credentials, self.config) + self.config = OperationalInsightsManagementClientConfiguration(credentials, subscription_id, base_url) + super(OperationalInsightsManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2020-03-01-preview' diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py index 9770f8b73072..a25cdc5c9908 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py @@ -115,7 +115,7 @@ from ._paged_models import StorageInsightPaged from ._paged_models import UsageMetricPaged from ._paged_models import WorkspacePaged -from ._log_analytics_management_client_enums import ( +from ._operational_insights_management_client_enums import ( Type, DataSourceKind, LinkedServiceEntityStatus, diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_log_analytics_management_client_enums.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_operational_insights_management_client_enums.py similarity index 100% rename from sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_log_analytics_management_client_enums.py rename to sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_operational_insights_management_client_enums.py diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py index 266f5a486d79..3e682bbd5fb1 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.5.0" +VERSION = "0.3.0" diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt deleted file mode 100644 index 0b288b2e1260..000000000000 --- a/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ --e ../../../tools/azure-sdk-tools - From daaf39075c4b2dbd35d4ae2f4648559e465db1f9 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 12 May 2020 07:48:30 +0000 Subject: [PATCH 2/2] Generated from a3c766b28738a41d718ef285726bda0404459690 Fix --- .../azure-mgmt-loganalytics/CHANGELOG.md | 33 +++++++++++++++++++ .../azure/mgmt/loganalytics/__init__.py | 6 ++-- .../azure/mgmt/loganalytics/_configuration.py | 6 ++-- ...py => _log_analytics_management_client.py} | 12 +++---- .../mgmt/loganalytics/models/__init__.py | 2 +- ..._log_analytics_management_client_enums.py} | 0 .../operations/_workspaces_operations.py | 16 +++++++-- .../azure/mgmt/loganalytics/version.py | 2 +- .../dev_requirements.txt | 2 ++ .../azure-mgmt-loganalytics/setup.py | 4 ++- 10 files changed, 65 insertions(+), 18 deletions(-) rename sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/{_operational_insights_management_client.py => _log_analytics_management_client.py} (93%) rename sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/{_operational_insights_management_client_enums.py => _log_analytics_management_client_enums.py} (100%) create mode 100644 sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md b/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md index 8f3939b95eab..fd2e5cf5e7ca 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md +++ b/sdk/loganalytics/azure-mgmt-loganalytics/CHANGELOG.md @@ -1,5 +1,38 @@ # Release History +## 0.5.0 (2020-04-22) + +**Breaking changes** + + - Reverted client name back to LogAnalyticsManagementClient as previous change was not intentional + +## 0.4.0 (2020-04-20) + +**Features** + + - Model LinkedService has a new parameter provisioning_state + - Added operation WorkspacesOperations.available_service_tiers + - Added operation group ManagementGroupsOperations + - Added operation group GatewaysOperations + - Added operation group OperationStatusesOperations + - Added operation group SchemaOperations + - Added operation group WorkspacePurgeOperations + - Added operation group UsagesOperations + - Added operation group SharedKeysOperations + - Added operation group StorageInsightConfigsOperations + - Added operation group IntelligencePacksOperations + +**Breaking changes** + + - Removed operation WorkspacesOperations.list_usages + - Removed operation WorkspacesOperations.get_shared_keys + - Removed operation WorkspacesOperations.disable_intelligence_pack + - Removed operation WorkspacesOperations.list_intelligence_packs + - Removed operation WorkspacesOperations.list_management_groups + - Removed operation WorkspacesOperations.enable_intelligence_pack + - Removed operation group StorageInsightsOperations + - Removed operation group OperationalInsightsManagementClientOperationsMixin + ## 0.3.0 (2020-04-08) **Features** diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py index 28fa03f15cf7..3fe34932d797 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/__init__.py @@ -9,9 +9,9 @@ # regenerated. # -------------------------------------------------------------------------- -from ._configuration import OperationalInsightsManagementClientConfiguration -from ._operational_insights_management_client import OperationalInsightsManagementClient -__all__ = ['OperationalInsightsManagementClient', 'OperationalInsightsManagementClientConfiguration'] +from ._configuration import LogAnalyticsManagementClientConfiguration +from ._log_analytics_management_client import LogAnalyticsManagementClient +__all__ = ['LogAnalyticsManagementClient', 'LogAnalyticsManagementClientConfiguration'] from .version import VERSION diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py index 894d9329a60a..95ddffd673a7 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_configuration.py @@ -13,8 +13,8 @@ from .version import VERSION -class OperationalInsightsManagementClientConfiguration(AzureConfiguration): - """Configuration for OperationalInsightsManagementClient +class LogAnalyticsManagementClientConfiguration(AzureConfiguration): + """Configuration for LogAnalyticsManagementClient Note that all parameters used to create this instance are saved as instance attributes. @@ -36,7 +36,7 @@ def __init__( if not base_url: base_url = 'https://management.azure.com' - super(OperationalInsightsManagementClientConfiguration, self).__init__(base_url) + super(LogAnalyticsManagementClientConfiguration, self).__init__(base_url) # Starting Autorest.Python 4.0.64, make connection pool activated by default self.keep_alive = True diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py similarity index 93% rename from sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py rename to sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py index 5a0407ade5c4..362afbc9ad03 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_operational_insights_management_client.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/_log_analytics_management_client.py @@ -12,7 +12,7 @@ from msrest.service_client import SDKClient from msrest import Serializer, Deserializer -from ._configuration import OperationalInsightsManagementClientConfiguration +from ._configuration import LogAnalyticsManagementClientConfiguration from .operations import DataExportsOperations from .operations import DataSourcesOperations from .operations import IntelligencePacksOperations @@ -33,11 +33,11 @@ from . import models -class OperationalInsightsManagementClient(SDKClient): - """Operational Insights Client +class LogAnalyticsManagementClient(SDKClient): + """The Log Analytics Client. :ivar config: Configuration for client. - :vartype config: OperationalInsightsManagementClientConfiguration + :vartype config: LogAnalyticsManagementClientConfiguration :ivar data_exports: DataExports operations :vartype data_exports: azure.mgmt.loganalytics.operations.DataExportsOperations @@ -85,8 +85,8 @@ class OperationalInsightsManagementClient(SDKClient): def __init__( self, credentials, subscription_id, base_url=None): - self.config = OperationalInsightsManagementClientConfiguration(credentials, subscription_id, base_url) - super(OperationalInsightsManagementClient, self).__init__(self.config.credentials, self.config) + self.config = LogAnalyticsManagementClientConfiguration(credentials, subscription_id, base_url) + super(LogAnalyticsManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2020-03-01-preview' diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py index a25cdc5c9908..9770f8b73072 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/__init__.py @@ -115,7 +115,7 @@ from ._paged_models import StorageInsightPaged from ._paged_models import UsageMetricPaged from ._paged_models import WorkspacePaged -from ._operational_insights_management_client_enums import ( +from ._log_analytics_management_client_enums import ( Type, DataSourceKind, LinkedServiceEntityStatus, diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_operational_insights_management_client_enums.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_log_analytics_management_client_enums.py similarity index 100% rename from sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_operational_insights_management_client_enums.py rename to sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/models/_log_analytics_management_client_enums.py diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/operations/_workspaces_operations.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/operations/_workspaces_operations.py index 2c850d57d69e..f2633d665bd5 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/operations/_workspaces_operations.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/operations/_workspaces_operations.py @@ -283,7 +283,7 @@ def get_long_running_output(response): def _delete_initial( - self, resource_group_name, workspace_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, workspace_name, force=None, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.delete.metadata['url'] path_format_arguments = { @@ -296,6 +296,8 @@ def _delete_initial( # Construct parameters query_parameters = {} query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str', min_length=1) + if force is not None: + query_parameters['force'] = self._serialize.query("force", force, 'bool') # Construct headers header_parameters = {} @@ -320,14 +322,21 @@ def _delete_initial( return client_raw_response def delete( - self, resource_group_name, workspace_name, custom_headers=None, raw=False, polling=True, **operation_config): - """Deletes a workspace instance. + self, resource_group_name, workspace_name, force=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes a workspace resource. To recover the workspace, create it again + with the same name, in the same subscription, resource group and + location. The name is kept for 14 days and cannot be used for another + workspace. To remove the workspace completely and release the name, use + the force flag. :param resource_group_name: The name of the resource group. The name is case insensitive. :type resource_group_name: str :param workspace_name: The name of the workspace. :type workspace_name: str + :param force: Deletes the workspace without the recovery option. A + workspace that was deleted with this flag cannot be recovered. + :type force: bool :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -342,6 +351,7 @@ def delete( raw_result = self._delete_initial( resource_group_name=resource_group_name, workspace_name=workspace_name, + force=force, custom_headers=custom_headers, raw=True, **operation_config diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py index 3e682bbd5fb1..266f5a486d79 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/azure/mgmt/loganalytics/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.3.0" +VERSION = "0.5.0" diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt new file mode 100644 index 000000000000..0b288b2e1260 --- /dev/null +++ b/sdk/loganalytics/azure-mgmt-loganalytics/dev_requirements.txt @@ -0,0 +1,2 @@ +-e ../../../tools/azure-sdk-tools + diff --git a/sdk/loganalytics/azure-mgmt-loganalytics/setup.py b/sdk/loganalytics/azure-mgmt-loganalytics/setup.py index eea54942f3e7..ce8f42ec38f5 100644 --- a/sdk/loganalytics/azure-mgmt-loganalytics/setup.py +++ b/sdk/loganalytics/azure-mgmt-loganalytics/setup.py @@ -36,7 +36,9 @@ pass # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: +with open(os.path.join(package_folder_path, 'version.py') + if os.path.exists(os.path.join(package_folder_path, 'version.py')) + else os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)