Skip to content

Commit 14a839d

Browse files
committed
fix
1 parent 2a41b55 commit 14a839d

2 files changed

Lines changed: 31 additions & 8 deletions

File tree

src/aks-preview/azext_aks_preview/_roleassignments.py

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
55

6-
from azure.cli.command_modules.acs._roleassignments import add_role_assignment
6+
from azure.cli.command_modules.acs._roleassignments import (
7+
add_role_assignment,
8+
add_role_assignment_executor,
9+
)
710

811

912
def add_role_assignment(
@@ -19,8 +22,28 @@ def add_role_assignment(
1922
cmd,
2023
role,
2124
service_principal_msi_id,
22-
is_service_principal,
23-
delay,
24-
scope,
25-
assignee_principal_type,
25+
is_service_principal=is_service_principal,
26+
delay=delay,
27+
scope=scope,
28+
assignee_principal_type=assignee_principal_type,
29+
)
30+
31+
32+
def add_role_assignment_executor(
33+
cmd,
34+
role,
35+
assignee,
36+
resource_group_name=None,
37+
scope=None,
38+
resolve_assignee=True,
39+
assignee_principal_type=None,
40+
):
41+
return add_role_assignment_executor(
42+
cmd,
43+
role,
44+
assignee,
45+
resource_group_name=resource_group_name,
46+
scope=scope,
47+
resolve_assignee=resolve_assignee,
48+
assignee_principal_type=assignee_principal_type,
2649
)

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
)
7474
from azext_aks_preview._roleassignments import (
7575
add_role_assignment,
76-
_add_role_assignment_executor_new
76+
add_role_assignment_executor
7777
)
7878
from azext_aks_preview.agentpool_decorator import (
7979
AKSPreviewAgentPoolAddDecorator,
@@ -212,7 +212,7 @@ def external_functions(self) -> SimpleNamespace:
212212
] = ensure_azure_monitor_profile_prerequisites
213213
# temp workaround for the breaking change caused by default API version bump of the auth SDK
214214
external_functions["add_role_assignment"] = add_role_assignment
215-
external_functions["_add_role_assignment_executor_new"] = _add_role_assignment_executor_new
215+
external_functions["add_role_assignment_executor"] = add_role_assignment_executor
216216
# azure container storage functions
217217
external_functions[
218218
"perform_enable_azure_container_storage_v1"
@@ -4227,7 +4227,7 @@ def postprocessing_after_mc_created(self, cluster: ManagedCluster) -> None:
42274227
except Exception as e: # pylint: disable=broad-except
42284228
logger.warning("Could not get signed in user: %s", str(e))
42294229
else:
4230-
self.context.external_functions._add_role_assignment_executor_new( # type: ignore # pylint: disable=protected-access
4230+
self.context.external_functions.add_role_assignment_executor( # type: ignore # pylint: disable=protected-access
42314231
self.cmd,
42324232
"Azure Kubernetes Service RBAC Cluster Admin",
42334233
user["id"],

0 commit comments

Comments
 (0)