Skip to content

Commit 34a48ad

Browse files
fix: update post-deployment scripts to replace ad-admin with microsoft-entra-admin for consistency
1 parent d3736d2 commit 34a48ad

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

scripts/post_deployment_setup.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Write-Host " Post-Deployment Setup"
2727
Write-Host " Resource Group: $ResourceGroupName"
2828
Write-Host "=============================================="
2929

30-
# Remove rdbms-connect extension if present (it conflicts with built-in ad-admin commands)
30+
# Remove rdbms-connect extension if present (it conflicts with built-in microsoft-entra-admin commands)
3131
az extension remove --name rdbms-connect 2>$null | Out-Null
3232

3333
# Track resources that need public access restored to Disabled
@@ -241,7 +241,7 @@ else {
241241
Write-Host "✓ Current user: $currentUserUpn ($currentUserOid)"
242242

243243
# Ensure current user is a PostgreSQL Entra administrator
244-
$existingAdmins = az postgres flexible-server ad-admin list --resource-group $ResourceGroupName --server-name $serverName --query "[].objectId" -o tsv 2>$null
244+
$existingAdmins = az postgres flexible-server microsoft-entra-admin list --resource-group $ResourceGroupName --server-name $serverName --query "[].objectId" -o tsv 2>$null
245245
$isAdmin = $false
246246
if ($existingAdmins) {
247247
foreach ($adminOid in ($existingAdmins -split "`n")) {
@@ -251,7 +251,7 @@ else {
251251
$addedPgAdmin = $false
252252
if (-not $isAdmin) {
253253
Write-Host "✓ Adding current user as PostgreSQL Entra administrator..."
254-
$adminOutput = az postgres flexible-server ad-admin create `
254+
$adminOutput = az postgres flexible-server microsoft-entra-admin create `
255255
--resource-group $ResourceGroupName `
256256
--server-name $serverName `
257257
--display-name $currentUserUpn `
@@ -290,7 +290,7 @@ else {
290290
# Remove temporary PostgreSQL admin if we added it
291291
if ($addedPgAdmin) {
292292
Write-Host "✓ Removing temporary PostgreSQL Entra admin for current user..."
293-
az postgres flexible-server ad-admin delete `
293+
az postgres flexible-server microsoft-entra-admin delete `
294294
--resource-group $ResourceGroupName `
295295
--server-name $serverName `
296296
--object-id $currentUserOid `

scripts/post_deployment_setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ echo "=============================================="
3030

3131
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -W 2>/dev/null || pwd)"
3232

33-
# Remove rdbms-connect extension if present (it conflicts with built-in ad-admin commands)
33+
# Remove rdbms-connect extension if present (it conflicts with built-in microsoft-entra-admin commands)
3434
az extension remove --name rdbms-connect > /dev/null 2>&1 || true
3535

3636
# Track resources that need public access restored to Disabled
@@ -213,7 +213,7 @@ else
213213
echo "✓ Current user: ${CURRENT_USER_UPN} (${CURRENT_USER_OID})"
214214

215215
# Ensure current user is a PostgreSQL Entra administrator
216-
EXISTING_ADMINS=$(az postgres flexible-server ad-admin list --resource-group "$RESOURCE_GROUP" --server-name "$SERVER_NAME" --query "[].objectId" -o tsv 2>/dev/null || true)
216+
EXISTING_ADMINS=$(az postgres flexible-server microsoft-entra-admin list --resource-group "$RESOURCE_GROUP" --server-name "$SERVER_NAME" --query "[].objectId" -o tsv 2>/dev/null || true)
217217
IS_ADMIN=false
218218
ADDED_PG_ADMIN=false
219219
if [ -n "$EXISTING_ADMINS" ]; then
@@ -226,7 +226,7 @@ else
226226
fi
227227
if [ "$IS_ADMIN" = "false" ]; then
228228
echo "✓ Adding current user as PostgreSQL Entra administrator..."
229-
ADMIN_ERR=$(az postgres flexible-server ad-admin create \
229+
ADMIN_ERR=$(az postgres flexible-server microsoft-entra-admin create \
230230
--resource-group "$RESOURCE_GROUP" \
231231
--server-name "$SERVER_NAME" \
232232
--display-name "$CURRENT_USER_UPN" \
@@ -249,7 +249,7 @@ else
249249
# Remove temporary PostgreSQL admin if we added it
250250
if [ "$ADDED_PG_ADMIN" = "true" ]; then
251251
echo "✓ Removing temporary PostgreSQL Entra admin for current user..."
252-
az postgres flexible-server ad-admin delete \
252+
az postgres flexible-server microsoft-entra-admin delete \
253253
--resource-group "$RESOURCE_GROUP" \
254254
--server-name "$SERVER_NAME" \
255255
--object-id "$CURRENT_USER_OID" \

0 commit comments

Comments
 (0)