Skip to content

Upstream PR #4707: Cookie Sync: Allow turning off sync for specific adapter (#4707) #130

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.

Sign up for GitHub

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

Open
openads-sync-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upstream PR #4707: Cookie Sync: Allow turning off sync for specific adapter (#4707) #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/bidderinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,8 +803,8 @@ func (s *Syncer) Override(original *Syncer) *Syncer {
copy.ExternalURL = s.ExternalURL
}

if s.SupportCORS != nil {
copy.SupportCORS = s.SupportCORS
if s.Enabled != nil {
copy.Enabled = s.Enabled
}

return &copy
Expand Down
24 changes: 24 additions & 0 deletions config/bidderinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,6 +1479,30 @@ func TestSyncerOverride(t *testing.T) {
givenOverride: &Syncer{ExternalURL: "overrideExternalURL"},
expected: &Syncer{Key: "originalKey", ExternalURL: "overrideExternalURL"},
},
{
description: "Override Enabled - True To False",
givenOriginal: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(true)},
givenOverride: &Syncer{Enabled: ptrutil.ToPtr(false)},
expected: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(false)},
},
{
description: "Override Enabled - False To True",
givenOriginal: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(false)},
givenOverride: &Syncer{Enabled: ptrutil.ToPtr(true)},
expected: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(true)},
},
{
description: "Override Enabled - Nil Preserves Original",
givenOriginal: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(true)},
givenOverride: &Syncer{},
expected: &Syncer{Key: "originalKey", Enabled: ptrutil.ToPtr(true)},
},
{
description: "Override Enabled - Set On Nil Original",
givenOriginal: nil,
givenOverride: &Syncer{Enabled: ptrutil.ToPtr(false)},
expected: &Syncer{Enabled: ptrutil.ToPtr(false)},
},
}

for _, test := range testCases {
Expand Down
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,7 @@ func setBidderDefaults(v *viper.Viper, bidder string) {
v.BindEnv(adapterCfgPrefix + ".openrtb.version")
v.BindEnv(adapterCfgPrefix + ".openrtb.gpp-supported")

v.BindEnv(adapterCfgPrefix + ".usersync.enabled")
v.BindEnv(adapterCfgPrefix + ".usersync.key")
v.BindEnv(adapterCfgPrefix + ".usersync.default")
v.BindEnv(adapterCfgPrefix + ".usersync.iframe.url")
Expand Down
9 changes: 8 additions & 1 deletion config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,11 +1048,18 @@ func TestUserSyncFromEnv(t *testing.T) {
defer os.Unsetenv("PBS_ADAPTERS_BIDDER2_USERSYNC_IFRAME_URL")
}

if oldval, ok := os.LookupEnv("PBS_ADAPTERS_BIDDER2_USERSYNC_ENABLED"); ok {
defer os.Setenv("PBS_ADAPTERS_BIDDER2_USERSYNC_ENABLED", oldval)
} else {
defer os.Unsetenv("PBS_ADAPTERS_BIDDER2_USERSYNC_ENABLED")
}

// set new
os.Setenv("PBS_ADAPTERS_BIDDER1_USERSYNC_REDIRECT_URL", "http://some.url/sync?redirect={{.RedirectURL}}")
os.Setenv("PBS_ADAPTERS_BIDDER1_USERSYNC_REDIRECT_USER_MACRO", "[UID]")
os.Setenv("PBS_ADAPTERS_BIDDER1_USERSYNC_SUPPORT_CORS", "true")
os.Setenv("PBS_ADAPTERS_BIDDER2_USERSYNC_IFRAME_URL", "http://somedifferent.url/sync?redirect={{.RedirectURL}}")
os.Setenv("PBS_ADAPTERS_BIDDER2_USERSYNC_ENABLED", "false")

cfg, _ := newDefaultConfig(t)

Expand All @@ -1063,7 +1070,7 @@ func TestUserSyncFromEnv(t *testing.T) {

assert.Equal(t, "http://somedifferent.url/sync?redirect={{.RedirectURL}}", cfg.BidderInfos["bidder2"].Syncer.IFrame.URL)
assert.Nil(t, cfg.BidderInfos["bidder2"].Syncer.Redirect)
assert.Nil(t, cfg.BidderInfos["bidder2"].Syncer.SupportCORS)
assert.Equal(t, ptrutil.ToPtr(false), cfg.BidderInfos["bidder2"].Syncer.Enabled)
}

func TestBidderInfoFromEnv(t *testing.T) {
Expand Down
Loading