-
Notifications
You must be signed in to change notification settings - Fork 4
jir-ogc #561
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.
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
jir-ogc #561
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| service: ${SERVICE_NAME} | ||
| runtime: python313 | ||
| entrypoint: gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app | ||
| instance_class: F4 | ||
| service_account: "${CLOUD_SQL_USER}.gserviceaccount.com" | ||
| handlers: | ||
| - url: /.* | ||
| secure: always | ||
| script: auto | ||
| env_variables: | ||
| MODE: "production" | ||
| ENVIRONMENT: "${ENVIRONMENT}" | ||
| DB_DRIVER: "cloudsql" | ||
| CLOUD_SQL_INSTANCE_NAME: "${CLOUD_SQL_INSTANCE_NAME}" | ||
| CLOUD_SQL_DATABASE: "${CLOUD_SQL_DATABASE}" | ||
| CLOUD_SQL_USER: "${CLOUD_SQL_USER}" | ||
| PYGEOAPI_POSTGRES_DB: "${PYGEOAPI_POSTGRES_DB}" | ||
| PYGEOAPI_POSTGRES_USER: "${PYGEOAPI_POSTGRES_USER}" | ||
| PYGEOAPI_POSTGRES_HOST: "${PYGEOAPI_POSTGRES_HOST}" | ||
| PYGEOAPI_POSTGRES_PORT: "${PYGEOAPI_POSTGRES_PORT}" | ||
| PYGEOAPI_POSTGRES_PASSWORD: "${PYGEOAPI_POSTGRES_PASSWORD}" | ||
| PYGEOAPI_SERVER_URL: "${PYGEOAPI_SERVER_URL}" | ||
| CLOUD_SQL_IAM_AUTH: "${CLOUD_SQL_IAM_AUTH}" | ||
| GCS_SERVICE_ACCOUNT_KEY: "${GCS_SERVICE_ACCOUNT_KEY}" | ||
| GCS_BUCKET_NAME: "${GCS_BUCKET_NAME}" | ||
| AUTHENTIK_URL: "${AUTHENTIK_URL}" | ||
| AUTHENTIK_CLIENT_ID: "${AUTHENTIK_CLIENT_ID}" | ||
| AUTHENTIK_AUTHORIZE_URL: "${AUTHENTIK_AUTHORIZE_URL}" | ||
| AUTHENTIK_TOKEN_URL: "${AUTHENTIK_TOKEN_URL}" | ||
| SESSION_SECRET_KEY: "${SESSION_SECRET_KEY}" | ||
| APITALLY_CLIENT_ID: "${APITALLY_CLIENT_ID}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -47,41 +47,37 @@ jobs: | |||||
| run: | | ||||||
| uv run alembic upgrade head | ||||||
|
|
||||||
| - name: Create app.yaml | ||||||
| - name: Ensure envsubst is available | ||||||
| run: | | ||||||
| cat <<EOF > app.yaml | ||||||
| service: ocotillo-api | ||||||
| runtime: python313 | ||||||
| entrypoint: gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app | ||||||
| instance_class: F4 | ||||||
| service_account: "${{ secrets.CLOUD_SQL_USER }}.gserviceaccount.com" | ||||||
| handlers: | ||||||
| - url: /.* | ||||||
| secure: always | ||||||
| script: auto | ||||||
| env_variables: | ||||||
| MODE: "production" | ||||||
| ENVIRONMENT: "production" | ||||||
| DB_DRIVER: "cloudsql" | ||||||
| CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}" | ||||||
| CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||
| CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}" | ||||||
| PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||
| PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}" | ||||||
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | ||||||
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" | ||||||
| PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}" | ||||||
| PYGEOAPI_SERVER_URL: "${{ vars.PYGEOAPI_SERVER_URL }}" | ||||||
| CLOUD_SQL_IAM_AUTH: true | ||||||
| GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}" | ||||||
| GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}" | ||||||
| AUTHENTIK_URL: "${{ vars.AUTHENTIK_URL }}" | ||||||
| AUTHENTIK_CLIENT_ID: "${{ vars.AUTHENTIK_CLIENT_ID }}" | ||||||
| AUTHENTIK_AUTHORIZE_URL: "${{ vars.AUTHENTIK_AUTHORIZE_URL }}" | ||||||
| AUTHENTIK_TOKEN_URL: "${{ vars.AUTHENTIK_TOKEN_URL }}" | ||||||
| SESSION_SECRET_KEY: "${{ secrets.SESSION_SECRET_KEY }}" | ||||||
| APITALLY_CLIENT_ID: "${{ vars.APITALLY_CLIENT_ID }}" | ||||||
| EOF | ||||||
| if ! command -v envsubst >/dev/null 2>&1; then | ||||||
| sudo apt-get update | ||||||
| sudo apt-get install -y gettext-base | ||||||
| fi | ||||||
|
|
||||||
| - name: Render app.yaml | ||||||
| env: | ||||||
| SERVICE_NAME: "ocotillo-api" | ||||||
| ENVIRONMENT: "production" | ||||||
| CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}" | ||||||
| CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||
| CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}" | ||||||
| PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||
| PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}" | ||||||
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | ||||||
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" | ||||||
| PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}" | ||||||
| PYGEOAPI_SERVER_URL: "${{ vars.PYGEOAPI_SERVER_URL }}" | ||||||
| CLOUD_SQL_IAM_AUTH: "true" | ||||||
|
||||||
| CLOUD_SQL_IAM_AUTH: "true" | |
| CLOUD_SQL_IAM_AUTH: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -47,42 +47,37 @@ jobs: | |||||||||
| run: | | ||||||||||
| uv run alembic upgrade head | ||||||||||
|
|
||||||||||
| # Uses Google Cloud Secret Manager to store secret credentials | ||||||||||
| - name: Create app.yaml | ||||||||||
| - name: Ensure envsubst is available | ||||||||||
| run: | | ||||||||||
| cat <<EOF > app.yaml | ||||||||||
| service: ocotillo-api-staging | ||||||||||
| runtime: python313 | ||||||||||
| entrypoint: gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app | ||||||||||
| service_account: "${{ secrets.CLOUD_SQL_USER }}.gserviceaccount.com" | ||||||||||
| instance_class: F4 | ||||||||||
| handlers: | ||||||||||
| - url: /.* | ||||||||||
| secure: always | ||||||||||
| script: auto | ||||||||||
| env_variables: | ||||||||||
| MODE: "production" | ||||||||||
| ENVIRONMENT: "staging" | ||||||||||
| DB_DRIVER: "cloudsql" | ||||||||||
| CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}" | ||||||||||
| CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||||||
| CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}" | ||||||||||
| PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||||||
| PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}" | ||||||||||
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | ||||||||||
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" | ||||||||||
| PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}" | ||||||||||
| PYGEOAPI_SERVER_URL: "${{ vars.PYGEOAPI_SERVER_URL }}" | ||||||||||
| CLOUD_SQL_IAM_AUTH: true | ||||||||||
| GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}" | ||||||||||
| GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}" | ||||||||||
| AUTHENTIK_URL: "${{ vars.AUTHENTIK_URL }}" | ||||||||||
| AUTHENTIK_CLIENT_ID: "${{ vars.AUTHENTIK_CLIENT_ID }}" | ||||||||||
| AUTHENTIK_AUTHORIZE_URL: "${{ vars.AUTHENTIK_AUTHORIZE_URL }}" | ||||||||||
| AUTHENTIK_TOKEN_URL: "${{ vars.AUTHENTIK_TOKEN_URL }}" | ||||||||||
| SESSION_SECRET_KEY: "${{ secrets.SESSION_SECRET_KEY }}" | ||||||||||
| APITALLY_CLIENT_ID: "${{ vars.APITALLY_CLIENT_ID }}" | ||||||||||
| EOF | ||||||||||
| if ! command -v envsubst >/dev/null 2>&1; then | ||||||||||
| sudo apt-get update | ||||||||||
| sudo apt-get install -y gettext-base | ||||||||||
| fi | ||||||||||
|
|
||||||||||
| - name: Render app.yaml | ||||||||||
| env: | ||||||||||
| SERVICE_NAME: "ocotillo-api-staging" | ||||||||||
| ENVIRONMENT: "staging" | ||||||||||
| CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}" | ||||||||||
| CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||||||
| CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}" | ||||||||||
| PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}" | ||||||||||
| PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}" | ||||||||||
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | ||||||||||
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" | ||||||||||
|
Comment on lines
+66
to
+67
|
||||||||||
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | |
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" | |
| PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST != '' && vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}" | |
| PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT != '' && vars.PYGEOAPI_POSTGRES_PORT || '5432' }}" |
Copilot
AI
Feb 27, 2026
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CLOUD_SQL_IAM_AUTH value has been changed from a boolean true to a string "true". While YAML will treat both as truthy values, this may cause issues if the application code expects a boolean type. Verify that the application correctly handles string values for this environment variable, or consider using true without quotes to maintain consistency with the previous implementation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,3 +49,4 @@ cli/logs | |
| .pygeoapi/ | ||
| # deployment files | ||
| app.yaml | ||
| docs/ | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GitHub Actions does not support the
||operator for providing default values in theenvcontext. The expression${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}will always evaluate to the first value (even if empty) rather than falling back to the default. Consider using a separate step to set defaults, or use a ternary expression like${{ vars.PYGEOAPI_POSTGRES_PORT != '' && vars.PYGEOAPI_POSTGRES_PORT || '5432' }}.