Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2acf1fd

Browse files
Merge pull request #58 from Azure-Samples/azdenvgetval
Port to azd env get value
2 parents bba4c88 + b2fa1a7 commit 2acf1fd

File tree

8 files changed

+52
-26
lines changed

8 files changed

+52
-26
lines changed

‎azure.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
name: rag-postgres-openai-python
33
metadata:
44
template: rag-postgres-openai-python@0.0.1
5+
requiredVersions:
6+
azd: ">= 1.9.5"
57
services:
68
web:
79
project: ./src/backend

‎scripts/setup_postgres_azurerole.ps1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
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+
if (-not $?) {
3+
Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
}
6+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
7+
$APP_IDENTITY_NAME = (azd env get-value SERVICE_WEB_IDENTITY_NAME)
48

59
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($APP_IDENTITY_NAME)) {
610
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and SERVICE_WEB_IDENTITY_NAME environment variables. Make sure you run azd up first."
711
exit 1
812
}
913

10-
python ./src/backend/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
14+
python ./src/backend/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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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+
if [ $? -ne 0 ]; then
3+
echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
fi
6+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
7+
APP_IDENTITY_NAME=$(azd env get-value SERVICE_WEB_IDENTITY_NAME)
48

59
if [ -z "$POSTGRES_HOST" ] || [ -z "$POSTGRES_USERNAME" ] || [ -z "$APP_IDENTITY_NAME" ]; then
610
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: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
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+
if (-not $?) {
3+
Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
}
6+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
7+
$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
48

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."
9+
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
10+
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
711
exit 1
812
}
913

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

‎scripts/setup_postgres_database.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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+
if [ $? -ne 0 ]; then
3+
echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
fi
6+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
7+
POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
48

59
. ./scripts/load_python_env.sh
610

‎scripts/setup_postgres_seeddata.ps1

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
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+
if (-not $?) {
3+
Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
}
6+
$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
7+
$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
48

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."
9+
if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
10+
Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
711
exit 1
812
}
913

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

‎scripts/setup_postgres_seeddata.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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+
if [ $? -ne 0 ]; then
3+
echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
4+
exit 1
5+
fi
6+
POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
7+
POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
48

59
. ./scripts/load_python_env.sh
610

‎src/backend/fastapi_app/postgres_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def get_password_from_azure_credential():
3030

3131
engine = create_async_engine(
3232
DATABASE_URI,
33-
echo=True,
33+
echo=False,
3434
)
3535

3636
@event.listens_for(engine.sync_engine, "do_connect")

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /