Skip to content

Commit 113e7f3

Browse files
committed
Environment variables were not shell friendly
The environment names were dictated by some library we no longer use. I removed that dependency, but kept the environment variables the same to not break stuff anything. This commit changes that to be shell-friendly. Before, if you wanted to write a script to run the app, you'd need to resort to using either an external app, or `env -S $(< envfile) flask ...`. By swapping to dashes we're a little more generic in the kinds of ways you can call the app. Jira: IAM-950
1 parent 66d0dff commit 113e7f3

6 files changed

+90
-97
lines changed

clouddeploy/sso-dashboard-dev.template.yaml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,42 +49,38 @@ spec:
4949
env:
5050
- name: 'TARGET'
5151
value: 'Staging'
52-
- name: SSO-DASHBOARD_DEBUG
53-
value: True
54-
- name: SSO-DASHBOARD_TESTING
52+
- name: TESTING
5553
value: False
56-
- name: SSO-DASHBOARD_CSRF_ENABLED
54+
- name: CSRF_ENABLED
5755
value: True
58-
- name: SSO-DASHBOARD_PERMANENT_SESSION
56+
- name: PERMANENT_SESSION
5957
value: True
60-
- name: SSO-DASHBOARD_PERMANENT_SESSION_LIFETIME
58+
- name: PERMANENT_SESSION_LIFETIME
6159
value: 86400
62-
- name: SSO-DASHBOARD_SESSION_COOKIE_HTTPONLY
60+
- name: SESSION_COOKIE_HTTPONLY
6361
value: True
64-
- name: SSO-DASHBOARD_PREFERRED_URL_SCHEME
62+
- name: PREFERRED_URL_SCHEME
6563
value: https
66-
- name: SSO-DASHBOARD_OIDC_CLIENT_ID
64+
- name: OIDC_CLIENT_ID
6765
value: 2KNOUCxN8AFnGGjDCGtqiDIzq8MKXi2h
68-
- name: SSO-DASHBOARD_OIDC_DOMAIN
66+
- name: OIDC_DOMAIN
6967
value: idp-dev.iam.mozilla.com
70-
- name: SSO-DASHBOARD_SERVER_NAME
68+
- name: SERVER_NAME
7169
value: sso.allizom.org
72-
- name: SSO-DASHBOARD_CDN
70+
- name: CDN
7371
value: https://cdn.sso.mozilla.com
74-
- name: SSO-DASHBOARD_S3_BUCKET
72+
- name: S3_BUCKET
7573
value: sso-dashboard.configuration
76-
- name: SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY
74+
- name: FORBIDDEN_PAGE_PUBLIC_KEY
7775
value: "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0NCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBcStWVXhsWWlENUF1aGh3a0hEb3kNCmFXV0YzcFlzQmxGaDlUendZeGNNR282TFdUODljb0xuUDdWVHlLbGdsTklmTG5KZDdqY2E5VUJ1QjhIVFBQYWoNCk5Ibk5UaUZ5UEZTbjFoaVhqSDJieUNDNnA1ZnByRWFEazV3YVpVNTgwaTRDaVlYcWtrWWdVbXVINW91Mnl4NW4NClZCVGJmcityZFQ0a0tRdi9Dek9ZR1o3K05NVUdXYTMvNXRMZklyRXZnV2tTTEluemtVZVhUS3huRSs5a1AvU2ENCkM4SDZsNnBKbm9oOVpiY3J4RGhkbVl6TEx2c0tIQ2tidmdCczNiaUFkSENzeHFEeFcxSGlOMzJYeEc4Y1pyc00NCjV1ZDdnbHNNY2VZWk82aENTZW4vckFUWmJkc3RETWNLa2YzMTBpUFgxRWF5ZzNPcDNZUlVTdkxzVmp5bmxQZmYNClRSVjFmQ2hJaXFwQWdnS2x4MXdqRUk2UVBuQWdpU1E0WEJweTFCK3FUSTltd1BhcE5yY2IzbkpFNDFNT0dEZGwNCmFLcHlMeGdaeEI4NmNKYTlVQXZGSEFOR08zRXA1Vmd0UjNoUStqWkY2RGFHUThjMHNyaHg4MTc4dWJybFY2NGsNCnVxK1ozVUZBZHhDbHZTRnc0eDVyTm1tV2dTN280OG9yMnhWdXVXMTQxNEZYTVBvaytDNUdabGd6ZG5zZ3cxWlQNCmhzTWNldG1temthUTlyeWxmYXVRR1gzMk5lZ3FlOWFyR0VGbXBqYjJUb2w0Tk1RLy83MzRuVFN2Q1lmL0o0Qi8NCnR0NjJzOXRBTU1ZdkpvN0ZRV2o0Qks3dUYvYmxTbTczYUVvVlFiNHdzWjJRWWpMeVlWcGh2UFprYVdaZHA0Wi8NCng0STlPT3lOYThtaGZkK3h0OU9uWXVzQ0F3RUFBUT09DQotLS0tLUVORCBQVUJMSUMgS0VZLS0tLS0NCg==\n"
78-
- name: SSO-DASHBOARD_REDIS_CONNECTOR
76+
- name: REDIS_CONNECTOR
7977
value: 10.182.16.6:6379
8078
- name: AWS_DEFAULT_REGION
8179
value: us-west-2
8280
- name: ENVIRONMENT
8381
value: development
8482
- name: FLASK_DEBUG
8583
value: False
86-
- name: DEBUG
87-
value: False
8884
- name: LANG
8985
value: en_US.utf8
9086
- name: FLASK_APP
@@ -96,12 +92,12 @@ spec:
9692
secretKeyRef:
9793
key: latest
9894
name: sso-dashboard-aws-secret-access-key
99-
- name: SSO-DASHBOARD_SECRET_KEY
95+
- name: SECRET_KEY
10096
valueFrom:
10197
secretKeyRef:
10298
key: latest
10399
name: sso-dashboard-dev-secret-key
104-
- name: SSO-DASHBOARD_OIDC_CLIENT_SECRET
100+
- name: OIDC_CLIENT_SECRET
105101
valueFrom:
106102
secretKeyRef:
107103
key: latest

clouddeploy/sso-dashboard-prod.template.yaml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,42 +49,38 @@ spec:
4949
env:
5050
- name: TARGET
5151
value: Prod
52-
- name: SSO-DASHBOARD_DEBUG
52+
- name: TESTING
5353
value: False
54-
- name: SSO-DASHBOARD_TESTING
55-
value: False
56-
- name: SSO-DASHBOARD_CSRF_ENABLED
54+
- name: CSRF_ENABLED
5755
value: True
58-
- name: SSO-DASHBOARD_PERMANENT_SESSION
56+
- name: PERMANENT_SESSION
5957
value: True
60-
- name: SSO-DASHBOARD_PERMANENT_SESSION_LIFETIME
58+
- name: PERMANENT_SESSION_LIFETIME
6159
value: 86400
62-
- name: SSO-DASHBOARD_SESSION_COOKIE_HTTPONLY
60+
- name: SESSION_COOKIE_HTTPONLY
6361
value: True
64-
- name: SSO-DASHBOARD_PREFERRED_URL_SCHEME
62+
- name: PREFERRED_URL_SCHEME
6563
value: https
66-
- name: SSO-DASHBOARD_OIDC_CLIENT_ID
64+
- name: OIDC_CLIENT_ID
6765
value: UCOY390lYDxgj5rU8EeXRtN6EP005k7V
68-
- name: SSO-DASHBOARD_OIDC_DOMAIN
66+
- name: OIDC_DOMAIN
6967
value: auth.mozilla.auth0.com
70-
- name: SSO-DASHBOARD_SERVER_NAME
68+
- name: SERVER_NAME
7169
value: sso.mozilla.com
72-
- name: SSO-DASHBOARD_CDN
70+
- name: CDN
7371
value: https://cdn.sso.mozilla.com
74-
- name: SSO-DASHBOARD_S3_BUCKET
72+
- name: S3_BUCKET
7573
value: sso-dashboard.configuration
76-
- name: SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY
74+
- name: FORBIDDEN_PAGE_PUBLIC_KEY
7775
value: "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0NCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBcStWVXhsWWlENUF1aGh3a0hEb3kNCmFXV0YzcFlzQmxGaDlUendZeGNNR282TFdUODljb0xuUDdWVHlLbGdsTklmTG5KZDdqY2E5VUJ1QjhIVFBQYWoNCk5Ibk5UaUZ5UEZTbjFoaVhqSDJieUNDNnA1ZnByRWFEazV3YVpVNTgwaTRDaVlYcWtrWWdVbXVINW91Mnl4NW4NClZCVGJmcityZFQ0a0tRdi9Dek9ZR1o3K05NVUdXYTMvNXRMZklyRXZnV2tTTEluemtVZVhUS3huRSs5a1AvU2ENCkM4SDZsNnBKbm9oOVpiY3J4RGhkbVl6TEx2c0tIQ2tidmdCczNiaUFkSENzeHFEeFcxSGlOMzJYeEc4Y1pyc00NCjV1ZDdnbHNNY2VZWk82aENTZW4vckFUWmJkc3RETWNLa2YzMTBpUFgxRWF5ZzNPcDNZUlVTdkxzVmp5bmxQZmYNClRSVjFmQ2hJaXFwQWdnS2x4MXdqRUk2UVBuQWdpU1E0WEJweTFCK3FUSTltd1BhcE5yY2IzbkpFNDFNT0dEZGwNCmFLcHlMeGdaeEI4NmNKYTlVQXZGSEFOR08zRXA1Vmd0UjNoUStqWkY2RGFHUThjMHNyaHg4MTc4dWJybFY2NGsNCnVxK1ozVUZBZHhDbHZTRnc0eDVyTm1tV2dTN280OG9yMnhWdXVXMTQxNEZYTVBvaytDNUdabGd6ZG5zZ3cxWlQNCmhzTWNldG1temthUTlyeWxmYXVRR1gzMk5lZ3FlOWFyR0VGbXBqYjJUb2w0Tk1RLy83MzRuVFN2Q1lmL0o0Qi8NCnR0NjJzOXRBTU1ZdkpvN0ZRV2o0Qks3dUYvYmxTbTczYUVvVlFiNHdzWjJRWWpMeVlWcGh2UFprYVdaZHA0Wi8NCng0STlPT3lOYThtaGZkK3h0OU9uWXVzQ0F3RUFBUT09DQotLS0tLUVORCBQVUJMSUMgS0VZLS0tLS0NCg==\n"
78-
- name: SSO-DASHBOARD_REDIS_CONNECTOR
76+
- name: REDIS_CONNECTOR
7977
value: 10.182.16.6:6379
8078
- name: AWS_DEFAULT_REGION
8179
value: us-west-2
8280
- name: ENVIRONMENT
8381
value: production
8482
- name: FLASK_DEBUG
8583
value: False
86-
- name: DEBUG
87-
value: False
8884
- name: LANG
8985
value: en_US.utf8
9086
- name: FLASK_APP
@@ -96,12 +92,12 @@ spec:
9692
secretKeyRef:
9793
key: latest
9894
name: sso-dashboard-aws-secret-access-key
99-
- name: SSO-DASHBOARD_SECRET_KEY
95+
- name: SECRET_KEY
10096
valueFrom:
10197
secretKeyRef:
10298
key: latest
10399
name: sso-dashboard-prod-secret-key
104-
- name: SSO-DASHBOARD_OIDC_CLIENT_SECRET
100+
- name: OIDC_CLIENT_SECRET
105101
valueFrom:
106102
secretKeyRef:
107103
key: latest

clouddeploy/sso-dashboard-staging.template.yaml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,42 +49,38 @@ spec:
4949
env:
5050
- name: TARGET
5151
value: Prod
52-
- name: SSO-DASHBOARD_DEBUG
52+
- name: TESTING
5353
value: False
54-
- name: SSO-DASHBOARD_TESTING
55-
value: False
56-
- name: SSO-DASHBOARD_CSRF_ENABLED
54+
- name: CSRF_ENABLED
5755
value: True
58-
- name: SSO-DASHBOARD_PERMANENT_SESSION
56+
- name: PERMANENT_SESSION
5957
value: True
60-
- name: SSO-DASHBOARD_PERMANENT_SESSION_LIFETIME
58+
- name: PERMANENT_SESSION_LIFETIME
6159
value: 86400
62-
- name: SSO-DASHBOARD_SESSION_COOKIE_HTTPONLY
60+
- name: SESSION_COOKIE_HTTPONLY
6361
value: True
64-
- name: SSO-DASHBOARD_PREFERRED_URL_SCHEME
62+
- name: PREFERRED_URL_SCHEME
6563
value: https
66-
- name: SSO-DASHBOARD_OIDC_CLIENT_ID
64+
- name: OIDC_CLIENT_ID
6765
value: UCOY390lYDxgj5rU8EeXRtN6EP005k7V
68-
- name: SSO-DASHBOARD_OIDC_DOMAIN
66+
- name: OIDC_DOMAIN
6967
value: auth.mozilla.auth0.com
70-
- name: SSO-DASHBOARD_SERVER_NAME
68+
- name: SERVER_NAME
7169
value: staging.sso.mozilla.com
72-
- name: SSO-DASHBOARD_CDN
70+
- name: CDN
7371
value: https://cdn.sso.mozilla.com
74-
- name: SSO-DASHBOARD_S3_BUCKET
72+
- name: S3_BUCKET
7573
value: sso-dashboard.configuration
76-
- name: SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY
74+
- name: FORBIDDEN_PAGE_PUBLIC_KEY
7775
value: "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0NCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBcStWVXhsWWlENUF1aGh3a0hEb3kNCmFXV0YzcFlzQmxGaDlUendZeGNNR282TFdUODljb0xuUDdWVHlLbGdsTklmTG5KZDdqY2E5VUJ1QjhIVFBQYWoNCk5Ibk5UaUZ5UEZTbjFoaVhqSDJieUNDNnA1ZnByRWFEazV3YVpVNTgwaTRDaVlYcWtrWWdVbXVINW91Mnl4NW4NClZCVGJmcityZFQ0a0tRdi9Dek9ZR1o3K05NVUdXYTMvNXRMZklyRXZnV2tTTEluemtVZVhUS3huRSs5a1AvU2ENCkM4SDZsNnBKbm9oOVpiY3J4RGhkbVl6TEx2c0tIQ2tidmdCczNiaUFkSENzeHFEeFcxSGlOMzJYeEc4Y1pyc00NCjV1ZDdnbHNNY2VZWk82aENTZW4vckFUWmJkc3RETWNLa2YzMTBpUFgxRWF5ZzNPcDNZUlVTdkxzVmp5bmxQZmYNClRSVjFmQ2hJaXFwQWdnS2x4MXdqRUk2UVBuQWdpU1E0WEJweTFCK3FUSTltd1BhcE5yY2IzbkpFNDFNT0dEZGwNCmFLcHlMeGdaeEI4NmNKYTlVQXZGSEFOR08zRXA1Vmd0UjNoUStqWkY2RGFHUThjMHNyaHg4MTc4dWJybFY2NGsNCnVxK1ozVUZBZHhDbHZTRnc0eDVyTm1tV2dTN280OG9yMnhWdXVXMTQxNEZYTVBvaytDNUdabGd6ZG5zZ3cxWlQNCmhzTWNldG1temthUTlyeWxmYXVRR1gzMk5lZ3FlOWFyR0VGbXBqYjJUb2w0Tk1RLy83MzRuVFN2Q1lmL0o0Qi8NCnR0NjJzOXRBTU1ZdkpvN0ZRV2o0Qks3dUYvYmxTbTczYUVvVlFiNHdzWjJRWWpMeVlWcGh2UFprYVdaZHA0Wi8NCng0STlPT3lOYThtaGZkK3h0OU9uWXVzQ0F3RUFBUT09DQotLS0tLUVORCBQVUJMSUMgS0VZLS0tLS0NCg==\n"
78-
- name: SSO-DASHBOARD_REDIS_CONNECTOR
76+
- name: REDIS_CONNECTOR
7977
value: 10.182.16.6:6379
8078
- name: AWS_DEFAULT_REGION
8179
value: us-west-2
8280
- name: ENVIRONMENT
8381
value: staging
8482
- name: FLASK_DEBUG
8583
value: False
86-
- name: DEBUG
87-
value: False
8884
- name: LANG
8985
value: en_US.utf8
9086
- name: FLASK_APP
@@ -96,12 +92,12 @@ spec:
9692
secretKeyRef:
9793
key: latest
9894
name: sso-dashboard-aws-secret-access-key
99-
- name: SSO-DASHBOARD_SECRET_KEY
95+
- name: SECRET_KEY
10096
valueFrom:
10197
secretKeyRef:
10298
key: latest
10399
name: sso-dashboard-prod-secret-key
104-
- name: SSO-DASHBOARD_OIDC_CLIENT_SECRET
100+
- name: OIDC_CLIENT_SECRET
105101
valueFrom:
106102
secretKeyRef:
107103
key: latest

dashboard/config.py

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,41 @@ class Default:
99
"""Defaults for the configuration objects."""
1010

1111
ENVIRONMENT: str = os.environ.get("ENVIRONMENT", "local")
12-
DEBUG: bool = os.environ.get("SSO-DASHBOARD_DEBUG", "True") == "True"
13-
TESTING: bool = os.environ.get("SSO-DASHBOARD_TESTING", "True") == "True"
1412

15-
CSRF_ENABLED: bool = os.environ.get("SSO-DASHBOARD_CSRF_ENABLED", "True") == "True"
16-
PERMANENT_SESSION: bool = os.environ.get("SSO-DASHBOARD_PERMANENT_SESSION", "True") == "True"
13+
# Flask makes use of the `FLASK_DEBUG` environment variable, with or
14+
# without using `Flask.config.from_prefixed_env` (a method we don't
15+
# use).
16+
DEBUG: bool = os.environ.get("FLASK_DEBUG", "True") == "True"
17+
18+
TESTING: bool = os.environ.get("TESTING", "True") == "True"
19+
20+
CSRF_ENABLED: bool = os.environ.get("CSRF_ENABLED", "True") == "True"
21+
PERMANENT_SESSION: bool = os.environ.get("PERMANENT_SESSION", "True") == "True"
1722
PERMANENT_SESSION_LIFETIME: datetime.timedelta = datetime.timedelta(
18-
seconds=int(os.environ.get("SSO-DASHBOARD_PERMANENT_SESSION_LIFETIME", "86400"))
23+
seconds=int(os.environ.get("PERMANENT_SESSION_LIFETIME", "86400"))
1924
)
2025

21-
SESSION_COOKIE_SAMESITE: str = os.environ.get("SSO-DASHBOARD_SESSION_COOKIE_SAMESITE", "lax")
22-
SESSION_COOKIE_HTTPONLY: bool = os.environ.get("SSO-DASHBOARD_SESSION_COOKIE_HTTPONLY", "True") == "True"
26+
SESSION_COOKIE_SAMESITE: str = os.environ.get("SESSION_COOKIE_SAMESITE", "lax")
27+
SESSION_COOKIE_HTTPONLY: bool = os.environ.get("SESSION_COOKIE_HTTPONLY", "True") == "True"
2328

2429
SECRET_KEY: str
25-
SERVER_NAME: str = os.environ.get("SSO-DASHBOARD_SERVER_NAME", "localhost:8000")
30+
SERVER_NAME: str = os.environ.get("SERVER_NAME", "localhost:8000")
2631
SESSION_COOKIE_NAME: str
2732
CDN: str
2833

2934
S3_BUCKET: str
3035
FORBIDDEN_PAGE_PUBLIC_KEY: bytes
3136

32-
PREFERRED_URL_SCHEME: str = os.environ.get("SSO-DASHBOARD_PREFERRED_URL_SCHEME", "https")
37+
PREFERRED_URL_SCHEME: str = os.environ.get("PREFERRED_URL_SCHEME", "https")
3338
REDIS_CONNECTOR: str
3439

3540
def __init__(self):
3641
self.SESSION_COOKIE_NAME = f"{self.SERVER_NAME}_session"
37-
self.CDN = os.environ.get("SSO-DASHBOARD_CDN", f"https://cdn.{self.SERVER_NAME}")
38-
self.REDIS_CONNECTOR = os.environ["SSO-DASHBOARD_REDIS_CONNECTOR"]
39-
self.SECRET_KEY = os.environ["SSO-DASHBOARD_SECRET_KEY"]
40-
self.S3_BUCKET = os.environ["SSO-DASHBOARD_S3_BUCKET"]
41-
self.FORBIDDEN_PAGE_PUBLIC_KEY = base64.b64decode(os.environ["SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY"])
42+
self.CDN = os.environ.get("CDN", f"https://cdn.{self.SERVER_NAME}")
43+
self.REDIS_CONNECTOR = os.environ["REDIS_CONNECTOR"]
44+
self.SECRET_KEY = os.environ["SECRET_KEY"]
45+
self.S3_BUCKET = os.environ["S3_BUCKET"]
46+
self.FORBIDDEN_PAGE_PUBLIC_KEY = base64.b64decode(os.environ["FORBIDDEN_PAGE_PUBLIC_KEY"])
4247

4348

4449
class OIDC:
@@ -52,12 +57,12 @@ class OIDC:
5257

5358
def __init__(self):
5459
"""General object initializer."""
55-
self.OIDC_DOMAIN = os.environ["SSO-DASHBOARD_OIDC_DOMAIN"]
56-
self.OIDC_CLIENT_ID = os.environ["SSO-DASHBOARD_OIDC_CLIENT_ID"]
57-
self.OIDC_CLIENT_SECRET = os.environ["SSO-DASHBOARD_OIDC_CLIENT_SECRET"]
60+
self.OIDC_DOMAIN = os.environ["OIDC_DOMAIN"]
61+
self.OIDC_CLIENT_ID = os.environ["OIDC_CLIENT_ID"]
62+
self.OIDC_CLIENT_SECRET = os.environ["OIDC_CLIENT_SECRET"]
5863
# Check for a prefixed environment variable, otherwise fallback to the
5964
# unprefixed one.
60-
if redirect_uri := os.environ.get("SSO-DASHBOARD_OIDC_REDIRECT_URI"):
65+
if redirect_uri := os.environ.get("OIDC_REDIRECT_URI"):
6166
self.OIDC_REDIRECT_URI = redirect_uri
6267
else:
6368
self.OIDC_REDIRECT_URI = os.environ["OIDC_REDIRECT_URI"]

env.example

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,46 @@
44
# This should be random in production deployment used in session security.
55
# Easy way to generate:
66
# openssl rand -hex 64
7-
SSO-DASHBOARD_SECRET_KEY="this is a secret key"
7+
SECRET_KEY="this is a secret key"
88

99
# local, development, staging, or production.
1010
ENVIRONMENT="local"
1111

1212
# OpenID Connect Specific Parameters
1313
# We use Auth0, the configs for this would be under the Application "Settings"
1414
# page.
15-
SSO-DASHBOARD_OIDC_DOMAIN="auth0.example.com"
16-
SSO-DASHBOARD_OIDC_CLIENT_ID=""
17-
SSO-DASHBOARD_OIDC_CLIENT_SECRET=""
15+
OIDC_DOMAIN="auth0.example.com"
16+
OIDC_CLIENT_ID=""
17+
OIDC_CLIENT_SECRET=""
1818

1919
# Yes, this one is not namespaced.
2020
# DEBT(bhee): standardize at some point.
2121
OIDC_REDIRECT_URI='https://localhost.localdomain:8000/redirect_uri'
2222

23-
# Controls the logging levels
24-
SSO-DASHBOARD_DEBUG=True
23+
# Controls the logging levels.
24+
FLASK_DEBUG=True
2525

2626
# Unused right now.
27-
SSO-DASHBOARD_TESTING=False
27+
TESTING=False
2828

2929
# Reasonable for local development, you'll want to change these in production
3030
# though.
31-
SSO-DASHBOARD_CSRF_ENABLED=True
32-
SSO-DASHBOARD_PERMANENT_SESSION=True
33-
SSO-DASHBOARD_PERMANENT_SESSION_LIFETIME=86400
34-
SSO-DASHBOARD_SESSION_COOKIE_HTTPONLY=True
35-
SSO-DASHBOARD_SERVER_NAME=localhost.localdomain:8000
36-
SSO-DASHBOARD_PREFERRED_URL_SCHEME=http
31+
CSRF_ENABLED=True
32+
PERMANENT_SESSION=True
33+
PERMANENT_SESSION_LIFETIME=86400
34+
SESSION_COOKIE_HTTPONLY=True
35+
SERVER_NAME=localhost.localdomain:8000
36+
PREFERRED_URL_SCHEME=http
3737

3838
# You'll need a running redis.
3939
# See compose.yml.
40-
SSO-DASHBOARD_REDIS_CONNECTOR=redis:6379
40+
REDIS_CONNECTOR=redis:6379
4141

4242
# Where we publish the `apps.yml` file.
43-
SSO-DASHBOARD_CDN=https://cdn.sso.mozilla.com
44-
SSO-DASHBOARD_S3_BUCKET=sso-dashboard.configuration
43+
CDN=https://cdn.sso.mozilla.com
44+
S3_BUCKET=sso-dashboard.configuration
4545

4646
# Used to decode the JWS from Auth0 (e.g. for if we redirect back and there's some
4747
# context Auth0 passes us, like the error code.)
4848
# Base64 + PEM encoded.
49-
SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY=""
49+
FORBIDDEN_PAGE_PUBLIC_KEY=""

tests/test_vanity.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ def externals(monkeypatch):
1313
models_dir = Path(__file__).parent / "models"
1414
monkeypatch.setattr("os.path.dirname", lambda _: models_dir)
1515
# Internal to how Configs work.
16-
monkeypatch.setenv("SSO-DASHBOARD_REDIS_CONNECTOR", "foobar")
17-
monkeypatch.setenv("SSO-DASHBOARD_SECRET_KEY", "deadbeef")
18-
monkeypatch.setenv("SSO-DASHBOARD_S3_BUCKET", "")
19-
monkeypatch.setenv("SSO-DASHBOARD_FORBIDDEN_PAGE_PUBLIC_KEY", "")
20-
monkeypatch.setenv("SSO-DASHBOARD_CDN", "https://localhost")
16+
monkeypatch.setenv("REDIS_CONNECTOR", "foobar")
17+
monkeypatch.setenv("SECRET_KEY", "deadbeef")
18+
monkeypatch.setenv("S3_BUCKET", "")
19+
monkeypatch.setenv("FORBIDDEN_PAGE_PUBLIC_KEY", "")
20+
monkeypatch.setenv("CDN", "https://localhost")
2121

2222

2323
@pytest.fixture

0 commit comments

Comments
 (0)