From e3e8705f7a32070cf4f674e0e9b3e19670518b03 Mon Sep 17 00:00:00 2001 From: Scott Kay Date: Fri, 18 Nov 2022 11:05:22 -0500 Subject: [PATCH 1/2] Upgrade Messages For Legacy Bidder Params Location --- adapters/33across/params_test.go | 2 +- adapters/adf/params_test.go | 2 +- adapters/admixer/params_test.go | 5 ++-- adapters/adnuntius/params_test.go | 2 +- adapters/adot/params_test.go | 2 +- adapters/adtarget/params_test.go | 2 +- adapters/adtelligent/params_test.go | 2 +- adapters/adyoulike/params_test.go | 2 +- adapters/apacdex/params_test.go | 2 +- adapters/appnexus/appnexus.go | 2 +- adapters/appnexus/params_test.go | 2 +- adapters/axonix/params_test.go | 2 +- adapters/between/params_test.go | 2 +- adapters/brightroll/params_test.go | 2 +- adapters/consumable/params_test.go | 2 +- adapters/cpmstar/params_test.go | 2 +- adapters/criteo/params_test.go | 2 +- adapters/dianomi/params_test.go | 2 +- adapters/gamma/params_test.go | 2 +- adapters/gamoshi/params_test.go | 2 +- adapters/lockerdome/params_test.go | 2 +- adapters/madvertise/params_test.go | 2 +- adapters/marsmedia/params_test.go | 2 +- adapters/nanointeractive/params_test.go | 2 +- adapters/openweb/params_test.go | 2 +- adapters/openx/params_test.go | 2 +- adapters/operaads/params_test.go | 2 +- adapters/orbidder/params_test.go | 5 ++-- adapters/pubmatic/params_test.go | 2 +- adapters/smartadserver/params_test.go | 2 +- adapters/smilewanted/params_test.go | 2 +- adapters/sonobi/params_test.go | 5 ++-- adapters/synacormedia/params_test.go | 2 +- adapters/telaria/telaria.go | 6 ++-- adapters/ucfunnel/params_test.go | 5 ++-- adapters/videobyte/params_test.go | 2 +- adapters/vidoomy/params_test.go | 2 +- adapters/vrtcal/params_test.go | 2 +- adapters/yieldlab/params_test.go | 2 +- adapters/yieldmo/params_test.go | 2 +- endpoints/openrtb2/auction.go | 6 ++-- endpoints/openrtb2/auction_test.go | 28 +++++++++---------- .../disabled/bad/bad-bidder.json | 2 +- .../invalid-whole/imp-ext-empty.json | 2 +- .../invalid-whole/imp-ext-invalid-params.json | 2 +- .../invalid-whole/imp-ext-unknown-bidder.json | 2 +- openrtb_ext/bidders.go | 2 +- openrtb_ext/imp_33across.go | 2 +- openrtb_ext/imp_adkernel.go | 2 +- openrtb_ext/imp_adkernelAdn.go | 2 +- openrtb_ext/imp_adtarget.go | 2 +- openrtb_ext/imp_adtelligent.go | 2 +- openrtb_ext/imp_adtrgtme.go | 2 +- openrtb_ext/imp_adyoulike.go | 2 +- openrtb_ext/imp_algorix.go | 2 +- openrtb_ext/imp_appnexus.go | 4 +-- openrtb_ext/imp_avocet.go | 2 +- openrtb_ext/imp_brightroll.go | 2 +- openrtb_ext/imp_consumable.go | 2 +- openrtb_ext/imp_criteo.go | 2 +- openrtb_ext/imp_datablocks.go | 2 +- openrtb_ext/imp_engagebdr.go | 2 +- openrtb_ext/imp_eplanning.go | 2 +- openrtb_ext/imp_gamma.go | 2 +- openrtb_ext/imp_gamoshi.go | 2 +- openrtb_ext/imp_grid.go | 2 +- openrtb_ext/imp_gumgum.go | 6 ++-- openrtb_ext/imp_impactify.go | 2 +- openrtb_ext/imp_ix.go | 2 +- openrtb_ext/imp_kayzen.go | 2 +- openrtb_ext/imp_kubient.go | 2 +- openrtb_ext/imp_lockerdome.go | 2 +- openrtb_ext/imp_madvertise.go | 2 +- openrtb_ext/imp_marsmedia.go | 2 +- openrtb_ext/imp_mgid.go | 2 +- openrtb_ext/imp_mobilefuse.go | 2 +- openrtb_ext/imp_nanointeractive.go | 2 +- openrtb_ext/imp_openweb.go | 2 +- openrtb_ext/imp_openx.go | 2 +- openrtb_ext/imp_orbidder.go | 2 +- openrtb_ext/imp_outbrain.go | 2 +- openrtb_ext/imp_pubmatic.go | 4 +-- openrtb_ext/imp_pulsepoint.go | 2 +- openrtb_ext/imp_rhythmone.go | 2 +- openrtb_ext/imp_rubicon.go | 6 ++-- openrtb_ext/imp_silvermob.go | 2 +- openrtb_ext/imp_smaato.go | 2 +- openrtb_ext/imp_smartadserver.go | 2 +- openrtb_ext/imp_smartyads.go | 2 +- openrtb_ext/imp_synacormedia.go | 2 +- openrtb_ext/imp_triplelift.go | 2 +- openrtb_ext/imp_ucfunnel.go | 2 +- openrtb_ext/imp_unicorn.go | 2 +- openrtb_ext/imp_verizonmedia.go | 2 +- openrtb_ext/imp_videobyte.go | 2 +- openrtb_ext/imp_vrtcal.go | 2 +- openrtb_ext/imp_yahoossp.go | 2 +- openrtb_ext/imp_yeahmobi.go | 2 +- openrtb_ext/imp_yieldlab.go | 2 +- openrtb_ext/imp_yieldmo.go | 2 +- openrtb_ext/imp_yieldone.go | 2 +- openrtb_ext/imp_zeroclickfraud.go | 2 +- stored_responses/stored_responses.go | 2 +- stored_responses/stored_responses_test.go | 2 +- 104 files changed, 135 insertions(+), 131 deletions(-) diff --git a/adapters/33across/params_test.go b/adapters/33across/params_test.go index 0c7cde18216..2d488c4148c 100644 --- a/adapters/33across/params_test.go +++ b/adapters/33across/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/33across.json // -// These also validate the format of the external API: request.imp[i].ext.33across +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.33across // TestValidParams makes sure that the 33across schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adf/params_test.go b/adapters/adf/params_test.go index d46c6528da0..0b05519df3b 100644 --- a/adapters/adf/params_test.go +++ b/adapters/adf/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/adf.json // -// These also validate the format of the external API: request.imp[i].ext.adf +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adf // TestValidParams makes sure that the adform schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/admixer/params_test.go b/adapters/admixer/params_test.go index 11f3feb0657..bfa75a4884f 100644 --- a/adapters/admixer/params_test.go +++ b/adapters/admixer/params_test.go @@ -2,13 +2,14 @@ package admixer import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" "testing" + + "github.com/prebid/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/admixer.json // -// These also validate the format of the external API: request.imp[i].ext.admixer +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.admixer // TestValidParams makes sure that the admixer schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adnuntius/params_test.go b/adapters/adnuntius/params_test.go index dd8fafc79a9..c3b42018340 100644 --- a/adapters/adnuntius/params_test.go +++ b/adapters/adnuntius/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/adnuntius.json -// These also validate the format of the external API: request.imp[i].ext.adnuntius +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adnuntius // TestValidParams makes sure that the adnuntius schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adot/params_test.go b/adapters/adot/params_test.go index bc458641694..6760419b470 100644 --- a/adapters/adot/params_test.go +++ b/adapters/adot/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/adot.json // -// These also validate the format of the external API: request.imp[i].ext.adot +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adot // TestValidParams makes sure that the adot schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adtarget/params_test.go b/adapters/adtarget/params_test.go index b128d11c9cf..4c39639fb7b 100644 --- a/adapters/adtarget/params_test.go +++ b/adapters/adtarget/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/adtarget.json -// These also validate the format of the external API: request.imp[i].ext.adtarget +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adtarget // TestValidParams makes sure that the adtarget schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adtelligent/params_test.go b/adapters/adtelligent/params_test.go index eb2aab0d437..227920b25b4 100644 --- a/adapters/adtelligent/params_test.go +++ b/adapters/adtelligent/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/adtelligent.json -// These also validate the format of the external API: request.imp[i].ext.adtelligent +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adtelligent // TestValidParams makes sure that the adtelligent schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/adyoulike/params_test.go b/adapters/adyoulike/params_test.go index b57264b3dbd..8aebaf2844e 100644 --- a/adapters/adyoulike/params_test.go +++ b/adapters/adyoulike/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/adyoulike.json // -// These also validate the format of the external API: request.imp[i].ext.adyoulike +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.adyoulike // TestValidParams makes sure that the adyoulike schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/apacdex/params_test.go b/adapters/apacdex/params_test.go index 2e5f626e16d..07d846506e5 100644 --- a/adapters/apacdex/params_test.go +++ b/adapters/apacdex/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/apacdex.json -// These also validate the format of the external API: request.imp[i].ext.apacdex +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.apacdex // TestValidParams makes sure that the Apacdex schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/appnexus/appnexus.go b/adapters/appnexus/appnexus.go index 6b0926bff33..4573aa994f0 100644 --- a/adapters/appnexus/appnexus.go +++ b/adapters/appnexus/appnexus.go @@ -132,7 +132,7 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E thisURI = appendMemberId(thisURI, memberId) if len(uniqueIds) > 1 { - errs = append(errs, fmt.Errorf("All request.imp[i].ext.appnexus.member params must match. Request contained: %v", uniqueIds)) + errs = append(errs, fmt.Errorf("All request.imp[i].ext.prebid.bidder.appnexus.member params must match. Request contained: %v", uniqueIds)) } } diff --git a/adapters/appnexus/params_test.go b/adapters/appnexus/params_test.go index f84cccc9a4c..4aea1b5a15a 100644 --- a/adapters/appnexus/params_test.go +++ b/adapters/appnexus/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/appnexus.json // -// These also validate the format of the external API: request.imp[i].ext.appnexus +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.appnexus // TestValidParams makes sure that the appnexus schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/axonix/params_test.go b/adapters/axonix/params_test.go index 22b17a862f0..d44fcd15e88 100644 --- a/adapters/axonix/params_test.go +++ b/adapters/axonix/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/axonix.json // -// These also validate the format of the external API: request.imp[i].ext.axonix +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.axonix // TestValidParams makes sure that the Axonix schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/between/params_test.go b/adapters/between/params_test.go index f0594c87f1d..1907084f9be 100644 --- a/adapters/between/params_test.go +++ b/adapters/between/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/between.json // -// These also validate the format of the external API: request.imp[i].ext.between +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.between // TestValidParams makes sure that the between schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/brightroll/params_test.go b/adapters/brightroll/params_test.go index beac822f8f0..c14ee6d73ff 100644 --- a/adapters/brightroll/params_test.go +++ b/adapters/brightroll/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/brightroll.json // -// These also validate the format of the external API: request.imp[i].ext.brightroll +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.brightroll // TestValidParams makes sure that the Brightroll schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/consumable/params_test.go b/adapters/consumable/params_test.go index 42de5cb9ca8..570b4128339 100644 --- a/adapters/consumable/params_test.go +++ b/adapters/consumable/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/consumable.json // -// These also validate the format of the external API: request.imp[i].ext.consumable +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.consumable // TestValidParams makes sure that the 33across schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/cpmstar/params_test.go b/adapters/cpmstar/params_test.go index cee471a8322..45b1fbefd96 100644 --- a/adapters/cpmstar/params_test.go +++ b/adapters/cpmstar/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/cpmstar.json -// These also validate the format of the external API: request.imp[i].ext.cpmstar +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.cpmstar // TestValidParams makes sure that the Cpmstar schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/criteo/params_test.go b/adapters/criteo/params_test.go index 9c836769aca..c373de0a83f 100644 --- a/adapters/criteo/params_test.go +++ b/adapters/criteo/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/criteo.json // -// These also validate the format of the external API: request.imp[i].ext.criteo +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.criteo // TestValidParams makes sure that the criteo schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/dianomi/params_test.go b/adapters/dianomi/params_test.go index 1d160b1975e..462d6d75edd 100644 --- a/adapters/dianomi/params_test.go +++ b/adapters/dianomi/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/dianomi.json // -// These also validate the format of the external API: request.imp[i].ext.dianomi +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.dianomi // TestValidParams makes sure that the dianomi schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/gamma/params_test.go b/adapters/gamma/params_test.go index 3329545a264..56f1b591190 100644 --- a/adapters/gamma/params_test.go +++ b/adapters/gamma/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/gamma.json // -// These also validate the format of the external API: request.imp[i].ext.brightroll +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.brightroll // TestValidParams makes sure that the Gamma schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/gamoshi/params_test.go b/adapters/gamoshi/params_test.go index 29a1864b9ae..b9659aaa68a 100644 --- a/adapters/gamoshi/params_test.go +++ b/adapters/gamoshi/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/gamoshi.json // -// These also validate the format of the external API: request.imp[i].ext.gamoshi +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.gamoshi // TestValidParams makes sure that the Gamoshi schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/lockerdome/params_test.go b/adapters/lockerdome/params_test.go index 815246571e3..c2c9185e374 100644 --- a/adapters/lockerdome/params_test.go +++ b/adapters/lockerdome/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file tests static/bidder-params/lockerdome.json -// and validates the format of the external API: request.imp[i].ext.lockerdome +// and validates the format of the external API: request.imp[i].ext.prebid.bidder.lockerdome // TestValidParams makes sure that the LockerDome schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/madvertise/params_test.go b/adapters/madvertise/params_test.go index 7c138bf48ac..4b73d57d43e 100644 --- a/adapters/madvertise/params_test.go +++ b/adapters/madvertise/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/Madvertise.json // -// These also validate the format of the external API: request.imp[i].ext.Madvertise +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.madvertise // TestValidParams makes sure that the Madvertise schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/marsmedia/params_test.go b/adapters/marsmedia/params_test.go index 4a91ed6dcaa..f78ad1c3dc4 100644 --- a/adapters/marsmedia/params_test.go +++ b/adapters/marsmedia/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/marsmedia.json // -// These also validate the format of the external API: request.imp[i].ext.marsmedia +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.marsmedia // TestValidParams makes sure that the Marsmedia schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/nanointeractive/params_test.go b/adapters/nanointeractive/params_test.go index b290f3d94b1..a50425c770b 100644 --- a/adapters/nanointeractive/params_test.go +++ b/adapters/nanointeractive/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/nanointeractive.json // -// These also validate the format of the external API: request.imp[i].ext.nanointeracive +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.nanointeracive // TestValidParams makes sure that the NanoInteractive schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/openweb/params_test.go b/adapters/openweb/params_test.go index 62bdaf9397e..df614df715f 100644 --- a/adapters/openweb/params_test.go +++ b/adapters/openweb/params_test.go @@ -8,7 +8,7 @@ import ( ) // This file actually intends to test static/bidder-params/openweb.json -// These also validate the format of the external API: request.imp[i].ext.openweb +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.openweb // TestValidParams makes sure that the openweb schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/openx/params_test.go b/adapters/openx/params_test.go index b7ea970ab1f..94775b57cb0 100644 --- a/adapters/openx/params_test.go +++ b/adapters/openx/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/openx.json // -// These also validate the format of the external API: request.imp[i].ext.openx +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.openx // TestValidParams makes sure that the openx schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/operaads/params_test.go b/adapters/operaads/params_test.go index e998127b001..57a60ce9c53 100644 --- a/adapters/operaads/params_test.go +++ b/adapters/operaads/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/operaads.json // -// These also validate the format of the external API: request.imp[i].ext.operaads +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.operaads // TestValidParams makes sure that the operaads schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/orbidder/params_test.go b/adapters/orbidder/params_test.go index 19c4ed8d9d4..2e130f7a9bd 100644 --- a/adapters/orbidder/params_test.go +++ b/adapters/orbidder/params_test.go @@ -2,13 +2,14 @@ package orbidder import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" "testing" + + "github.com/prebid/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/orbidder.json // -// These also validate the format of the external API: request.imp[i].ext.orbidder +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.orbidder // TestValidParams makes sure that the orbidder schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/pubmatic/params_test.go b/adapters/pubmatic/params_test.go index c8a300b9910..a5a7773f7af 100644 --- a/adapters/pubmatic/params_test.go +++ b/adapters/pubmatic/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/pubmatic.json // -// These also validate the format of the external API: request.imp[i].ext.pubmatic +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.pubmatic // TestValidParams makes sure that the pubmatic schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/smartadserver/params_test.go b/adapters/smartadserver/params_test.go index b424cbe0a1d..ec4a7f7ec6c 100644 --- a/adapters/smartadserver/params_test.go +++ b/adapters/smartadserver/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/smartadserver.json // -// These also validate the format of the external API: request.imp[i].ext.smartadserver +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.smartadserver // TestValidParams makes sure that the smartadserver schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/smilewanted/params_test.go b/adapters/smilewanted/params_test.go index 2ea032d6ff3..3217cafabab 100644 --- a/adapters/smilewanted/params_test.go +++ b/adapters/smilewanted/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/smilewanted.json // -// These also validate the format of the external API: request.imp[i].ext.smilewanted +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.smilewanted // TestValidParams makes sure that the smilewanted schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/sonobi/params_test.go b/adapters/sonobi/params_test.go index 3e9d63e8101..46c31015dae 100644 --- a/adapters/sonobi/params_test.go +++ b/adapters/sonobi/params_test.go @@ -2,13 +2,14 @@ package sonobi import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" "testing" + + "github.com/prebid/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/sonobi.json // -// These also validate the format of the external API: request.imp[i].ext.sonobi +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.sonobi // TestValidParams makes sure that the sonobi schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/synacormedia/params_test.go b/adapters/synacormedia/params_test.go index a216818e382..edb9a2a44b6 100644 --- a/adapters/synacormedia/params_test.go +++ b/adapters/synacormedia/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/synacormedia.json // -// These also validate the format of the external API: request.imp[i].ext.synacormedia +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.synacormedia // TestValidParams makes sure that the synacormedia schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/telaria/telaria.go b/adapters/telaria/telaria.go index ac0022552de..dbbcbc5d2ab 100644 --- a/adapters/telaria/telaria.go +++ b/adapters/telaria/telaria.go @@ -19,7 +19,7 @@ type TelariaAdapter struct { URI string } -// This will be part of Imp[i].Ext when this adapter calls out the Telaria Ad Server +// This will be part of imp[i].ext when this adapter calls out the Telaria Ad Server type ImpressionExtOut struct { OriginalTagID string `json:"originalTagid"` OriginalPublisherID string `json:"originalPublisherid"` @@ -186,7 +186,7 @@ func (a *TelariaAdapter) MakeRequests(requestIn *openrtb2.BidRequest, reqInfo *a var err error var imp = request.Imp[0] - // fetch adCode & seatCode from Imp[i].Ext + // fetch adCode & seatCode from imp[i].ext telariaImpExt, err = a.FetchTelariaExtImpParams(&imp) if err != nil { return nil, []error{err} @@ -194,7 +194,7 @@ func (a *TelariaAdapter) MakeRequests(requestIn *openrtb2.BidRequest, reqInfo *a seatCode = telariaImpExt.SeatCode - // move the original tagId and the original publisher.id into the Imp[i].Ext object + // move the original tagId and the original publisher.id into the imp[i].ext object imp.Ext, err = json.Marshal(&ImpressionExtOut{imp.TagID, originalPublisherID}) if err != nil { return nil, []error{err} diff --git a/adapters/ucfunnel/params_test.go b/adapters/ucfunnel/params_test.go index 4faec8739da..b721925e72a 100644 --- a/adapters/ucfunnel/params_test.go +++ b/adapters/ucfunnel/params_test.go @@ -2,13 +2,14 @@ package ucfunnel import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" "testing" + + "github.com/prebid/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/ucfunnel.json // -// These also validate the format of the external API: request.imp[i].ext.ucfunnel +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.ucfunnel // TestValidParams makes sure that the ucfunnel schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/videobyte/params_test.go b/adapters/videobyte/params_test.go index fa38836b03a..b638d4585c6 100644 --- a/adapters/videobyte/params_test.go +++ b/adapters/videobyte/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/videobyte.json // -// These also validate the format of the external API: request.imp[i].ext.videobyte +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.videobyte // TestValidParams makes sure that the videobyte schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/vidoomy/params_test.go b/adapters/vidoomy/params_test.go index d910b654a3e..63ffb462c19 100644 --- a/adapters/vidoomy/params_test.go +++ b/adapters/vidoomy/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/vidoomy.json // -// These also validate the format of the external API: request.imp[i].ext.vidoomy +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.vidoomy // TestValidParams makes sure that the vidoomy schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/vrtcal/params_test.go b/adapters/vrtcal/params_test.go index ba57b6d82f8..d45d3b39013 100644 --- a/adapters/vrtcal/params_test.go +++ b/adapters/vrtcal/params_test.go @@ -12,7 +12,7 @@ import ( // This file actually intends to test static/bidder-params/vrtcal.json // -// These also validate the format of the external API: request.imp[i].ext.vrtcal +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.vrtcal // TestValidParams makes sure that the Vrtcal schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params") diff --git a/adapters/yieldlab/params_test.go b/adapters/yieldlab/params_test.go index 5414a21c56c..ed0d2863629 100644 --- a/adapters/yieldlab/params_test.go +++ b/adapters/yieldlab/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/yieldlab.json // -// These also validate the format of the external API: request.imp[i].ext.yieldlab +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.yieldlab // TestValidParams makes sure that the yieldlab schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/adapters/yieldmo/params_test.go b/adapters/yieldmo/params_test.go index 0a8fe2d10f1..d94c7ff035b 100644 --- a/adapters/yieldmo/params_test.go +++ b/adapters/yieldmo/params_test.go @@ -9,7 +9,7 @@ import ( // This file actually intends to test static/bidder-params/yieldmo.json // -// These also validate the format of the external API: request.imp[i].ext.yieldmo +// These also validate the format of the external API: request.imp[i].ext.prebid.bidder.yieldmo // TestValidParams makes sure that the Yieldmo schema accepts all imp.ext fields which we intend to support. func TestValidParams(t *testing.T) { diff --git a/endpoints/openrtb2/auction.go b/endpoints/openrtb2/auction.go index 0111c347c12..7ce1f1a41d8 100644 --- a/endpoints/openrtb2/auction.go +++ b/endpoints/openrtb2/auction.go @@ -1239,7 +1239,7 @@ func (deps *endpointDeps) validateImpExt(imp *openrtb_ext.ImpWrapper, aliases ma if coreBidderNormalized, isValid := deps.bidderMap[coreBidder]; isValid { if err := deps.paramsValidator.Validate(coreBidderNormalized, ext); err != nil { - return []error{fmt.Errorf("request.imp[%d].ext.%s failed validation.\n%v", impIndex, bidder, err)} + return []error{fmt.Errorf("request.imp[%d].ext.prebid.bidder.%s failed validation.\n%v", impIndex, bidder, err)} } } else { if msg, isDisabled := deps.disabledBidders[bidder]; isDisabled { @@ -1247,13 +1247,13 @@ func (deps *endpointDeps) validateImpExt(imp *openrtb_ext.ImpWrapper, aliases ma delete(prebid.Bidder, bidder) prebidModified = true } else { - return []error{fmt.Errorf("request.imp[%d].ext contains unknown bidder: %s. Did you forget an alias in request.ext.prebid.aliases?", impIndex, bidder)} + return []error{fmt.Errorf("request.imp[%d].ext.prebid.bidder contains unknown bidder: %s. Did you forget an alias in request.ext.prebid.aliases?", impIndex, bidder)} } } } if len(prebid.Bidder) == 0 { - errL = append(errL, fmt.Errorf("request.imp[%d].ext must contain at least one bidder", impIndex)) + errL = append(errL, fmt.Errorf("request.imp[%d].ext.prebid.bidder must contain at least one bidder", impIndex)) return errL } diff --git a/endpoints/openrtb2/auction_test.go b/endpoints/openrtb2/auction_test.go index bf8b4d12617..c95df18f53f 100644 --- a/endpoints/openrtb2/auction_test.go +++ b/endpoints/openrtb2/auction_test.go @@ -2193,37 +2193,37 @@ func TestValidateImpExt(t *testing.T) { description: "Unknown Bidder only", impExt: json.RawMessage(`{"unknownbidder":{"placement_id":555}}`), expectedImpExt: `{"unknownbidder":{"placement_id":555}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Unknown Prebid Ext Bidder only", impExt: json.RawMessage(`{"prebid":{"bidder":{"unknownbidder":{"placement_id":555}}}}`), expectedImpExt: `{"prebid":{"bidder":{"unknownbidder":{"placement_id":555}}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Unknown Prebid Ext Bidder + First Party Data Context", impExt: json.RawMessage(`{"prebid":{"bidder":{"unknownbidder":{"placement_id":555}}},"context":{"data":{"keywords":"prebid server example"}}}`), expectedImpExt: `{"prebid":{"bidder":{"unknownbidder":{"placement_id":555}}},"context":{"data":{"keywords":"prebid server example"}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Unknown Bidder + First Party Data Context", impExt: json.RawMessage(`{"unknownbidder":{"placement_id":555} ,"context":{"data":{"keywords":"prebid server example"}}}`), expectedImpExt: `{"unknownbidder":{"placement_id":555},"context":{"data":{"keywords":"prebid server example"}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Unknown Bidder + Disabled Bidder", impExt: json.RawMessage(`{"unknownbidder":{"placement_id":555},"disabledbidder":{"foo":"bar"}}`), expectedImpExt: `{"unknownbidder":{"placement_id":555},"disabledbidder":{"foo":"bar"}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Unknown Bidder + Disabled Prebid Ext Bidder", impExt: json.RawMessage(`{"unknownbidder":{"placement_id":555},"prebid":{"bidder":{"disabledbidder":{"foo":"bar"}}}}`), expectedImpExt: `{"unknownbidder":{"placement_id":555},"prebid":{"bidder":{"disabledbidder":{"foo":"bar"}}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, }, }, @@ -2236,7 +2236,7 @@ func TestValidateImpExt(t *testing.T) { expectedImpExt: `{"disabledbidder":{"foo":"bar"}}`, expectedErrs: []error{ &errortypes.BidderTemporarilyDisabled{Message: "The bidder 'disabledbidder' has been disabled."}, - errors.New("request.imp[0].ext must contain at least one bidder"), + errors.New("request.imp[0].ext.prebid.bidder must contain at least one bidder"), }, // if only bidder(s) found in request.imp[x].ext.{biddername} or request.imp[x].ext.prebid.bidder.{biddername} are disabled, return error }, @@ -2246,7 +2246,7 @@ func TestValidateImpExt(t *testing.T) { expectedImpExt: `{"prebid":{"bidder":{"disabledbidder":{"foo":"bar"}}}}`, expectedErrs: []error{ &errortypes.BidderTemporarilyDisabled{Message: "The bidder 'disabledbidder' has been disabled."}, - errors.New("request.imp[0].ext must contain at least one bidder"), + errors.New("request.imp[0].ext.prebid.bidder must contain at least one bidder"), }, }, { @@ -2255,7 +2255,7 @@ func TestValidateImpExt(t *testing.T) { expectedImpExt: `{"disabledbidder":{"foo":"bar"},"context":{"data":{"keywords":"prebid server example"}}}`, expectedErrs: []error{ &errortypes.BidderTemporarilyDisabled{Message: "The bidder 'disabledbidder' has been disabled."}, - errors.New("request.imp[0].ext must contain at least one bidder"), + errors.New("request.imp[0].ext.prebid.bidder must contain at least one bidder"), }, }, { @@ -2264,7 +2264,7 @@ func TestValidateImpExt(t *testing.T) { expectedImpExt: `{"prebid":{"bidder":{"disabledbidder":{"foo":"bar"}}},"context":{"data":{"keywords":"prebid server example"}}}`, expectedErrs: []error{ &errortypes.BidderTemporarilyDisabled{Message: "The bidder 'disabledbidder' has been disabled."}, - errors.New("request.imp[0].ext must contain at least one bidder"), + errors.New("request.imp[0].ext.prebid.bidder must contain at least one bidder"), }, }, }, @@ -2277,7 +2277,7 @@ func TestValidateImpExt(t *testing.T) { impExt: json.RawMessage(`{"context":{"data":{"keywords":"prebid server example"}}}`), expectedImpExt: `{"context":{"data":{"keywords":"prebid server example"}}}`, expectedErrs: []error{ - errors.New("request.imp[0].ext must contain at least one bidder"), + errors.New("request.imp[0].ext.prebid.bidder must contain at least one bidder"), }, }, }, @@ -2313,7 +2313,7 @@ func TestValidateImpExt(t *testing.T) { description: "Valid Bidder + Unknown Bidder", impExt: json.RawMessage(`{"appnexus":{"placement_id":555},"unknownbidder":{"placement_id":555}}`), expectedImpExt: `{"appnexus":{"placement_id":555},"unknownbidder":{"placement_id":555}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Valid Bidder + Disabled Bidder", @@ -2331,7 +2331,7 @@ func TestValidateImpExt(t *testing.T) { description: "Valid Bidder + Disabled Bidder + Unknown Bidder + First Party Data Context", impExt: json.RawMessage(`{"appnexus":{"placement_id":555},"disabledbidder":{"foo":"bar"},"unknownbidder":{"placement_id":555},"context":{"data":{"keywords":"prebid server example"}}}`), expectedImpExt: `{"appnexus":{"placement_id":555},"disabledbidder":{"foo":"bar"},"unknownbidder":{"placement_id":555},"context":{"data":{"keywords":"prebid server example"}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Valid Prebid Ext Bidder + Disabled Bidder Ext", @@ -2349,7 +2349,7 @@ func TestValidateImpExt(t *testing.T) { description: "Valid Prebid Ext Bidder + Disabled Ext Bidder + Unknown Ext + First Party Data Context", impExt: json.RawMessage(`{"prebid":{"bidder":{"appnexus":{"placement_id":555},"disabledbidder":{"foo":"bar"},"unknownbidder":{"placement_id":555}}},"context":{"data":{"keywords":"prebid server example"}}}`), expectedImpExt: `{"prebid":{"bidder":{"appnexus":{"placement_id":555},"disabledbidder":{"foo":"bar"},"unknownbidder":{"placement_id":555}}},"context":{"data":{"keywords":"prebid server example"}}}`, - expectedErrs: []error{errors.New("request.imp[0].ext contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrs: []error{errors.New("request.imp[0].ext.prebid.bidder contains unknown bidder: unknownbidder. Did you forget an alias in request.ext.prebid.aliases?")}, }, }, }, diff --git a/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json b/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json index 91e760ee41e..c871110ee04 100644 --- a/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json +++ b/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json @@ -25,5 +25,5 @@ ] }, "expectedReturnCode": 400, - "expectedErrorMessage": "Invalid request: Bidder \"appnexus\" has been disabled on this instance of Prebid Server. Please work with the PBS host to enable this bidder again.\nInvalid request: request.imp[0].ext must contain at least one bidder\n" + "expectedErrorMessage": "Invalid request: Bidder \"appnexus\" has been disabled on this instance of Prebid Server. Please work with the PBS host to enable this bidder again.\nInvalid request: request.imp[0].ext.prebid.bidder must contain at least one bidder\n" } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-empty.json index 6c60ed5def2..d4b8cdcfca4 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-empty.json @@ -18,5 +18,5 @@ } }, "expectedReturnCode": 400, - "expectedErrorMessage": "Invalid request: request.imp[0].ext must contain at least one bidder\n" + "expectedErrorMessage": "Invalid request: request.imp[0].ext.prebid.bidder must contain at least one bidder\n" } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-invalid-params.json b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-invalid-params.json index 1363eefbe22..11df84b2035 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-invalid-params.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-invalid-params.json @@ -23,5 +23,5 @@ } }, "expectedReturnCode": 400, - "expectedErrorMessage": "Invalid request: request.imp[0].ext.appnexus failed validation.\n(root): Invalid type. Expected: object, given: string\n" + "expectedErrorMessage": "Invalid request: request.imp[0].ext.prebid.bidder.appnexus failed validation.\n(root): Invalid type. Expected: object, given: string\n" } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-unknown-bidder.json b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-unknown-bidder.json index 9f5a45c861d..8a7b7932179 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-unknown-bidder.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/imp-ext-unknown-bidder.json @@ -22,5 +22,5 @@ } }, "expectedReturnCode": 400, - "expectedErrorMessage": "Invalid request: request.imp[0].ext contains unknown bidder: noBidderShouldEverHaveThisName. Did you forget an alias in request.ext.prebid.aliases?\n" + "expectedErrorMessage": "Invalid request: request.imp[0].ext.prebid.bidder contains unknown bidder: noBidderShouldEverHaveThisName. Did you forget an alias in request.ext.prebid.aliases?\n" } diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index b4baf3d7f4b..cc626789a65 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -461,7 +461,7 @@ func NormalizeBidderName(name string) (BidderName, bool) { return bidderName, exists } -// The BidderParamValidator is used to enforce bidrequest.imp[i].ext.{anyBidder} values. +// The BidderParamValidator is used to enforce bidrequest.imp[i].ext.prebid.bidder.{anyBidder} values. // // This is treated differently from the other types because we rely on JSON-schemas to validate bidder params. type BidderParamValidator interface { diff --git a/openrtb_ext/imp_33across.go b/openrtb_ext/imp_33across.go index 23a874d95e7..3a46fab497f 100644 --- a/openrtb_ext/imp_33across.go +++ b/openrtb_ext/imp_33across.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImp33across defines the contract for bidrequest.imp[i].ext.33across +// ExtImp33across defines the contract for bidrequest.imp[i].ext.prebid.bidder.33across type ExtImp33across struct { SiteId string `json:"siteId"` ZoneId string `json:"zoneId,omitempty"` diff --git a/openrtb_ext/imp_adkernel.go b/openrtb_ext/imp_adkernel.go index d54149fe585..a286cfc4946 100644 --- a/openrtb_ext/imp_adkernel.go +++ b/openrtb_ext/imp_adkernel.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAdkernel defines the contract for bidrequest.imp[i].ext.adkernel +// ExtImpAdkernel defines the contract for bidrequest.imp[i].ext.prebid.bidder.adkernel type ExtImpAdkernel struct { ZoneId int `json:"zoneId"` } diff --git a/openrtb_ext/imp_adkernelAdn.go b/openrtb_ext/imp_adkernelAdn.go index fee22318045..d2d0369ad19 100644 --- a/openrtb_ext/imp_adkernelAdn.go +++ b/openrtb_ext/imp_adkernelAdn.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAdkernelAdn defines the contract for bidrequest.imp[i].ext.adkernelAdn +// ExtImpAdkernelAdn defines the contract for bidrequest.imp[i].ext.prebid.bidder.adkernelAdn type ExtImpAdkernelAdn struct { PublisherID int `json:"pubId"` } diff --git a/openrtb_ext/imp_adtarget.go b/openrtb_ext/imp_adtarget.go index a8ac70a17d1..ab6cb5642c6 100644 --- a/openrtb_ext/imp_adtarget.go +++ b/openrtb_ext/imp_adtarget.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAdtarget defines the contract for bidrequest.imp[i].ext.adtarget +// ExtImpAdtarget defines the contract for bidrequest.imp[i].ext.prebid.bidder.adtarget type ExtImpAdtarget struct { SourceId int `json:"aid"` PlacementId int `json:"placementId,omitempty"` diff --git a/openrtb_ext/imp_adtelligent.go b/openrtb_ext/imp_adtelligent.go index 43e65337f60..c2233209352 100644 --- a/openrtb_ext/imp_adtelligent.go +++ b/openrtb_ext/imp_adtelligent.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAdtelligent defines the contract for bidrequest.imp[i].ext.adtelligent +// ExtImpAdtelligent defines the contract for bidrequest.imp[i].ext.prebid.bidder.adtelligent type ExtImpAdtelligent struct { SourceId int `json:"aid"` PlacementId int `json:"placementId,omitempty"` diff --git a/openrtb_ext/imp_adtrgtme.go b/openrtb_ext/imp_adtrgtme.go index f44daae1367..8f4e575493d 100644 --- a/openrtb_ext/imp_adtrgtme.go +++ b/openrtb_ext/imp_adtrgtme.go @@ -1,4 +1,4 @@ package openrtb_ext -// ExtImpAdtrgtme defines the contract for bidrequest.imp[i].ext.adtrgtme +// ExtImpAdtrgtme defines the contract for bidrequest.imp[i].ext.prebid.bidder.adtrgtme type ExtImpAdtrgtme struct{} diff --git a/openrtb_ext/imp_adyoulike.go b/openrtb_ext/imp_adyoulike.go index 67a94123734..a28227efdc6 100644 --- a/openrtb_ext/imp_adyoulike.go +++ b/openrtb_ext/imp_adyoulike.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAdyoulike defines the contract for bidrequest.imp[i].ext.adyoulike +// ExtImpAdyoulike defines the contract for bidrequest.imp[i].ext.prebid.bidder.adyoulike type ExtImpAdyoulike struct { // placementId, only mandatory field PlacementId string `json:"placement"` diff --git a/openrtb_ext/imp_algorix.go b/openrtb_ext/imp_algorix.go index d395600c159..15475b550d4 100644 --- a/openrtb_ext/imp_algorix.go +++ b/openrtb_ext/imp_algorix.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAlgoriX defines the contract for bidrequest.imp[i].ext.algorix +// ExtImpAlgoriX defines the contract for bidrequest.imp[i].ext.prebid.bidder.algorix type ExtImpAlgorix struct { Sid string `json:"sid"` Token string `json:"token"` diff --git a/openrtb_ext/imp_appnexus.go b/openrtb_ext/imp_appnexus.go index 83d762b3c19..a956a05f16c 100644 --- a/openrtb_ext/imp_appnexus.go +++ b/openrtb_ext/imp_appnexus.go @@ -2,7 +2,7 @@ package openrtb_ext import "encoding/json" -// ExtImpAppnexus defines the contract for bidrequest.imp[i].ext.appnexus +// ExtImpAppnexus defines the contract for bidrequest.imp[i].ext.prebid.bidder.appnexus type ExtImpAppnexus struct { LegacyPlacementId int `json:"placementId"` LegacyInvCode string `json:"invCode"` @@ -20,7 +20,7 @@ type ExtImpAppnexus struct { AdPodId bool `json:"generate_ad_pod_id"` } -// ExtImpAppnexusKeyVal defines the contract for bidrequest.imp[i].ext.appnexus.keywords[i] +// ExtImpAppnexusKeyVal defines the contract for bidrequest.imp[i].ext.prebid.bidder.appnexus.keywords[i] type ExtImpAppnexusKeyVal struct { Key string `json:"key,omitempty"` Values []string `json:"value,omitempty"` diff --git a/openrtb_ext/imp_avocet.go b/openrtb_ext/imp_avocet.go index 7c9ca8c6eed..4f361cdd271 100644 --- a/openrtb_ext/imp_avocet.go +++ b/openrtb_ext/imp_avocet.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpAvocet defines the contract for bidrequest.imp[i].ext.avocet +// ExtImpAvocet defines the contract for bidrequest.imp[i].ext.prebid.bidder.avocet type ExtImpAvocet struct { Placement string `json:"placement,omitempty"` PlacementCode string `json:"placement_code,omitempty"` diff --git a/openrtb_ext/imp_brightroll.go b/openrtb_ext/imp_brightroll.go index 9d396f4a858..bd42d4aae5d 100644 --- a/openrtb_ext/imp_brightroll.go +++ b/openrtb_ext/imp_brightroll.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpBrightroll defines the contract for bidrequest.imp[i].ext.brightroll +// ExtImpBrightroll defines the contract for bidrequest.imp[i].ext.prebid.bidder.brightroll type ExtImpBrightroll struct { Publisher string `json:"publisher"` } diff --git a/openrtb_ext/imp_consumable.go b/openrtb_ext/imp_consumable.go index 09601630d3d..fe916b09972 100644 --- a/openrtb_ext/imp_consumable.go +++ b/openrtb_ext/imp_consumable.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpConsumable defines the contract for bidrequest.imp[i].ext.consumable +// ExtImpConsumable defines the contract for bidrequest.imp[i].ext.prebid.bidder.consumable type ExtImpConsumable struct { NetworkId int `json:"networkId,omitempty"` SiteId int `json:"siteId,omitempty"` diff --git a/openrtb_ext/imp_criteo.go b/openrtb_ext/imp_criteo.go index e200aace496..66726fb5dda 100644 --- a/openrtb_ext/imp_criteo.go +++ b/openrtb_ext/imp_criteo.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpCriteo defines the contract for bidrequest.imp[i].ext.criteo +// ExtImpCriteo defines the contract for bidrequest.imp[i].ext.prebid.bidder.criteo type ExtImpCriteo struct { ZoneID int64 `json:"zoneId"` NetworkID int64 `json:"networkId"` diff --git a/openrtb_ext/imp_datablocks.go b/openrtb_ext/imp_datablocks.go index fdb5dd398d4..c8659d3ff11 100644 --- a/openrtb_ext/imp_datablocks.go +++ b/openrtb_ext/imp_datablocks.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpDatablocks defines the contract for bidrequest.imp[i].ext.datablocks +// ExtImpDatablocks defines the contract for bidrequest.imp[i].ext.prebid.bidder.datablocks type ExtImpDatablocks struct { SourceId int `json:"sourceId"` Host string `json:"host"` diff --git a/openrtb_ext/imp_engagebdr.go b/openrtb_ext/imp_engagebdr.go index 14cb444c040..db500111a78 100644 --- a/openrtb_ext/imp_engagebdr.go +++ b/openrtb_ext/imp_engagebdr.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpEngageBDR defines the contract for bidrequest.imp[i].ext.engagebdr +// ExtImpEngageBDR defines the contract for bidrequest.imp[i].ext.prebid.bidder.engagebdr type ExtImpEngageBDR struct { Sspid string `json:"sspid"` } diff --git a/openrtb_ext/imp_eplanning.go b/openrtb_ext/imp_eplanning.go index ef0e4f2ba89..ea6cfccf436 100644 --- a/openrtb_ext/imp_eplanning.go +++ b/openrtb_ext/imp_eplanning.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpEPlanning defines the contract for bidrequest.imp[i].ext.eplanning +// ExtImpEPlanning defines the contract for bidrequest.imp[i].ext.prebid.bidder.eplanning type ExtImpEPlanning struct { ClientID string `json:"ci"` AdUnitCode string `json:"adunit_code"` diff --git a/openrtb_ext/imp_gamma.go b/openrtb_ext/imp_gamma.go index b9547c75f47..cb7a9df2b96 100644 --- a/openrtb_ext/imp_gamma.go +++ b/openrtb_ext/imp_gamma.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpGamma defines the contract for bidrequest.imp[i].ext.gamma +// ExtImpGamma defines the contract for bidrequest.imp[i].ext.prebid.bidder.gamma type ExtImpGamma struct { PartnerID string `json:"id"` ZoneID string `json:"zid"` diff --git a/openrtb_ext/imp_gamoshi.go b/openrtb_ext/imp_gamoshi.go index ecedc84788c..4453b09dd0b 100644 --- a/openrtb_ext/imp_gamoshi.go +++ b/openrtb_ext/imp_gamoshi.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpGamoshi defines the contract for bidrequest.imp[i].ext.gamoshi +// ExtImpGamoshi defines the contract for bidrequest.imp[i].ext.prebid.bidder.gamoshi type ExtImpGamoshi struct { SupplyPartnerId string `json:"supplyPartnerId"` FavoredMediaType string `json:"favoredMediaType"` diff --git a/openrtb_ext/imp_grid.go b/openrtb_ext/imp_grid.go index c4530426227..a063cc95fa9 100644 --- a/openrtb_ext/imp_grid.go +++ b/openrtb_ext/imp_grid.go @@ -2,7 +2,7 @@ package openrtb_ext import "encoding/json" -// ExtImpGrid defines the contract for bidrequest.imp[i].ext.grid +// ExtImpGrid defines the contract for bidrequest.imp[i].ext.prebid.bidder.grid type ExtImpGrid struct { Uid int `json:"uid"` Keywords json.RawMessage `json:"keywords,omitempty"` diff --git a/openrtb_ext/imp_gumgum.go b/openrtb_ext/imp_gumgum.go index 8e0d7dd8983..96a1308d663 100644 --- a/openrtb_ext/imp_gumgum.go +++ b/openrtb_ext/imp_gumgum.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpGumGum defines the contract for bidrequest.imp[i].ext.gumgum +// ExtImpGumGum defines the contract for bidrequest.imp[i].ext.prebid.bidder.gumgum // Either Zone or PubId must be present, others are optional parameters type ExtImpGumGum struct { Zone string `json:"zone,omitempty"` @@ -9,12 +9,12 @@ type ExtImpGumGum struct { Slot float64 `json:"slot,omitempty"` } -// ExtImpGumGumVideo defines the contract for bidresponse.seatbid.bid[i].ext.gumgum.video +// ExtImpGumGumVideo defines the contract for bidresponse.seatbid.bid[i].ext.prebid.bidder.gumgum.video type ExtImpGumGumVideo struct { IrisID string `json:"irisid,omitempty"` } -// ExtImpGumGumBanner defines the contract for bidresponse.seatbid.bid[i].ext.gumgum.banner +// ExtImpGumGumBanner defines the contract for bidresponse.seatbid.bid[i].ext.prebid.bidder.gumgum.banner type ExtImpGumGumBanner struct { Si float64 `json:"si,omitempty"` MaxW float64 `json:"maxw,omitempty"` diff --git a/openrtb_ext/imp_impactify.go b/openrtb_ext/imp_impactify.go index 122a98a4110..466c66a40b5 100644 --- a/openrtb_ext/imp_impactify.go +++ b/openrtb_ext/imp_impactify.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpImpactify defines the contract for bidrequest.imp[i].ext.impactify +// ExtImpImpactify defines the contract for bidrequest.imp[i].ext.prebid.bidder.impactify type ExtImpImpactify struct { AppID string `json:"appId"` Format string `json:"format"` diff --git a/openrtb_ext/imp_ix.go b/openrtb_ext/imp_ix.go index 99cd3a215e4..9f977fb0dcd 100644 --- a/openrtb_ext/imp_ix.go +++ b/openrtb_ext/imp_ix.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpIx defines the contract for bidrequest.imp[i].ext.ix +// ExtImpIx defines the contract for bidrequest.imp[i].ext.prebid.bidder.ix type ExtImpIx struct { SiteId string `json:"siteId"` Size []int `json:"size"` diff --git a/openrtb_ext/imp_kayzen.go b/openrtb_ext/imp_kayzen.go index 35dece64036..163e2446ee6 100644 --- a/openrtb_ext/imp_kayzen.go +++ b/openrtb_ext/imp_kayzen.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtKayzen defines the contract for bidrequest.imp[i].ext.kayzen +// ExtKayzen defines the contract for bidrequest.imp[i].ext.prebid.bidder.kayzen type ExtKayzen struct { Zone string `json:"zone"` Exchange string `json:"exchange"` diff --git a/openrtb_ext/imp_kubient.go b/openrtb_ext/imp_kubient.go index fafd2a0eb8f..59dd3d2aaab 100644 --- a/openrtb_ext/imp_kubient.go +++ b/openrtb_ext/imp_kubient.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpKubient defines the contract for bidrequest.imp[i].ext.kubient +// ExtImpKubient defines the contract for bidrequest.imp[i].ext.prebid.bidder.kubient type ExtImpKubient struct { ZoneID string `json:"zoneid"` } diff --git a/openrtb_ext/imp_lockerdome.go b/openrtb_ext/imp_lockerdome.go index 8f228f12458..5f733cf8db1 100644 --- a/openrtb_ext/imp_lockerdome.go +++ b/openrtb_ext/imp_lockerdome.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpLockerDome defines the contract for bidrequest.imp[i].ext.lockerdome +// ExtImpLockerDome defines the contract for bidrequest.imp[i].ext.prebid.bidder.lockerdome type ExtImpLockerDome struct { // LockerDome params AdUnitId string `json:"adUnitId"` diff --git a/openrtb_ext/imp_madvertise.go b/openrtb_ext/imp_madvertise.go index 30bd88dbf51..d944a6c053f 100644 --- a/openrtb_ext/imp_madvertise.go +++ b/openrtb_ext/imp_madvertise.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpMadvertise defines the contract for bidrequest.imp[i].ext.madvertise +// ExtImpMadvertise defines the contract for bidrequest.imp[i].ext.prebid.bidder.madvertise type ExtImpMadvertise struct { ZoneID string `json:"zoneId"` } diff --git a/openrtb_ext/imp_marsmedia.go b/openrtb_ext/imp_marsmedia.go index e07b6d7cc51..1d14937dd11 100644 --- a/openrtb_ext/imp_marsmedia.go +++ b/openrtb_ext/imp_marsmedia.go @@ -2,7 +2,7 @@ package openrtb_ext import "encoding/json" -// ExtImpMarsmedia defines the contract for bidrequest.imp[i].ext.marsmedia +// ExtImpMarsmedia defines the contract for bidrequest.imp[i].ext.prebid.bidder.marsmedia type ExtImpMarsmedia struct { ZoneID json.Number `json:"zoneId"` } diff --git a/openrtb_ext/imp_mgid.go b/openrtb_ext/imp_mgid.go index d96d83cb1e9..d2e9cb20e33 100644 --- a/openrtb_ext/imp_mgid.go +++ b/openrtb_ext/imp_mgid.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpMgid defines the contract for bidrequest.imp[i].ext.mgid +// ExtImpMgid defines the contract for bidrequest.imp[i].ext.prebid.bidder.mgid type ExtImpMgid struct { AccountId string `json:"accountId"` PlacementId string `json:"placementId,omitempty"` diff --git a/openrtb_ext/imp_mobilefuse.go b/openrtb_ext/imp_mobilefuse.go index ea53c5914f1..68dd3b1277e 100644 --- a/openrtb_ext/imp_mobilefuse.go +++ b/openrtb_ext/imp_mobilefuse.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpMobileFuse defines the contract for bidrequest.imp[i].ext.mobilefuse +// ExtImpMobileFuse defines the contract for bidrequest.imp[i].ext.prebid.bidder.mobilefuse type ExtImpMobileFuse struct { PlacementId int `json:"placement_id"` PublisherId int `json:"pub_id"` diff --git a/openrtb_ext/imp_nanointeractive.go b/openrtb_ext/imp_nanointeractive.go index 77e386237ac..b381fab8eb7 100644 --- a/openrtb_ext/imp_nanointeractive.go +++ b/openrtb_ext/imp_nanointeractive.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpNanoInteractive defines the contract for bidrequest.imp[i].ext.nanointeractive +// ExtImpNanoInteractive defines the contract for bidrequest.imp[i].ext.prebid.bidder.nanointeractive type ExtImpNanoInteractive struct { Pid string `json:"pid"` Nq []string `json:"nq,omitempty"` diff --git a/openrtb_ext/imp_openweb.go b/openrtb_ext/imp_openweb.go index 3d28265e698..fc3cbdacdd0 100644 --- a/openrtb_ext/imp_openweb.go +++ b/openrtb_ext/imp_openweb.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpOpenWeb defines the contract for bidrequest.imp[i].ext.openweb +// ExtImpOpenWeb defines the contract for bidrequest.imp[i].ext.prebid.bidder.openweb type ExtImpOpenWeb struct { SourceID int `json:"aid"` PlacementID int `json:"placementId,omitempty"` diff --git a/openrtb_ext/imp_openx.go b/openrtb_ext/imp_openx.go index 2625cb3802d..38bce75f17c 100644 --- a/openrtb_ext/imp_openx.go +++ b/openrtb_ext/imp_openx.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpOpenx defines the contract for bidrequest.imp[i].ext.openx +// ExtImpOpenx defines the contract for bidrequest.imp[i].ext.prebid.bidder.openx type ExtImpOpenx struct { Unit string `json:"unit"` Platform string `json:"platform"` diff --git a/openrtb_ext/imp_orbidder.go b/openrtb_ext/imp_orbidder.go index ad141bdbcdf..0f9795480fa 100644 --- a/openrtb_ext/imp_orbidder.go +++ b/openrtb_ext/imp_orbidder.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpOrbidder defines the contract for bidrequest.imp[i].ext.openx +// ExtImpOrbidder defines the contract for bidrequest.imp[i].ext.prebid.bidder.openx type ExtImpOrbidder struct { AccountId string `json:"accountId"` PlacementId string `json:"placementId"` diff --git a/openrtb_ext/imp_outbrain.go b/openrtb_ext/imp_outbrain.go index 634f29481c1..6cabc9756c0 100644 --- a/openrtb_ext/imp_outbrain.go +++ b/openrtb_ext/imp_outbrain.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpOutbrain defines the contract for bidrequest.imp[i].ext.outbrain +// ExtImpOutbrain defines the contract for bidrequest.imp[i].ext.prebid.bidder.outbrain type ExtImpOutbrain struct { Publisher ExtImpOutbrainPublisher `json:"publisher"` TagId string `json:"tagid"` diff --git a/openrtb_ext/imp_pubmatic.go b/openrtb_ext/imp_pubmatic.go index db96ca518c6..2a45b491d0a 100644 --- a/openrtb_ext/imp_pubmatic.go +++ b/openrtb_ext/imp_pubmatic.go @@ -2,7 +2,7 @@ package openrtb_ext import "encoding/json" -// ExtImpPubmatic defines the contract for bidrequest.imp[i].ext.pubmatic +// ExtImpPubmatic defines the contract for bidrequest.imp[i].ext.prebid.bidder.pubmatic // PublisherId is mandatory parameters, others are optional parameters // AdSlot is identifier for specific ad placement or ad tag // Keywords is bid specific parameter, @@ -18,7 +18,7 @@ type ExtImpPubmatic struct { Kadfloor string `json:"kadfloor,omitempty"` } -// ExtImpPubmaticKeyVal defines the contract for bidrequest.imp[i].ext.pubmatic.keywords[i] +// ExtImpPubmaticKeyVal defines the contract for bidrequest.imp[i].ext.prebid.bidder.pubmatic.keywords[i] type ExtImpPubmaticKeyVal struct { Key string `json:"key,omitempty"` Values []string `json:"value,omitempty"` diff --git a/openrtb_ext/imp_pulsepoint.go b/openrtb_ext/imp_pulsepoint.go index c168c80f1bb..a901592c45b 100644 --- a/openrtb_ext/imp_pulsepoint.go +++ b/openrtb_ext/imp_pulsepoint.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpPulsePoint defines the json spec for bidrequest.imp[i].ext.pulsepoint +// ExtImpPulsePoint defines the json spec for bidrequest.imp[i].ext.prebid.bidder.pulsepoint // PubId/TagId are mandatory params type ExtImpPulsePoint struct { diff --git a/openrtb_ext/imp_rhythmone.go b/openrtb_ext/imp_rhythmone.go index fb5dc199c77..526a2843b53 100644 --- a/openrtb_ext/imp_rhythmone.go +++ b/openrtb_ext/imp_rhythmone.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpRhythmone defines the contract for bidrequest.imp[i].ext.rhythmone +// ExtImpRhythmone defines the contract for bidrequest.imp[i].ext.prebid.bidder.rhythmone type ExtImpRhythmone struct { PlacementId string `json:"placementId"` Zone string `json:"zone"` diff --git a/openrtb_ext/imp_rubicon.go b/openrtb_ext/imp_rubicon.go index a09b18ae273..75ca6d50735 100644 --- a/openrtb_ext/imp_rubicon.go +++ b/openrtb_ext/imp_rubicon.go @@ -4,7 +4,7 @@ import ( "encoding/json" ) -// ExtImpRubicon defines the contract for bidrequest.imp[i].ext.rubicon +// ExtImpRubicon defines the contract for bidrequest.imp[i].ext.prebid.bidder.rubicon type ExtImpRubicon struct { AccountId json.Number `json:"accountId"` SiteId json.Number `json:"siteId"` @@ -16,7 +16,7 @@ type ExtImpRubicon struct { Debug impExtRubiconDebug `json:"debug,omitempty"` } -// rubiconVideoParams defines the contract for bidrequest.imp[i].ext.rubicon.video +// rubiconVideoParams defines the contract for bidrequest.imp[i].ext.prebid.bidder.rubicon.video type rubiconVideoParams struct { Language string `json:"language,omitempty"` PlayerHeight json.Number `json:"playerHeight,omitempty"` @@ -26,7 +26,7 @@ type rubiconVideoParams struct { SkipDelay int `json:"skipdelay,omitempty"` } -// rubiconVideoParams defines the contract for bidrequest.imp[i].ext.rubicon.debug +// rubiconVideoParams defines the contract for bidrequest.imp[i].ext.prebid.bidder.rubicon.debug type impExtRubiconDebug struct { CpmOverride float64 `json:"cpmoverride,omitempty"` } diff --git a/openrtb_ext/imp_silvermob.go b/openrtb_ext/imp_silvermob.go index 9b2465534ca..627a1835686 100644 --- a/openrtb_ext/imp_silvermob.go +++ b/openrtb_ext/imp_silvermob.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtSilverMob defines the contract for bidrequest.imp[i].ext.silvermob +// ExtSilverMob defines the contract for bidrequest.imp[i].ext.prebid.bidder.silvermob type ExtSilverMob struct { ZoneID string `json:"zoneid"` Host string `json:"host"` diff --git a/openrtb_ext/imp_smaato.go b/openrtb_ext/imp_smaato.go index 14dcb73bdf3..bb92b318416 100644 --- a/openrtb_ext/imp_smaato.go +++ b/openrtb_ext/imp_smaato.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpSmaato defines the contract for bidrequest.imp[i].ext.smaato +// ExtImpSmaato defines the contract for bidrequest.imp[i].ext.prebid.bidder.smaato // PublisherId and AdSpaceId are mandatory parameters for non adpod (long-form video) requests, others are optional parameters // PublisherId and AdBreakId are mandatory parameters for adpod (long-form video) requests, others are optional parameters // AdSpaceId is identifier for specific ad placement or ad tag diff --git a/openrtb_ext/imp_smartadserver.go b/openrtb_ext/imp_smartadserver.go index d542e0ffd27..6f6a5df60d5 100644 --- a/openrtb_ext/imp_smartadserver.go +++ b/openrtb_ext/imp_smartadserver.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpSmartadserver defines the contract for bidrequest.imp[i].ext.smartadserver +// ExtImpSmartadserver defines the contract for bidrequest.imp[i].ext.prebid.bidder.smartadserver type ExtImpSmartadserver struct { SiteID int `json:"siteId"` PageID int `json:"pageId"` diff --git a/openrtb_ext/imp_smartyads.go b/openrtb_ext/imp_smartyads.go index 54911373e61..e056ec6be42 100644 --- a/openrtb_ext/imp_smartyads.go +++ b/openrtb_ext/imp_smartyads.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtSmartyAds defines the contract for bidrequest.imp[i].ext.smartyads +// ExtSmartyAds defines the contract for bidrequest.imp[i].ext.prebid.bidder.smartyads type ExtSmartyAds struct { AccountID string `json:"accountid"` SourceID string `json:"sourceid"` diff --git a/openrtb_ext/imp_synacormedia.go b/openrtb_ext/imp_synacormedia.go index af48c7dfd01..2c62a6d3f24 100644 --- a/openrtb_ext/imp_synacormedia.go +++ b/openrtb_ext/imp_synacormedia.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpSynacormedia defines the contract for bidrequest.imp[i].ext.synacormedia +// ExtImpSynacormedia defines the contract for bidrequest.imp[i].ext.prebid.bidder.synacormedia type ExtImpSynacormedia struct { SeatId string `json:"seatId"` TagId string `json:"tagId"` diff --git a/openrtb_ext/imp_triplelift.go b/openrtb_ext/imp_triplelift.go index 77ac9afdaf7..34b054846fc 100644 --- a/openrtb_ext/imp_triplelift.go +++ b/openrtb_ext/imp_triplelift.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpTriplelift defines the contract for bidrequest.imp[i].ext.triplelift +// ExtImpTriplelift defines the contract for bidrequest.imp[i].ext.prebid.bidder.triplelift type ExtImpTriplelift struct { InvCode string `json:"inventoryCode"` Floor *float64 `json:"floor"` diff --git a/openrtb_ext/imp_ucfunnel.go b/openrtb_ext/imp_ucfunnel.go index 408c1e0a35e..9cc06b8527a 100644 --- a/openrtb_ext/imp_ucfunnel.go +++ b/openrtb_ext/imp_ucfunnel.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpUcfunnel defines the contract for bidrequest.imp[i].ext.ucfunnel +// ExtImpUcfunnel defines the contract for bidrequest.imp[i].ext.prebid.bidder.ucfunnel type ExtImpUcfunnel struct { AdUnitId string `json:"adunitid"` PartnerId string `json:"partnerid"` diff --git a/openrtb_ext/imp_unicorn.go b/openrtb_ext/imp_unicorn.go index d8f095cf488..e9f745a96c0 100644 --- a/openrtb_ext/imp_unicorn.go +++ b/openrtb_ext/imp_unicorn.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpUnicorn defines the contract for bidrequest.imp[i].ext.unicorn +// ExtImpUnicorn defines the contract for bidrequest.imp[i].ext.prebid.bidder.unicorn type ExtImpUnicorn struct { PlacementID string `json:"placementId,omitempty"` PublisherID string `json:"publisherId,omitempty"` diff --git a/openrtb_ext/imp_verizonmedia.go b/openrtb_ext/imp_verizonmedia.go index ca824a60c22..2ae8e5ea70a 100644 --- a/openrtb_ext/imp_verizonmedia.go +++ b/openrtb_ext/imp_verizonmedia.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpVerizonMedia defines the contract for bidrequest.imp[i].ext.verizonmedia +// ExtImpVerizonMedia defines the contract for bidrequest.imp[i].ext.prebid.bidder.verizonmedia type ExtImpVerizonMedia struct { Dcn string `json:"dcn"` Pos string `json:"pos"` diff --git a/openrtb_ext/imp_videobyte.go b/openrtb_ext/imp_videobyte.go index 9101e9f2d4a..898c1cacf1b 100644 --- a/openrtb_ext/imp_videobyte.go +++ b/openrtb_ext/imp_videobyte.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpVideoByte defines the contract for bidrequest.imp[i].ext.videobyte +// ExtImpVideoByte defines the contract for bidrequest.imp[i].ext.prebid.bidder.videobyte type ExtImpVideoByte struct { PublisherId string `json:"pubId"` PlacementId string `json:"placementId"` diff --git a/openrtb_ext/imp_vrtcal.go b/openrtb_ext/imp_vrtcal.go index 5ba38da5d77..7c3a78bb016 100644 --- a/openrtb_ext/imp_vrtcal.go +++ b/openrtb_ext/imp_vrtcal.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpVrtcal defines the contract for bidrequest.imp[i].ext.vrtcal +// ExtImpVrtcal defines the contract for bidrequest.imp[i].ext.prebid.bidder.vrtcal type ExtImpVrtcal struct { Just_an_unused_vrtcal_param string `json:"Just_an_unused_vrtcal_param"` } diff --git a/openrtb_ext/imp_yahoossp.go b/openrtb_ext/imp_yahoossp.go index e3183c865a8..bd84be13c3e 100644 --- a/openrtb_ext/imp_yahoossp.go +++ b/openrtb_ext/imp_yahoossp.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpYahooSSP defines the contract for bidrequest.imp[i].ext.yahoossp +// ExtImpYahooSSP defines the contract for bidrequest.imp[i].ext.prebid.bidder.yahoossp type ExtImpYahooSSP struct { Dcn string `json:"dcn"` Pos string `json:"pos"` diff --git a/openrtb_ext/imp_yeahmobi.go b/openrtb_ext/imp_yeahmobi.go index 6c1c045d705..16948d807c4 100644 --- a/openrtb_ext/imp_yeahmobi.go +++ b/openrtb_ext/imp_yeahmobi.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpYeahmobi defines the contract for bidrequest.imp[i].ext.yeahmobi +// ExtImpYeahmobi defines the contract for bidrequest.imp[i].ext.prebid.bidder.yeahmobi type ExtImpYeahmobi struct { PubId string `json:"pubId"` ZoneId string `json:"zoneId"` diff --git a/openrtb_ext/imp_yieldlab.go b/openrtb_ext/imp_yieldlab.go index 8a93f4571a3..266c9c567d4 100644 --- a/openrtb_ext/imp_yieldlab.go +++ b/openrtb_ext/imp_yieldlab.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpYieldlab defines the contract for bidrequest.imp[i].ext.yieldlab +// ExtImpYieldlab defines the contract for bidrequest.imp[i].ext.prebid.bidder.yieldlab type ExtImpYieldlab struct { AdslotID string `json:"adslotId"` SupplyID string `json:"supplyId"` diff --git a/openrtb_ext/imp_yieldmo.go b/openrtb_ext/imp_yieldmo.go index 2a2080daf46..d8daa2f2fd7 100644 --- a/openrtb_ext/imp_yieldmo.go +++ b/openrtb_ext/imp_yieldmo.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpYieldmo defines the contract for bidrequest.imp[i].ext.yieldmo +// ExtImpYieldmo defines the contract for bidrequest.imp[i].ext.prebid.bidder.yieldmo type ExtImpYieldmo struct { PlacementId string `json:"placementId"` } diff --git a/openrtb_ext/imp_yieldone.go b/openrtb_ext/imp_yieldone.go index 6eee563b448..796f2fb1d54 100644 --- a/openrtb_ext/imp_yieldone.go +++ b/openrtb_ext/imp_yieldone.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpYieldone defines the contract for bidrequest.imp[i].ext.yieldone +// ExtImpYieldone defines the contract for bidrequest.imp[i].ext.prebid.bidder.yieldone type ExtImpYieldone struct { PlacementId string `json:"placementId"` } diff --git a/openrtb_ext/imp_zeroclickfraud.go b/openrtb_ext/imp_zeroclickfraud.go index ae82fcacd9a..a73f25e4cc7 100644 --- a/openrtb_ext/imp_zeroclickfraud.go +++ b/openrtb_ext/imp_zeroclickfraud.go @@ -1,6 +1,6 @@ package openrtb_ext -// ExtImpZeroClickFraud defines the contract for bidrequest.imp[i].ext.datablocks +// ExtImpZeroClickFraud defines the contract for bidrequest.imp[i].ext.prebid.bidder.datablocks type ExtImpZeroClickFraud struct { SourceId int `json:"sourceId"` Host string `json:"host"` diff --git a/stored_responses/stored_responses.go b/stored_responses/stored_responses.go index 484e695dd8d..9002ebf166a 100644 --- a/stored_responses/stored_responses.go +++ b/stored_responses/stored_responses.go @@ -99,7 +99,7 @@ func extractStoredResponsesIds(impInfo []ImpExtPrebidData, } //check if bidder is valid/exists if _, isValid := bidderMap[bidderResp.Bidder]; !isValid { - return nil, nil, nil, nil, fmt.Errorf("request.imp[impId: %s].ext contains unknown bidder: %s. Did you forget an alias in request.ext.prebid.aliases?", impId, bidderResp.Bidder) + return nil, nil, nil, nil, fmt.Errorf("request.imp[impId: %s].ext.prebid.bidder.%s is unknown. Did you forget an alias in request.ext.prebid.aliases?", impId, bidderResp.Bidder) } // bidder is unique per one bid stored response // if more than one bidder specified the last defined bidder id will take precedence diff --git a/stored_responses/stored_responses_test.go b/stored_responses/stored_responses_test.go index 231bd187038..9a1a3bf5930 100644 --- a/stored_responses/stored_responses_test.go +++ b/stored_responses/stored_responses_test.go @@ -228,7 +228,7 @@ func TestProcessStoredAuctionAndBidResponsesErrors(t *testing.T) { } } ]}`), - expectedErrorList: []error{errors.New("request.imp[impId: imp-id1].ext contains unknown bidder: testBidder123. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrorList: []error{errors.New("request.imp[impId: imp-id1].ext.prebid.bidder.testBidder123 is unknown. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Invalid stored auction response format: empty stored Auction Response Id in second imp", From 7a256c7417a2f85b21565c2a22c77bdb1f7d8e8b Mon Sep 17 00:00:00 2001 From: Scott Kay Date: Fri, 18 Nov 2022 11:09:04 -0500 Subject: [PATCH 2/2] Reverted To Match --- stored_responses/stored_responses.go | 2 +- stored_responses/stored_responses_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stored_responses/stored_responses.go b/stored_responses/stored_responses.go index 9002ebf166a..f98e3d42cb4 100644 --- a/stored_responses/stored_responses.go +++ b/stored_responses/stored_responses.go @@ -99,7 +99,7 @@ func extractStoredResponsesIds(impInfo []ImpExtPrebidData, } //check if bidder is valid/exists if _, isValid := bidderMap[bidderResp.Bidder]; !isValid { - return nil, nil, nil, nil, fmt.Errorf("request.imp[impId: %s].ext.prebid.bidder.%s is unknown. Did you forget an alias in request.ext.prebid.aliases?", impId, bidderResp.Bidder) + return nil, nil, nil, nil, fmt.Errorf("request.imp[impId: %s].ext.prebid.bidder contains unknown bidder: %s. Did you forget an alias in request.ext.prebid.aliases?", impId, bidderResp.Bidder) } // bidder is unique per one bid stored response // if more than one bidder specified the last defined bidder id will take precedence diff --git a/stored_responses/stored_responses_test.go b/stored_responses/stored_responses_test.go index 9a1a3bf5930..c44adc0ec66 100644 --- a/stored_responses/stored_responses_test.go +++ b/stored_responses/stored_responses_test.go @@ -228,7 +228,7 @@ func TestProcessStoredAuctionAndBidResponsesErrors(t *testing.T) { } } ]}`), - expectedErrorList: []error{errors.New("request.imp[impId: imp-id1].ext.prebid.bidder.testBidder123 is unknown. Did you forget an alias in request.ext.prebid.aliases?")}, + expectedErrorList: []error{errors.New("request.imp[impId: imp-id1].ext.prebid.bidder contains unknown bidder: testBidder123. Did you forget an alias in request.ext.prebid.aliases?")}, }, { description: "Invalid stored auction response format: empty stored Auction Response Id in second imp",