Skip to content

Commit 7281d2b

Browse files
pamelafoxpamelafox
committed
Port to azd env get value
1 parent b05f38a commit 7281d2b

6 files changed

+25
-25
lines changed

‎scripts/setup_postgres_azurerole.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
2-
$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
3-
$APP_IDENTITY_NAME = ((azd env get-values | Select-String -Pattern "SERVICE_WEB_IDENTITY_NAME") -replace '^SERVICE_WEB_IDENTITY_NAME=', '')
1+
$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
2+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
3+
$APP_IDENTITY_NAME = (azd env get-value SERVICE_WEB_IDENTITY_NAME)
44

55
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($APP_IDENTITY_NAME)) {
66
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and SERVICE_WEB_IDENTITY_NAME environment variables. Make sure you run azd up first."
77
exit 1
88
}
99

10-
python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
10+
python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME

‎scripts/setup_postgres_azurerole.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
2-
POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
3-
APP_IDENTITY_NAME=$(azd env get-values | grep SERVICE_WEB_IDENTITY_NAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^SERVICE_WEB_IDENTITY_NAME=//')
1+
POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
2+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
3+
APP_IDENTITY_NAME=$(azd env get-value SERVICE_WEB_IDENTITY_NAME)
44

55
if [ -z "$POSTGRES_HOST" ] || [ -z "$POSTGRES_USERNAME" ] || [ -z "$APP_IDENTITY_NAME" ]; then
66
echo "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and SERVICE_WEB_IDENTITY_NAME environment variables. Make sure you run azd up first."

‎scripts/setup_postgres_database.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
2-
$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
3-
$POSTGRES_PASSWORD = ((azd env get-values | Select-String -Pattern "POSTGRES_PASSWORD") -replace '^POSTGRES_PASSWORD=', '')
1+
$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
2+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
3+
$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
44

5-
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_PASSWORD)) {
6-
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_PASSWORD environment variables. Make sure you run azd up first."
5+
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
6+
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
77
exit 1
88
}
99

10-
python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
10+
python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE

‎scripts/setup_postgres_database.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
2-
POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
3-
POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//')
1+
POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
2+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
3+
POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
44

55
. ./scripts/load_python_env.sh
66

‎scripts/setup_postgres_seeddata.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
2-
$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
3-
$POSTGRES_PASSWORD = ((azd env get-values | Select-String -Pattern "POSTGRES_PASSWORD") -replace '^POSTGRES_PASSWORD=', '')
1+
$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
2+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
3+
$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
44

5-
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_PASSWORD)) {
6-
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_PASSWORD environment variables. Make sure you run azd up first."
5+
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
6+
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
77
exit 1
88
}
99

10-
python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
10+
python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE

‎scripts/setup_postgres_seeddata.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
2-
POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
3-
POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//')
1+
POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
2+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
3+
POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
44

55
. ./scripts/load_python_env.sh
66

0 commit comments

Comments
 (0)