Fix default UUID setting, run black

Azure · Oct 2, 2020 · 0f3ad38 · 0f3ad38
1 parent dc75603
commit 0f3ad38
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/...ult/azure-keyvault-administration/azure/keyvault/administration/_access_control_client.py b/...ult/azure-keyvault-administration/azure/keyvault/administration/_access_control_client.py
@@ -28,7 +28,9 @@ class KeyVaultAccessControlClient(KeyVaultClientBase):
     # pylint:disable=protected-access
 
     @distributed_trace
-    def create_role_assignment(self, role_scope, role_definition_id, principal_id, **kwargs):
+    def create_role_assignment(
+        self, role_scope, role_definition_id, principal_id, **kwargs
+    ):
         # type: (Union[str, KeyVaultRoleScope], str, str, **Any) -> KeyVaultRoleAssignment
         """Create a role assignment.
 
@@ -50,7 +52,7 @@ def create_role_assignment(self, role_scope, role_definition_id, principal_id, *
         assignment = self._client.role_assignments.create(
             vault_base_url=self._vault_url,
             scope=role_scope,
-            role_assignment_name=kwargs.pop("role_assignment_name", uuid4()),
+            role_assignment_name=kwargs.pop("role_assignment_name", None) or uuid4(),
             parameters=create_parameters,
             **kwargs
         )
@@ -70,7 +72,10 @@ def delete_role_assignment(self, role_scope, role_assignment_name, **kwargs):
         :rtype: KeyVaultRoleAssignment
         """
         assignment = self._client.role_assignments.delete(
-            vault_base_url=self._vault_url, scope=role_scope, role_assignment_name=str(role_assignment_name), **kwargs
+            vault_base_url=self._vault_url,
+            scope=role_scope,
+            role_assignment_name=str(role_assignment_name),
+            **kwargs
         )
         return KeyVaultRoleAssignment._from_generated(assignment)
 
@@ -87,7 +92,10 @@ def get_role_assignment(self, role_scope, role_assignment_name, **kwargs):
         :rtype: KeyVaultRoleAssignment
         """
         assignment = self._client.role_assignments.get(
-            vault_base_url=self._vault_url, scope=role_scope, role_assignment_name=str(role_assignment_name), **kwargs
+            vault_base_url=self._vault_url,
+            scope=role_scope,
+            role_assignment_name=str(role_assignment_name),
+            **kwargs
         )
         return KeyVaultRoleAssignment._from_generated(assignment)
 
@@ -104,7 +112,9 @@ def list_role_assignments(self, role_scope, **kwargs):
         return self._client.role_assignments.list_for_scope(
             self._vault_url,
             role_scope,
-            cls=lambda result: [KeyVaultRoleAssignment._from_generated(a) for a in result],
+            cls=lambda result: [
+                KeyVaultRoleAssignment._from_generated(a) for a in result
+            ],
             **kwargs
         )
 
@@ -121,6 +131,8 @@ def list_role_definitions(self, role_scope, **kwargs):
         return self._client.role_definitions.list(
             self._vault_url,
             role_scope,
-            cls=lambda result: [KeyVaultRoleDefinition._from_generated(d) for d in result],
+            cls=lambda result: [
+                KeyVaultRoleDefinition._from_generated(d) for d in result
+            ],
             **kwargs
         )
diff --git a/...azure-keyvault-administration/azure/keyvault/administration/aio/_access_control_client.py b/...azure-keyvault-administration/azure/keyvault/administration/aio/_access_control_client.py
@@ -56,15 +56,18 @@ async def create_role_assignment(
         assignment = await self._client.role_assignments.create(
             vault_base_url=self._vault_url,
             scope=role_scope,
-            role_assignment_name=kwargs.pop("role_assignment_name", uuid4),
+            role_assignment_name=kwargs.pop("role_assignment_name", None) or uuid4(),
             parameters=create_parameters,
             **kwargs
         )
         return KeyVaultRoleAssignment._from_generated(assignment)
 
     @distributed_trace_async
     async def delete_role_assignment(
-        self, role_scope: "Union[str, KeyVaultRoleScope]", role_assignment_name: "Union[str, UUID]", **kwargs: "Any"
+        self,
+        role_scope: "Union[str, KeyVaultRoleScope]",
+        role_assignment_name: "Union[str, UUID]",
+        **kwargs: "Any"
     ) -> KeyVaultRoleAssignment:
         """Delete a role assignment.
 
@@ -77,13 +80,19 @@ async def delete_role_assignment(
         :rtype: KeyVaultRoleAssignment
         """
         assignment = await self._client.role_assignments.delete(
-            vault_base_url=self._vault_url, scope=role_scope, role_assignment_name=str(role_assignment_name), **kwargs
+            vault_base_url=self._vault_url,
+            scope=role_scope,
+            role_assignment_name=str(role_assignment_name),
+            **kwargs
         )
         return KeyVaultRoleAssignment._from_generated(assignment)
 
     @distributed_trace_async
     async def get_role_assignment(
-        self, role_scope: "Union[str, KeyVaultRoleScope]", role_assignment_name: "Union[str, UUID]", **kwargs: "Any"
+        self,
+        role_scope: "Union[str, KeyVaultRoleScope]",
+        role_assignment_name: "Union[str, UUID]",
+        **kwargs: "Any"
     ) -> KeyVaultRoleAssignment:
         """Get a role assignment.
 
@@ -95,7 +104,10 @@ async def get_role_assignment(
         :rtype: KeyVaultRoleAssignment
         """
         assignment = await self._client.role_assignments.get(
-            vault_base_url=self._vault_url, scope=role_scope, role_assignment_name=str(role_assignment_name), **kwargs
+            vault_base_url=self._vault_url,
+            scope=role_scope,
+            role_assignment_name=str(role_assignment_name),
+            **kwargs
         )
         return KeyVaultRoleAssignment._from_generated(assignment)
 
@@ -113,7 +125,9 @@ def list_role_assignments(
         return self._client.role_assignments.list_for_scope(
             self._vault_url,
             role_scope,
-            cls=lambda result: [KeyVaultRoleAssignment._from_generated(a) for a in result],
+            cls=lambda result: [
+                KeyVaultRoleAssignment._from_generated(a) for a in result
+            ],
             **kwargs
         )
 
@@ -131,6 +145,8 @@ def list_role_definitions(
         return self._client.role_definitions.list(
             self._vault_url,
             role_scope,
-            cls=lambda result: [KeyVaultRoleDefinition._from_generated(d) for d in result],
+            cls=lambda result: [
+                KeyVaultRoleDefinition._from_generated(d) for d in result
+            ],
             **kwargs
         )