Skip to content

BDMS-81 fix: correct GCS_SERVICE_ACCOUNT_KEY echo syntax and update relationship in Thing model #104

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.

Sign up for GitHub

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

Closed
jirhiker wants to merge 1 commit into from
Closed

BDMS-81 fix: correct GCS_SERVICE_ACCOUNT_KEY echo syntax and update relationship in Thing model #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/staging_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
echo " CLOUD_SQL_DATABASE: \"${{ secrets.CLOUD_SQL_DATABASE }}\"" >> app.yaml
echo " CLOUD_SQL_USER: \"${{ secrets.CLOUD_SQL_USER }}\"" >> app.yaml
echo " CLOUD_SQL_PASSWORD: \"${{ secrets.CLOUD_SQL_PASSWORD }}\"" >> app.yaml
echo " GCS_SERVICE_ACCOUNT_KEY: \"${{ secrets.GCS_SERVICE_ACCOUNT_KEY}}\"" >> app.yaml
echo " GCS_SERVICE_ACCOUNT_KEY: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }} >> app.yaml

@jacob-a-brown jacob-a-brown Aug 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closing quotes should be present at the end of the line that is being echoed and then redirected to app.yaml

@jirhiker jirhiker Aug 25, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this is part of the problem. Since the service key is JSON that uses double quotes

@jacob-a-brown jacob-a-brown Aug 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For echo to work I think that the full string needs to be in double quotes, but the escaped quotes in the inner bit should be removed if they're causing issues

 echo "  GCS_SERVICE_ACCOUNT_KEY: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}" >> app.yaml

echo " GCS_BUCKET_NAME: \"${{secrets.GCS_BUCKET_NAME}}\"" >> app.yaml
echo " AUTHENTIK_URL: \"${{secrets.AUTHENTIK_URL}}\"" >> app.yaml
echo " AUTHENTIK_CLIENT_ID: \"${{secrets.AUTHENTIK_CLIENT_ID}}\"" >> app.yaml
Expand Down
2 changes: 1 addition & 1 deletion db/thing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class WellScreen(Base, AutoBaseMixin):
String(1000), nullable=True, info={"unit": "description of the screen"}
)
# Define a relationship to well if needed
# well = relationship("Well")
thing = relationship("Thing")


# ============= EOF =============================================
1 change: 1 addition & 0 deletions schemas/thing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ class WellScreenResponse(ORMBaseModel):
"""

thing_id: int
thing: WellResponse
screen_depth_bottom: float
screen_depth_top: float
screen_type: str | None = None
Expand Down
Loading