Skip to content

Commit f99b5b8

Browse files
committed
login_and_maybe_set_azure_subscription
1 parent 7af6365 commit f99b5b8

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

ccloud/fm-azure-event-hubs-source/fully-managed-azure-event-hubs.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,7 @@ done
2323

2424
bootstrap_ccloud_environment
2525

26-
27-
28-
if [ ! -z "$AZ_USER" ] && [ ! -z "$AZ_PASS" ]
29-
then
30-
log "Logging to Azure using environment variables AZ_USER and AZ_PASS"
31-
set +e
32-
az logout
33-
set -e
34-
az login -u "$AZ_USER" -p "$AZ_PASS" > /dev/null 2>&1
35-
else
36-
log "Logging to Azure using browser"
37-
az login
38-
fi
26+
login_and_maybe_set_azure_subscription
3927

4028
AZURE_NAME=pgfm${USER}feh${GITHUB_RUN_NUMBER}${TAG}
4129
AZURE_NAME=${AZURE_NAME//[-._]/}

ccloud/fm-azure-service-bus-source/fully-managed-azure-service-bus-source.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,7 @@ done
2121

2222
bootstrap_ccloud_environment
2323

24-
25-
26-
27-
if [ ! -z "$AZ_USER" ] && [ ! -z "$AZ_PASS" ]
28-
then
29-
log "Logging to Azure using environment variables AZ_USER and AZ_PASS"
30-
set +e
31-
az logout
32-
set -e
33-
az login -u "$AZ_USER" -p "$AZ_PASS" > /dev/null 2>&1
34-
else
35-
log "Logging to Azure using browser"
36-
az login
37-
fi
24+
login_and_maybe_set_azure_subscription
3825

3926
AZURE_NAME=pgfm${USER}sb${GITHUB_RUN_NUMBER}${TAG}
4027
AZURE_NAME=${AZURE_NAME//[-._]/}

0 commit comments

Comments
 (0)