diff --git a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py index 7ab979c21f9..17e7d0dc047 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py +++ b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py @@ -2,8 +2,6 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- - -import datetime import json from azure.cli.core.azclierror import ( @@ -479,100 +477,6 @@ def ensure_container_insights_for_monitoring( else: raise error - else: - # legacy auth with LA workspace solution - unix_time_in_millis = int( - ( - datetime.datetime.utcnow() - - datetime.datetime.utcfromtimestamp(0) - ).total_seconds() * 1000.0 - ) - - solution_deployment_name = "ContainerInsights-{}".format( - unix_time_in_millis - ) - - # pylint: disable=line-too-long - template = { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "workspaceResourceId": { - "type": "string", - "metadata": { - "description": "Azure Monitor Log Analytics Resource ID" - }, - }, - "workspaceRegion": { - "type": "string", - "metadata": { - "description": "Azure Monitor Log Analytics workspace region" - }, - }, - "solutionDeploymentName": { - "type": "string", - "metadata": { - "description": "Name of the solution deployment" - }, - }, - }, - "resources": [ - { - "type": "Microsoft.Resources/deployments", - "name": "[parameters('solutionDeploymentName')]", - "apiVersion": "2017-05-10", - "subscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", - "resourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": {}, - "variables": {}, - "resources": [ - { - "apiVersion": "2015-11-01-preview", - "type": "Microsoft.OperationsManagement/solutions", - "location": "[parameters('workspaceRegion')]", - "name": "[Concat('ContainerInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]", - "properties": { - "workspaceResourceId": "[parameters('workspaceResourceId')]" - }, - "plan": { - "name": "[Concat('ContainerInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]", - "product": "[Concat('OMSGallery/', 'ContainerInsights')]", - "promotionCode": "", - "publisher": "Microsoft", - }, - } - ], - }, - "parameters": {}, - }, - } - ], - } - - params = { - "workspaceResourceId": {"value": workspace_resource_id}, - "workspaceRegion": {"value": location}, - "solutionDeploymentName": {"value": solution_deployment_name}, - } - - deployment_name = "aks-monitoring-{}".format(unix_time_in_millis) - # publish the Container Insights solution to the Log Analytics workspace - return _invoke_deployment( - cmd, - resource_group, - deployment_name, - template, - params, - validate=False, - no_wait=False, - subscription_id=subscription_id, - ) - def _invoke_deployment( cmd, diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_custom.py b/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_custom.py index 73e114e9a68..250d69a10fc 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_custom.py @@ -625,7 +625,7 @@ def test_update_addons(self, rg_def, cf_resource_groups, cf_resources): # http_application_routing enabled instance = mock.MagicMock() instance.addon_profiles = None - + instance = _update_addons(MockCmd(self.cli), instance, '00000000-0000-0000-0000-000000000000', 'clitest000001', 'clitest000001', 'http_application_routing', enable=True) self.assertIn(CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME, instance.addon_profiles) @@ -766,33 +766,6 @@ def test_update_addons(self, rg_def, cf_resource_groups, cf_resources): addon_profile = instance.addon_profiles['ingressApplicationGateway'] self.assertFalse(addon_profile.enabled) - @mock.patch('azure.cli.command_modules.acs.addonconfiguration.cf_resources', autospec=True) - @mock.patch('azure.cli.command_modules.acs.addonconfiguration._invoke_deployment') - def test_ensure_container_insights_for_monitoring(self, invoke_def, cf_resources): - cmd = mock.Mock() - addon = mock.Mock() - wsID = "/subscriptions/1234abcd-cad5-417b-1234-aec62ffa6fe7/resourcegroups/mbdev/providers/microsoft.operationalinsights/workspaces/mbdev" - subscription_id = "test_subscription_id" - rg_name = "test_rg_name" - cluster_name = "test_cluster_name" - location = "test_location" - addon.config = { - CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID: wsID - } - self.assertTrue(ensure_container_insights_for_monitoring(cmd, addon, subscription_id, rg_name, cluster_name, location)) - args, kwargs = invoke_def.call_args - self.assertEqual(args[3]['resources'][0]['type'], "Microsoft.Resources/deployments") - self.assertEqual(args[4]['workspaceResourceId']['value'], wsID) - - # when addon config key is lower cased - addon.config = { - CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID: wsID - } - self.assertTrue(ensure_container_insights_for_monitoring(cmd, addon, subscription_id, rg_name, cluster_name, location)) - args, kwargs = invoke_def.call_args - self.assertEqual(args[3]['resources'][0]['type'], "Microsoft.Resources/deployments") - self.assertEqual(args[4]['workspaceResourceId']['value'], wsID) - @mock.patch('azure.cli.command_modules.acs.custom._urlretrieve') @mock.patch('azure.cli.command_modules.acs.custom.logger') def test_k8s_install_kubectl_emit_warnings(self, logger_mock, mock_url_retrieve): diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py index 1dafb2d9a2f..1f33eb32a25 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py @@ -625,7 +625,7 @@ def test_update_addons(self, rg_def, cf_resource_groups, cf_resources): # http_application_routing enabled instance = mock.MagicMock() instance.addon_profiles = None - + instance = _update_addons(MockCmd(self.cli), instance, '00000000-0000-0000-0000-000000000000', 'clitest000001', 'clitest000001', 'http_application_routing', enable=True) self.assertIn(CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME, instance.addon_profiles) @@ -766,33 +766,6 @@ def test_update_addons(self, rg_def, cf_resource_groups, cf_resources): addon_profile = instance.addon_profiles['ingressApplicationGateway'] self.assertFalse(addon_profile.enabled) - @mock.patch('azure.cli.command_modules.acs.addonconfiguration.cf_resources', autospec=True) - @mock.patch('azure.cli.command_modules.acs.addonconfiguration._invoke_deployment') - def test_ensure_container_insights_for_monitoring(self, invoke_def, cf_resources): - cmd = mock.Mock() - addon = mock.Mock() - wsID = "/subscriptions/1234abcd-cad5-417b-1234-aec62ffa6fe7/resourcegroups/mbdev/providers/microsoft.operationalinsights/workspaces/mbdev" - subscription_id = "test_subscription_id" - rg_name = "test_rg_name" - cluster_name = "test_cluster_name" - location = "test_location" - addon.config = { - CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID: wsID - } - self.assertTrue(ensure_container_insights_for_monitoring(cmd, addon, subscription_id, rg_name, cluster_name, location)) - args, kwargs = invoke_def.call_args - self.assertEqual(args[3]['resources'][0]['type'], "Microsoft.Resources/deployments") - self.assertEqual(args[4]['workspaceResourceId']['value'], wsID) - - # when addon config key is lower cased - addon.config = { - CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID: wsID - } - self.assertTrue(ensure_container_insights_for_monitoring(cmd, addon, subscription_id, rg_name, cluster_name, location)) - args, kwargs = invoke_def.call_args - self.assertEqual(args[3]['resources'][0]['type'], "Microsoft.Resources/deployments") - self.assertEqual(args[4]['workspaceResourceId']['value'], wsID) - @mock.patch('azure.cli.command_modules.acs.custom._urlretrieve') @mock.patch('azure.cli.command_modules.acs.custom.logger') def test_k8s_install_kubectl_emit_warnings(self, logger_mock, mock_url_retrieve):