Skip to content

[SQL] Fix for server create in SQL 0.28 #18640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evelyn-ys merged 1 commit into from
Jun 25, 2021
Merged

[SQL] Fix for server create in SQL 0.28 #18640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/azure-cli/azure/cli/command_modules/sql/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3447,12 +3447,16 @@ def server_create(
if enable_ad_only_auth:
ad_only = True

tenant_id = None
if external_admin_name is not None:
tenant_id = _get_tenant_id()

kwargs['administrators'] = ServerExternalAdministrator(
principal_type=external_admin_principal_type,
login=external_admin_name,
sid=external_admin_sid,
azure_ad_only_authentication=ad_only,
tenant_id=_get_tenant_id())
tenant_id=tenant_id)

# Create
return sdk_no_wait(no_wait, client.create_or_update,
Expand Down Expand Up @@ -3989,12 +3993,16 @@ def managed_instance_create(
if enable_ad_only_auth:
ad_only = True

tenant_id = None
if external_admin_name is not None:
tenant_id = _get_tenant_id()

kwargs['administrators'] = ManagedInstanceExternalAdministrator(
principal_type=external_admin_principal_type,
login=external_admin_name,
sid=external_admin_sid,
azure_ad_only_authentication=ad_only,
tenant_id=_get_tenant_id())
tenant_id=tenant_id)

# Create
return client.create_or_update(
Expand Down