Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

don't pass redis password when auth disabled #1751

Merged
merged 3 commits into from
Feb 2, 2021
Merged

don't pass redis password when auth disabled #1751

merged 3 commits into from
Feb 2, 2021

Conversation

mikehelmick
Copy link
Contributor

Proposed Changes

  • Ensures that redis PW isn't passed when auth disabled

Release Note

Allow for redis auth to be disabled and terraform to apply successfully

@googlebot googlebot added the cla: yes Auto: added by CLA bot when all committers have signed a CLA. label Feb 2, 2021
sethvargo
sethvargo reviewed Feb 2, 2021
View reviewed changes
Copy link
Member

@sethvargo sethvargo left a comment

Choose a reason for hiding this comment

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

There's another redis_passwird field and the local env file too, but this approach is better

@mikehelmick
Copy link
Contributor Author

updated

sethvargo
sethvargo suggested changes Feb 2, 2021
View reviewed changes
terraform/main.tf
@@ -191,7 +191,7 @@ export FIREBASE_STORAGE_BUCKET="${data.google_firebase_web_app_config.default.st
export CACHE_TYPE="REDIS"
export CACHE_REDIS_HOST="${google_redis_instance.cache.host}"
export CACHE_REDIS_PORT="${google_redis_instance.cache.port}"
export CACHE_REDIS_PASSWORD="secret://${google_secret_manager_secret_version.redis-auth.id}"
export CACHE_REDIS_PASSWORD=var.redis_enable_auth ? "secret://${google_secret_manager_secret_version.redis-auth.id}" : ""
Copy link
Member

Choose a reason for hiding this comment

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

There's also Rate Limit

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikehelmick, sethvargo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [mikehelmick,sethvargo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-robot google-oss-robot merged commit d3f9f2d into google:main Feb 2, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sethvargo sethvargo sethvargo approved these changes

@yegle yegle Awaiting requested review from yegle

Assignees

@sethvargo sethvargo

Labels
cla: yes Auto: added by CLA bot when all committers have signed a CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mikehelmick @google-oss-robot @sethvargo @googlebot