From d1caaa0906ee44c580782456851569c53f756f91 Mon Sep 17 00:00:00 2001 From: Zunli Hu Date: Mon, 10 Feb 2020 13:43:38 +0800 Subject: [PATCH 1/2] add eventhub to 2019-03-01 --- src/azure-cli-core/azure/cli/core/profiles/_shared.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py index 244fe1ba8a8..061c90be985 100644 --- a/src/azure-cli-core/azure/cli/core/profiles/_shared.py +++ b/src/azure-cli-core/azure/cli/core/profiles/_shared.py @@ -203,7 +203,8 @@ def default_api_version(self): # Full MultiAPI support is not done in AppService, the line below is merely # to have commands show up in the hybrid profile which happens to have the latest # API versions - ResourceType.MGMT_APPSERVICE: '2018-02-01' + ResourceType.MGMT_APPSERVICE: '2018-02-01', + ResourceType.MGMT_EVENTHUB: '2017-04-01' }, '2018-03-01-hybrid': { ResourceType.MGMT_STORAGE: '2016-01-01', From 517f851d6d718b2631ab60a582bbfe4aefd41f5b Mon Sep 17 00:00:00 2001 From: Zunli Hu Date: Mon, 10 Feb 2020 14:05:06 +0800 Subject: [PATCH 2/2] upgrade package version and change client_factory --- .../azure/cli/command_modules/eventhubs/_client_factory.py | 4 ++-- src/azure-cli/requirements.py2.Darwin.txt | 2 +- src/azure-cli/requirements.py2.Linux.txt | 2 +- src/azure-cli/requirements.py2.windows.txt | 2 +- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- src/azure-cli/setup.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/_client_factory.py b/src/azure-cli/azure/cli/command_modules/eventhubs/_client_factory.py index 2f544bc1eb3..e095d84ca2e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/_client_factory.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/_client_factory.py @@ -6,8 +6,8 @@ def cf_eventhub(cli_ctx, **_): from azure.cli.core.commands.client_factory import get_mgmt_service_client - from azure.mgmt.eventhub import EventHubManagementClient - return get_mgmt_service_client(cli_ctx, EventHubManagementClient) + from azure.cli.core.profiles import ResourceType + return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_EVENTHUB) def namespaces_mgmt_client_factory(cli_ctx, _): diff --git a/src/azure-cli/requirements.py2.Darwin.txt b/src/azure-cli/requirements.py2.Darwin.txt index fc5ceff5b2f..dd86de8092b 100644 --- a/src/azure-cli/requirements.py2.Darwin.txt +++ b/src/azure-cli/requirements.py2.Darwin.txt @@ -41,7 +41,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/requirements.py2.Linux.txt b/src/azure-cli/requirements.py2.Linux.txt index fc5ceff5b2f..dd86de8092b 100644 --- a/src/azure-cli/requirements.py2.Linux.txt +++ b/src/azure-cli/requirements.py2.Linux.txt @@ -41,7 +41,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/requirements.py2.windows.txt b/src/azure-cli/requirements.py2.windows.txt index 85533370fc5..ef64703d946 100644 --- a/src/azure-cli/requirements.py2.windows.txt +++ b/src/azure-cli/requirements.py2.windows.txt @@ -40,7 +40,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index b0d377fb8ca..5199edc29dc 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -41,7 +41,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index b0d377fb8ca..5199edc29dc 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -41,7 +41,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index de86a269482..85173f5484f 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -40,7 +40,7 @@ azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==2.2.0 azure-mgmt-dns==2.1.0 azure-mgmt-eventgrid==2.2.0 -azure-mgmt-eventhub==2.6.0 +azure-mgmt-eventhub==3.0.0 azure-mgmt-hdinsight==1.3.0 azure-mgmt-imagebuilder==0.2.1 azure-mgmt-iotcentral==2.0.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 9a9c183b52a..64c6a4efd89 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -87,7 +87,7 @@ 'azure-mgmt-devtestlabs~=2.2', 'azure-mgmt-dns~=2.1', 'azure-mgmt-eventgrid~=2.2', - 'azure-mgmt-eventhub~=2.6', + 'azure-mgmt-eventhub~=3.0.0', 'azure-mgmt-hdinsight~=1.3.0', 'azure-mgmt-imagebuilder~=0.2.1', 'azure-mgmt-iotcentral~=2.0.0',