-
Notifications
You must be signed in to change notification settings - Fork 131
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
Refactor setup config #3605
Closed
Closed
Refactor setup config #3605
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3a51850
Refactor setup config
nwmac 5a26673
Fix error logging issues
nwmac 10c664e
Fixed some typos
richard-cox 2d00baf
Merge remote-tracking branch 'origin/v2-master' into refactor-setup-c…
richard-cox 036502c
Merge remote-tracking branch 'origin/v2-master' into refactor-setup-c…
nwmac 0c945f5
Address PR feedback. Add initiial unit test
nwmac d9ef065
Add a few unit tests while we're here
nwmac 1c0e189
Merge remote-tracking branch 'origin/v2-master' into refactor-setup-c…
nwmac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package datastore | ||
|
||
import ( | ||
"database/sql" | ||
|
||
"bitbucket.org/liamstask/goose/lib/goose" | ||
) | ||
|
||
func init() { | ||
RegisterMigration(20190521212700, "ConfigSchema", func(txn *sql.Tx, conf *goose.DBConf) error { | ||
configTable := "CREATE TABLE IF NOT EXISTS config (" | ||
configTable += " groupName VARCHAR(255) NOT NULL, " | ||
configTable += " name VARCHAR(255) NOT NULL, " | ||
configTable += " value VARCHAR(255) NOT NULL," | ||
configTable += " last_updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);" | ||
|
||
_, err := txn.Exec(configTable) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
// Add a marker to the new table so that later we know we need to migrate the old data to the new table | ||
addMarker := "INSERT INTO config (groupName, name, value) VALUES ('system', '__CONFIG_MIGRATION_NEEDED', 'true')" | ||
|
||
_, err = txn.Exec(addMarker) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
return nil | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The gate on
SSO_LOGIN
has been lost. Is this checked later on or not needed now?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you expand what you mean by gate?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously, in the removed
setSSOFromConfig
,Config.SSOLogin
was only set if!portalProxy.Env().IsSet("SSO_LOGIN")
was true. Now it's always set. Was wondering this was a fix or omissionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a fix - previously these two somewhat competed - now they are backed by the same env var