vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3030 from coreos-inc/schema-cleanup

Browse source 
Small fixes for config schema validator in response to customer logs
This commit is contained in:
josephschorr 2018-03-20 14:55:12 -04:00 committed by GitHub
commit 041a7fcd36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/config/schema.py
View file

@ -406,7 +406,7 @@ CONFIG_SCHEMA = {
'GITHUB_LOGIN_CONFIG': { 'GITHUB_LOGIN_CONFIG': {
'type': ['object', 'null'], 'type': ['object', 'null'],
'description': 'Configuration for using GitHub (Enterprise) as an external login provider', 'description': 'Configuration for using GitHub (Enterprise) as an external login provider',
'required': ['GITHUB_ENDPOINT', 'CLIENT_ID', 'CLIENT_SECRET'], 'required': ['CLIENT_ID', 'CLIENT_SECRET'],
'x-reference': 'https://coreos.com/quay-enterprise/docs/latest/github-auth.html', 'x-reference': 'https://coreos.com/quay-enterprise/docs/latest/github-auth.html',
'properties': { 'properties': {
'GITHUB_ENDPOINT': { 'GITHUB_ENDPOINT': {
@ -738,11 +738,11 @@ CONFIG_SCHEMA = {
'x-reference': 'https://www.google.com/recaptcha/intro/', 'x-reference': 'https://www.google.com/recaptcha/intro/',
}, },
'RECAPTCHA_SITE_KEY': { 'RECAPTCHA_SITE_KEY': {
'type': 'string', 'type': ['string', 'null'],
'description': 'If recaptcha is enabled, the site key for the Recaptcha service', 'description': 'If recaptcha is enabled, the site key for the Recaptcha service',
}, },
'RECAPTCHA_SECRET_KEY': { 'RECAPTCHA_SECRET_KEY': {
'type': 'string', 'type': ['string', 'null'],
'description': 'If recaptcha is enabled, the secret key for the Recaptcha service', 'description': 'If recaptcha is enabled, the secret key for the Recaptcha service',
}, },