Skip to content

Commit 8651c5f

Browse files
mvilanovamvilanova
authored
Fix Environment Variable Naming (Netflix#74)
1 parent 8ad93b0 commit 8651c5f

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎docker/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY_ID=""
3333
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=""
3434
GOOGLE_SERVICE_ACCOUNT_CLIENT_EMAIL=""
3535
GOOGLE_SERVICE_ACCOUNT_CLIENT_ID=""
36-
GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT=""
36+
GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT=""
3737
GOOGLE_DEVELOPER_KEY=""
3838
GOOGLE_DOMAIN=""
3939

‎src/dispatch/plugins/dispatch_google/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from .config import (
99
GOOGLE_SERVICE_ACCOUNT_CLIENT_EMAIL,
1010
GOOGLE_SERVICE_ACCOUNT_CLIENT_ID,
11-
GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT,
11+
GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT,
1212
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY,
1313
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY_ID,
1414
GOOGLE_SERVICE_ACCOUNT_PROJECT_ID,
@@ -40,7 +40,7 @@ def get_service(service_name: str, version: str, scopes: list):
4040
service_account_file.name, scopes=scopes
4141
)
4242

43-
delegated_credentials = credentials.with_subject(GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT)
43+
delegated_credentials = credentials.with_subject(GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT)
4444

4545
return googleapiclient.discovery.build(
4646
service_name,

‎src/dispatch/plugins/dispatch_google/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
GOOGLE_DEVELOPER_KEY = config("GOOGLE_DEVELOPER_KEY", cast=Secret)
55
GOOGLE_SERVICE_ACCOUNT_CLIENT_EMAIL = config("GOOGLE_SERVICE_ACCOUNT_CLIENT_EMAIL")
66
GOOGLE_SERVICE_ACCOUNT_CLIENT_ID = config("GOOGLE_SERVICE_ACCOUNT_CLIENT_ID")
7-
GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT = config("GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT")
7+
GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT = config("GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT")
88
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY = config("GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY", cast=Secret)
99
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY_ID = config("GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY_ID")
1010
GOOGLE_SERVICE_ACCOUNT_PROJECT_ID = config("GOOGLE_SERVICE_ACCOUNT_PROJECT_ID")

‎src/dispatch/plugins/dispatch_google/gmail/plugin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from dispatch.plugins.dispatch_google.common import get_service
2727
from dispatch.plugins.dispatch_google.config import (
2828
GOOGLE_USER_OVERRIDE,
29-
GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT,
29+
GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT,
3030
)
3131

3232
from .filters import env
@@ -50,7 +50,7 @@ def create_html_message(recipient: str, subject: str, body: str) -> Dict:
5050
log.warning("GOOGLE_USER_OVERIDE set. Using override.")
5151

5252
message["to"] = recipient
53-
message["from"] = GOOGLE_SERVICE_ACCOUNT_DELAGATED_ACCOUNT
53+
message["from"] = GOOGLE_SERVICE_ACCOUNT_DELEGATED_ACCOUNT
5454
message["subject"] = subject
5555
return {"raw": base64.urlsafe_b64encode(message.as_bytes()).decode()}
5656

0 commit comments

Comments
 (0)