Support MySql driver #2356
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 |
|---|---|---|
|
|
@@ -848,20 +848,6 @@ func SetupViper(v *viper.Viper, filename string, bidderInfos BidderInfos) { | |
| v.SetDefault("stored_requests.filesystem.enabled", false) | ||
| v.SetDefault("stored_requests.filesystem.directorypath", "./stored_requests/data/by_id") | ||
| v.SetDefault("stored_requests.directorypath", "./stored_requests/data/by_id") | ||
| v.SetDefault("stored_requests.http.endpoint", "") | ||
| v.SetDefault("stored_requests.http.amp_endpoint", "") | ||
| v.SetDefault("stored_requests.in_memory_cache.type", "none") | ||
|
|
@@ -878,17 +864,6 @@ func SetupViper(v *viper.Viper, filename string, bidderInfos BidderInfos) { | |
| // PBS is not in the business of storing video content beyond the normal prebid cache system. | ||
| v.SetDefault("stored_video_req.filesystem.enabled", false) | ||
| v.SetDefault("stored_video_req.filesystem.directorypath", "") | ||
| v.SetDefault("stored_video_req.http.endpoint", "") | ||
| v.SetDefault("stored_video_req.in_memory_cache.type", "none") | ||
| v.SetDefault("stored_video_req.in_memory_cache.ttl_seconds", 0) | ||
|
|
@@ -902,17 +877,6 @@ func SetupViper(v *viper.Viper, filename string, bidderInfos BidderInfos) { | |
| v.SetDefault("stored_video_req.http_events.timeout_ms", 0) | ||
| v.SetDefault("stored_responses.filesystem.enabled", false) | ||
| v.SetDefault("stored_responses.filesystem.directorypath", "") | ||
| v.SetDefault("stored_responses.http.endpoint", "") | ||
| v.SetDefault("stored_responses.in_memory_cache.type", "none") | ||
| v.SetDefault("stored_responses.in_memory_cache.ttl_seconds", 0) | ||
|
|
@@ -1037,6 +1001,7 @@ func SetupViper(v *viper.Viper, filename string, bidderInfos BidderInfos) { | |
| migrateConfigPurposeOneTreatment(v) | ||
| migrateConfigSpecialFeature1(v) | ||
| migrateConfigTCF2PurposeFlags(v) | ||
| migrateConfigDatabaseConnection(v) | ||
|
|
||
| // These defaults must be set after the migrate functions because those functions look for the presence of these | ||
| // config fields and there isn't a way to detect presence of a config field using the viper package if a default | ||
|
|
@@ -1186,6 +1151,160 @@ func migrateConfigTCF2PurposeEnabledFlags(v *viper.Viper) { | |
| } | ||
| } | ||
|
|
||
| func migrateConfigDatabaseConnection(v *viper.Viper) { | ||
|
|
||
| type QueryParamMigration struct { | ||
| old string | ||
| new string | ||
| } | ||
|
|
||
| type QueryMigration struct { | ||
| name string | ||
| params []QueryParamMigration | ||
| } | ||
|
|
||
| type Migration struct { | ||
| old string | ||
| new string | ||
| fields []string | ||
| queries []QueryMigration | ||
| } | ||
|
|
||
| migrations := []Migration{ | ||
| { | ||
| old: "stored_requests.postgres", | ||
| new: "stored_requests.database", | ||
| fields: []string{ | ||
| "connection.dbname", | ||
| "connection.host", | ||
| "connection.port", | ||
| "connection.user", | ||
| "connection.password", | ||
| "fetcher.query", | ||
| "fetcher.amp_query", | ||
| "initialize_caches.timeout_ms", | ||
| "initialize_caches.query", | ||
| "initialize_caches.amp_query", | ||
| "poll_for_updates.refresh_rate_seconds", | ||
| "poll_for_updates.timeout_ms", | ||
| "poll_for_updates.query", | ||
| "poll_for_updates.amp_query", | ||
| }, | ||
| queries: []QueryMigration{ | ||
| { | ||
| name: "fetcher.query", | ||
| params: []QueryParamMigration{ | ||
| { | ||
| old: "%REQUEST_ID_LIST%", | ||
| new: "$REQUEST_ID_LIST", | ||
| }, | ||
| { | ||
| old: "%IMP_ID_LIST%", | ||
| new: "$IMP_ID_LIST", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "poll_for_updates.query", | ||
| params: []QueryParamMigration{ | ||
| { | ||
| old: "$1", | ||
| new: "$LAST_UPDATED", | ||
| }, | ||
| }, | ||
| }, | ||
|
There was a problem hiding this comment. I think we also need to migrate |
||
| }, | ||
| }, | ||
| { | ||
| old: "stored_video_req.postgres", | ||
| new: "stored_video_req.database", | ||
| fields: []string{ | ||
| "connection.dbname", | ||
| "connection.host", | ||
| "connection.port", | ||
| "connection.user", | ||
| "connection.password", | ||
| "fetcher.query", | ||
| "initialize_caches.timeout_ms", | ||
| "initialize_caches.query", | ||
| "poll_for_updates.refresh_rate_seconds", | ||
| "poll_for_updates.timeout_ms", | ||
| "poll_for_updates.query", | ||
| }, | ||
| queries: []QueryMigration{}, | ||
| }, | ||
| { | ||
| old: "stored_responses.postgres", | ||
| new: "stored_responses.database", | ||
| fields: []string{ | ||
| "connection.dbname", | ||
| "connection.host", | ||
| "connection.port", | ||
| "connection.user", | ||
| "connection.password", | ||
| "fetcher.query", | ||
| "initialize_caches.timeout_ms", | ||
| "initialize_caches.query", | ||
| "poll_for_updates.refresh_rate_seconds", | ||
| "poll_for_updates.timeout_ms", | ||
| "poll_for_updates.query", | ||
| }, | ||
| queries: []QueryMigration{ | ||
| { | ||
| name: "fetcher.query", | ||
| params: []QueryParamMigration{ | ||
| { | ||
| old: "%ID_LIST%", | ||
| new: "$ID_LIST", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, migration := range migrations { | ||
|
There was a problem hiding this comment. Also, I'm wondering if this function should instead only choose @VeronikaSolovei9 thoughts? There was a problem hiding this comment. Good point! Yes, "new" config should be used if it's specified. |
||
| driverField := migration.new + ".connection.driver" | ||
| if !v.IsSet(migration.new) && v.IsSet(migration.old) { | ||
| glog.Warning(fmt.Sprintf("%s is deprecated and should be changed to %s", migration.old, migration.new)) | ||
| glog.Warning(fmt.Sprintf("%s is not set, using default (postgres)", driverField)) | ||
| v.Set(driverField, "postgres") | ||
|
|
||
| for _, field := range migration.fields { | ||
| oldField := migration.old + "." + field | ||
| newField := migration.new + "." + field | ||
| if v.IsSet(oldField) { | ||
| glog.Warning(fmt.Sprintf("%s is deprecated and should be changed to %s", oldField, newField)) | ||
| v.Set(newField, v.Get(oldField)) | ||
| } | ||
| } | ||
|
|
||
| for _, query := range migration.queries { | ||
| oldQueryField := migration.old + "." + query.name | ||
| newQueryField := migration.new + "." + query.name | ||
| queryString := v.GetString(oldQueryField) | ||
| for _, queryParam := range query.params { | ||
| if strings.Contains(queryString, queryParam.old) { | ||
| glog.Warning(fmt.Sprintf("Query param %s for %s is deprecated and should be changed to %s", queryParam.old, oldQueryField, queryParam.new)) | ||
| queryString = strings.ReplaceAll(queryString, queryParam.old, queryParam.new) | ||
| v.Set(newQueryField, queryString) | ||
| } | ||
| } | ||
| } | ||
| } else if v.IsSet(migration.new) && v.IsSet(migration.old) { | ||
| glog.Warning(fmt.Sprintf("using %s and ignoring deprecated %s", migration.new, migration.old)) | ||
|
|
||
| for _, field := range migration.fields { | ||
| oldField := migration.old + "." + field | ||
| newField := migration.new + "." + field | ||
| if v.IsSet(oldField) { | ||
| glog.Warning(fmt.Sprintf("using %s and ignoring deprecated %s", newField, oldField)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func setBidderDefaults(v *viper.Viper, bidder string) { | ||
| adapterCfgPrefix := "adapters." + bidder | ||
| v.BindEnv(adapterCfgPrefix+".disabled", "") | ||
|
|
||
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.
I think we also need to migrate
fetcher.amp_querywhich should have the same parameters asfetcher.query.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.
Updated.