Skip to content
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

fix: default value of google storage sa to empty #12188

Merged
merged 1 commit into from
Dec 29, 2024

Conversation

kazukitakamatsu
Copy link
Contributor

Summary

Fixed an error when using Default Service Account in Google Storage.
When using Default Service Account, the environment variable GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64 must be an empty string. However, even if an empty string was specified in .env, the default string was specified in docker-compose.yaml. Therefore, the default string was changed to the empty string.

Additional Information.

As an alternative fix, it is possible to change the default to be specified only when undefined, but since the scope of impact is large, this was addressed in this issue.

current style
SOME_VARIABLE: ${SOME_VARIABLE:-default}
alternative style
SOME_VARIABLE: ${SOME_VARIABLE-default}

see https://docs.docker.com/reference/compose-file/interpolation/

Screenshots

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. 🐞 bug Something isn't working labels Dec 28, 2024
Copy link
Member

@crazywoola crazywoola left a comment

Choose a reason for hiding this comment

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

LGTM

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Dec 29, 2024
@crazywoola crazywoola merged commit bcef116 into langgenius:main Dec 29, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants