rebase - UOE-5250: prebid-server upgrade to Prebid 0.116.0 (#58)

PubMatic-OpenWrap · Jan 12, 2022 · 9453dcb · 9453dcb
1 parent 9f1a9ec
commit 9453dcb
Show file tree

Hide file tree

Showing 74 changed files with 238 additions and 102 deletions.
diff --git a/adapters/adgeneration/params_test.go b/adapters/adgeneration/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(t *testing.T) {

diff --git a/adapters/adhese/adhese.go b/adapters/adhese/adhese.go
@@ -10,6 +10,11 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/PubMatic-OpenWrap/openrtb"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/errortypes"
+	"github.com/PubMatic-OpenWrap/prebid-server/macros"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"github.com/golang/glog"
 	"github.com/mxmCherry/openrtb/v15/openrtb2"
 	"github.com/prebid/prebid-server/adapters"

diff --git a/adapters/adhese/params_test.go b/adapters/adhese/params_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(t *testing.T) {

diff --git a/adapters/admixer/params_test.go b/adapters/admixer/params_test.go
@@ -2,7 +2,7 @@ package admixer
 
 import (
 	"encoding/json"
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"testing"
 )
 

diff --git a/adapters/adocean/params_test.go b/adapters/adocean/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(t *testing.T) {

diff --git a/adapters/adocean/usersync.go b/adapters/adocean/usersync.go
@@ -3,8 +3,8 @@ package adocean
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewAdOceanSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/adocean/usersync_test.go b/adapters/adocean/usersync_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/prebid/prebid-server/privacy/gdpr"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/adtarget/params_test.go b/adapters/adtarget/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 // This file actually intends to test static/bidder-params/adtarget.json

diff --git a/adapters/adtarget/usersync.go b/adapters/adtarget/usersync.go
@@ -3,8 +3,8 @@ package adtarget
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewAdtargetSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/aja/usersync.go b/adapters/aja/usersync.go
@@ -3,8 +3,8 @@ package aja
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewAJASyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/avocet/usersync.go b/adapters/avocet/usersync.go
@@ -3,8 +3,8 @@ package avocet
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewAvocetSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/avocet/usersync_test.go b/adapters/avocet/usersync_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/prebid/prebid-server/privacy/ccpa"
-	"github.com/prebid/prebid-server/privacy/gdpr"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/beintoo/params_test.go b/adapters/beintoo/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(t *testing.T) {

diff --git a/adapters/beintoo/usersync.go b/adapters/beintoo/usersync.go
@@ -3,8 +3,8 @@ package beintoo
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewBeintooSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/beintoo/usersync_test.go b/adapters/beintoo/usersync_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/prebid/prebid-server/privacy/ccpa"
-	"github.com/prebid/prebid-server/privacy/gdpr"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/bidder.go b/adapters/bidder.go
@@ -98,6 +98,7 @@ type TypedBid struct {
 	BidMeta      *openrtb_ext.ExtBidPrebidMeta
 	BidType      openrtb_ext.BidType
 	BidVideo     *openrtb_ext.ExtBidPrebidVideo
+	BidTargets   map[string]string
 	DealPriority int
 }
 

diff --git a/adapters/cpmstar/params_test.go b/adapters/cpmstar/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 // This file actually intends to test static/bidder-params/cpmstar.json

diff --git a/adapters/cpmstar/usersync.go b/adapters/cpmstar/usersync.go
@@ -3,8 +3,8 @@ package cpmstar
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 //NewCpmstarSyncer :

diff --git a/adapters/cpmstar/usersync_test.go b/adapters/cpmstar/usersync_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/dmx/usersync.go b/adapters/dmx/usersync.go
@@ -3,8 +3,8 @@ package dmx
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewDmxSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/kidoz/params_test.go b/adapters/kidoz/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(t *testing.T) {

diff --git a/adapters/lunamedia/params_test.go b/adapters/lunamedia/params_test.go
@@ -2,7 +2,7 @@ package lunamedia
 
 import (
 	"encoding/json"
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"testing"
 )
 

diff --git a/adapters/lunamedia/usersync.go b/adapters/lunamedia/usersync.go
@@ -3,8 +3,8 @@ package lunamedia
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewLunaMediaSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/lunamedia/usersync_test.go b/adapters/lunamedia/usersync_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/prebid/prebid-server/privacy/gdpr"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/mobilefuse/params_test.go b/adapters/mobilefuse/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 func TestValidParams(test *testing.T) {

diff --git a/adapters/nanointeractive/params_test.go b/adapters/nanointeractive/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 )
 
 // This file actually intends to test static/bidder-params/nanointeractive.json

diff --git a/adapters/nanointeractive/usersync.go b/adapters/nanointeractive/usersync.go
@@ -3,8 +3,8 @@ package nanointeractive
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewNanoInteractiveSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/ninthdecimal/params_test.go b/adapters/ninthdecimal/params_test.go
@@ -2,7 +2,7 @@ package ninthdecimal
 
 import (
 	"encoding/json"
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"testing"
 )
 

diff --git a/adapters/ninthdecimal/usersync.go b/adapters/ninthdecimal/usersync.go
@@ -3,8 +3,8 @@ package ninthdecimal
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewNinthDecimalSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/ninthdecimal/usersync_test.go b/adapters/ninthdecimal/usersync_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/prebid/prebid-server/privacy/gdpr"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/orbidder/params_test.go b/adapters/orbidder/params_test.go
@@ -2,7 +2,7 @@ package orbidder
 
 import (
 	"encoding/json"
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"testing"
 )
 

diff --git a/adapters/rubicon/rubicon.go b/adapters/rubicon/rubicon.go
@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/PubMatic-OpenWrap/prebid-server/pbs"
 	"github.com/golang/glog"
 	"github.com/mxmCherry/openrtb/v15/openrtb2"
 	"github.com/prebid/prebid-server/adapters"

diff --git a/adapters/smartrtb/usersync.go b/adapters/smartrtb/usersync.go
@@ -3,8 +3,8 @@ package smartrtb
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewSmartRTBSyncer(temp *template.Template) usersync.Usersyncer {

diff --git a/adapters/smartrtb/usersync_test.go b/adapters/smartrtb/usersync_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/prebid/prebid-server/privacy"
+	"github.com/PubMatic-OpenWrap/prebid-server/privacy"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/adapters/spotx/params_test.go b/adapters/spotx/params_test.go
@@ -14,7 +14,7 @@ func TestSpotxParams(t *testing.T) {
 
 func testValidParams(t *testing.T) {
 
-	params := []string {
+	params := []string{
 		`{"channel_id": "12345", "ad_unit": "instream"}`,
 		`{"channel_id": "12345", "ad_unit": "instream", "secure": true}`,
 		`{"channel_id": "12345", "ad_unit": "instream", "secure": true, "ad_volume": 0.4}`,
@@ -35,7 +35,7 @@ func testValidParams(t *testing.T) {
 
 // TestInvalidParams makes sure that the 33Across schema rejects all the imp.ext fields we don't support.
 func testInvalidParams(t *testing.T) {
-	params := []string {
+	params := []string{
 		`{"channel_id": "1234", "ad_unit": "instream", "secure": true, "ad_volume": 0.4, "price_floor": 10, "hide_skin": false}`,
 		`{"channel_id": "12345", "ad_unit": "outstream1", "secure": true, "ad_volume": 0.4, "price_floor": 10, "hide_skin": false}`,
 		`{"ad_unit": "instream", "secure": true, "ad_volume": 0.4, "price_floor": 10, "hide_skin": false}`,

diff --git a/adapters/spotx/spotx_test.go b/adapters/spotx/spotx_test.go
@@ -26,7 +26,7 @@ func TestSpotxMakeBid(t *testing.T) {
 	request := &openrtb.BidRequest{
 		ID: "1559039248176",
 		Imp: []openrtb.Imp{
-			openrtb.Imp{
+			{
 				ID: "28635736ddc2bb",
 				Video: &openrtb.Video{
 					MIMEs: []string{"video/3gpp"},

diff --git a/adapters/ucfunnel/params_test.go b/adapters/ucfunnel/params_test.go
@@ -2,7 +2,7 @@ package ucfunnel
 
 import (
 	"encoding/json"
-	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
 	"testing"
 )
 

diff --git a/adapters/ucfunnel/usersync.go b/adapters/ucfunnel/usersync.go
@@ -3,8 +3,8 @@ package ucfunnel
 import (
 	"text/template"
 
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters"
+	"github.com/PubMatic-OpenWrap/prebid-server/usersync"
 )
 
 func NewUcfunnelSyncer(temp *template.Template) usersync.Usersyncer {