{AKS} Upgrade api-version to 2022-06-01 for ACS module (#23291)

Azure · Jul 26, 2022 · 0a219c8 · 0a219c8
1 parent 527595d
commit 0a219c8
Show file tree

Hide file tree

Showing 112 changed files with 39,915 additions and 44,112 deletions.
diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py
@@ -242,7 +242,7 @@ def default_api_version(self):
         ResourceType.MGMT_ARO: '2022-04-01',
         ResourceType.MGMT_DATABOXEDGE: '2021-02-01-preview',
         ResourceType.MGMT_CUSTOMLOCATION: '2021-03-15-preview',
-        ResourceType.MGMT_CONTAINERSERVICE: SDKProfile('2022-04-01', {
+        ResourceType.MGMT_CONTAINERSERVICE: SDKProfile('2022-06-01', {
             'container_services': '2017-07-01',
             'open_shift_managed_clusters': '2019-09-30-preview'
         })

diff --git a/src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py b/src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py
@@ -95,6 +95,7 @@
 Snapshot = TypeVar("Snapshot")
 KubeletConfig = TypeVar("KubeletConfig")
 LinuxOSConfig = TypeVar("LinuxOSConfig")
+ManagedClusterSecurityProfileDefender = TypeVar("ManagedClusterSecurityProfileDefender")
 
 # TODO
 # 1. remove enable_rbac related implementation
@@ -3638,18 +3639,20 @@ def get_no_uptime_sla(self) -> bool:
 
         return self._get_no_uptime_sla(enable_validation=True)
 
-    def get_defender_config(self) -> Union[TypeVar("ManagedClusterSecurityProfileAzureDefender"), None]:
+    def get_defender_config(self) -> Union[ManagedClusterSecurityProfileDefender, None]:
         """Obtain the value of defender.
 
-        :return: string or None
+        :return: ManagedClusterSecurityProfileDefender or None
         """
         disable_defender = self.raw_param.get("disable_defender")
         if disable_defender:
-            return self.models.ManagedClusterSecurityProfileAzureDefender(enabled=False)
+            return self.models.ManagedClusterSecurityProfileDefender(
+                security_monitoring=self.models.ManagedClusterSecurityProfileDefenderSecurityMonitoring(
+                    enabled=False
+                )
+            )
 
-        # read the original value passed by the command
         enable_defender = self.raw_param.get("enable_defender")
-
         if not enable_defender:
             return None
 
@@ -3672,10 +3675,12 @@ def get_defender_config(self) -> Union[TypeVar("ManagedClusterSecurityProfileAzu
                 self.get_subscription_id(),
                 self.get_resource_group_name())
 
-        azure_defender = self.models.ManagedClusterSecurityProfileAzureDefender(enabled=enable_defender)
-        if enable_defender:
-            azure_defender.log_analytics_workspace_resource_id = workspace
-
+        azure_defender = self.models.ManagedClusterSecurityProfileDefender(
+            log_analytics_workspace_resource_id=workspace,
+            security_monitoring=self.models.ManagedClusterSecurityProfileDefenderSecurityMonitoring(
+                enabled=enable_defender
+            ),
+        )
         return azure_defender
 
     def _get_disable_local_accounts(self, enable_validation: bool = False) -> bool:
@@ -3953,7 +3958,7 @@ def set_up_defender(self, mc: ManagedCluster) -> ManagedCluster:
             if mc.security_profile is None:
                 mc.security_profile = self.models.ManagedClusterSecurityProfile()
 
-            mc.security_profile.azure_defender = defender
+            mc.security_profile.defender = defender
 
         return mc
 
@@ -5595,7 +5600,7 @@ def update_defender(self, mc: ManagedCluster) -> ManagedCluster:
             if mc.security_profile is None:
                 mc.security_profile = self.models.ManagedClusterSecurityProfile()
 
-            mc.security_profile.azure_defender = defender
+            mc.security_profile.defender = defender
 
         return mc
 

diff --git a/...command_modules/acs/tests/latest/recordings/test_aks_api_server_authorized_ip_ranges.yaml b/...command_modules/acs/tests/latest/recordings/test_aks_api_server_authorized_ip_ranges.yaml
diff --git a/...li/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml b/...li/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml
diff --git a/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones_msi.yaml b/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones_msi.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_browse.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_browse.yaml
diff --git a/...nd_modules/acs/tests/latest/recordings/test_aks_control_plane_user_assigned_identity.yaml b/...nd_modules/acs/tests/latest/recordings/test_aks_control_plane_user_assigned_identity.yaml
diff --git a/...odules/acs/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad.yaml b/...odules/acs/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad.yaml
diff --git a/...es/acs/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad_msi.yaml b/...es/acs/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad_msi.yaml
diff --git a/...ordings/test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation.yaml b/...ordings/test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation.yaml
diff --git a/...tests/latest/recordings/test_aks_create_and_update_with_managed_nat_gateway_outbound.yaml b/...tests/latest/recordings/test_aks_create_and_update_with_managed_nat_gateway_outbound.yaml
diff --git a/...i/command_modules/acs/tests/latest/recordings/test_aks_create_autoscaler_then_update.yaml b/...i/command_modules/acs/tests/latest/recordings/test_aks_create_autoscaler_then_update.yaml
diff --git a/...e-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml b/...e-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml
diff --git a/...i/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas_msi.yaml b/...i/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas_msi.yaml
diff --git a/...re-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default.yaml b/...re-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default.yaml
diff --git a/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml b/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml
diff --git a/.../cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service_msi.yaml b/.../cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service_msi.yaml
diff --git a/...cs/tests/latest/recordings/test_aks_create_default_service_with_skip_role_assignment.yaml b/...cs/tests/latest/recordings/test_aks_create_default_service_with_skip_role_assignment.yaml
diff --git a/...ests/latest/recordings/test_aks_create_default_service_with_skip_role_assignment_msi.yaml b/...ests/latest/recordings/test_aks_create_default_service_with_skip_role_assignment_msi.yaml
diff --git a/.../acs/tests/latest/recordings/test_aks_create_default_service_with_virtual_node_addon.yaml b/.../acs/tests/latest/recordings/test_aks_create_default_service_with_virtual_node_addon.yaml
diff --git a/...tests/latest/recordings/test_aks_create_default_service_without_skip_role_assignment.yaml b/...tests/latest/recordings/test_aks_create_default_service_without_skip_role_assignment.yaml
diff --git a/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml b/...zure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml
diff --git a/.../cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting_msi.yaml b/.../cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting_msi.yaml
diff --git a/...cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_sp.yaml b/...cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_sp.yaml
diff --git a/...i/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_disable_rbac.yaml b/...i/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_disable_rbac.yaml
diff --git a/...-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_edge_zone.yaml b/...-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_edge_zone.yaml
@@ -34,7 +34,7 @@ interactions:
       - AZURECLI/2.37.0 azsdk-python-azure-mgmt-containerservice/19.1.0 Python/3.9.5
         (Windows-10-10.0.19044-SP0)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-06-01
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\",\n
@@ -904,7 +904,7 @@ interactions:
       - AZURECLI/2.37.0 azsdk-python-azure-mgmt-containerservice/19.1.0 Python/3.9.5
         (Windows-10-10.0.19044-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-06-01
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\",\n
@@ -993,7 +993,7 @@ interactions:
       - AZURECLI/2.37.0 azsdk-python-azure-mgmt-containerservice/19.1.0 Python/3.9.5
         (Windows-10-10.0.19044-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-06-01
   response:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\",\n
@@ -1084,7 +1084,7 @@ interactions:
       - AZURECLI/2.37.0 azsdk-python-azure-mgmt-containerservice/19.1.0 Python/3.9.5
         (Windows-10-10.0.19044-SP0)
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-06-01
   response:
     body:
       string: ''