Merge branch 'master' of https://github.com/prebid/prebid-server into…

… prebid-master * 'master' of https://github.com/prebid/prebid-server: Update Viper (prebid#1969) /cookie_sync Endpoint Rewrite (prebid#1879) New Adapter: IQZone (prebid#1964) Remove old race conidtion tests (prebid#1958) Remove time.Now() as the first parameter of NewRates() (prebid#1953) # Conflicts: # config/config.go # usersync/usersyncers/syncer_test.go
wwwyyy · Aug 20, 2021 · d827237 · d827237
2 parents 2aec272 + 7beb2cb
commit d827237
Show file tree

Hide file tree

Showing 621 changed files with 9,076 additions and 7,394 deletions.
diff --git a/adapters/33across/33acrosstest/params/race/banner.json b/adapters/33across/33acrosstest/params/race/banner.json
diff --git a/adapters/33across/33acrosstest/params/race/video.json b/adapters/33across/33acrosstest/params/race/video.json
diff --git a/adapters/33across/usersync.go b/adapters/33across/usersync.go
diff --git a/adapters/33across/usersync_test.go b/adapters/33across/usersync_test.go
diff --git a/adapters/acuityads/acuityads.go b/adapters/acuityads/acuityads.go
@@ -15,7 +15,7 @@ import (
 )
 
 type AcuityAdsAdapter struct {
-	endpoint template.Template
+	endpoint *template.Template
 }
 
 // Builder builds a new instance of the AcuityAds adapter for the given bidder with the given config.
@@ -26,7 +26,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
 	}
 
 	bidder := &AcuityAdsAdapter{
-		endpoint: *template,
+		endpoint: template,
 	}
 	return bidder, nil
 }

diff --git a/adapters/acuityads/acuityadstest/params/race/banner.json b/adapters/acuityads/acuityadstest/params/race/banner.json
diff --git a/adapters/acuityads/acuityadstest/params/race/native.json b/adapters/acuityads/acuityadstest/params/race/native.json
diff --git a/adapters/acuityads/acuityadstest/params/race/video.json b/adapters/acuityads/acuityadstest/params/race/video.json
diff --git a/adapters/acuityads/usersync.go b/adapters/acuityads/usersync.go
diff --git a/adapters/acuityads/usersync_test.go b/adapters/acuityads/usersync_test.go
diff --git a/adapters/adagio/adagiotest/params/race/banner.json b/adapters/adagio/adagiotest/params/race/banner.json
diff --git a/adapters/adagio/adagiotest/params/race/native.json b/adapters/adagio/adagiotest/params/race/native.json
diff --git a/adapters/adagio/adagiotest/params/race/video.json b/adapters/adagio/adagiotest/params/race/video.json
diff --git a/adapters/adagio/usersync.go b/adapters/adagio/usersync.go
diff --git a/adapters/adagio/usersync_test.go b/adapters/adagio/usersync_test.go
diff --git a/adapters/adf/adftest/params/race/native.json b/adapters/adf/adftest/params/race/native.json
diff --git a/adapters/adf/usersync.go b/adapters/adf/usersync.go
diff --git a/adapters/adf/usersync_test.go b/adapters/adf/usersync_test.go
diff --git a/adapters/adform/adform_test.go b/adapters/adform/adform_test.go
@@ -222,7 +222,7 @@ func preparePrebidRequest(serverUrl string, t *testing.T) *pbs.PBSRequest {
 	prebidHttpRequest.Header.Add("Referer", adformTestData.referrer)
 	prebidHttpRequest.Header.Add("X-Real-IP", adformTestData.deviceIP)
 
-	pbsCookie := usersync.ParsePBSCookieFromRequest(prebidHttpRequest, &config.HostCookie{})
+	pbsCookie := usersync.ParseCookieFromRequest(prebidHttpRequest, &config.HostCookie{})
 	pbsCookie.TrySync("adform", adformTestData.buyerUID)
 	fakeWriter := httptest.NewRecorder()
 

diff --git a/adapters/adform/adformtest/params/race/banner.json b/adapters/adform/adformtest/params/race/banner.json
diff --git a/adapters/adform/adformtest/params/race/video.json b/adapters/adform/adformtest/params/race/video.json
diff --git a/adapters/adform/usersync.go b/adapters/adform/usersync.go
diff --git a/adapters/adform/usersync_test.go b/adapters/adform/usersync_test.go
diff --git a/adapters/adgeneration/adgenerationtest/params/race/banner.json b/adapters/adgeneration/adgenerationtest/params/race/banner.json
diff --git a/adapters/adhese/adhese.go b/adapters/adhese/adhese.go
@@ -20,7 +20,7 @@ import (
 )
 
 type AdheseAdapter struct {
-	endpointTemplate template.Template
+	endpointTemplate *template.Template
 }
 
 func extractSlotParameter(parameters openrtb_ext.ExtImpAdhese) string {
@@ -276,7 +276,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
 	}
 
 	bidder := &AdheseAdapter{
-		endpointTemplate: *template,
+		endpointTemplate: template,
 	}
 	return bidder, nil
 }
diff --git a/adapters/adkernel/adkernel.go b/adapters/adkernel/adkernel.go
@@ -16,7 +16,7 @@ import (
 )
 
 type adkernelAdapter struct {
-	EndpointTemplate template.Template
+	EndpointTemplate *template.Template
 }
 
 //MakeRequests prepares request information for prebid-server core
@@ -262,7 +262,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
 	}
 
 	bidder := &adkernelAdapter{
-		EndpointTemplate: *urlTemplate,
+		EndpointTemplate: urlTemplate,
 	}
 	return bidder, nil
 }
diff --git a/adapters/adkernel/adkerneltest/params/race/banner.json b/adapters/adkernel/adkerneltest/params/race/banner.json
diff --git a/adapters/adkernel/adkerneltest/params/race/video.json b/adapters/adkernel/adkerneltest/params/race/video.json
diff --git a/adapters/adkernel/usersync.go b/adapters/adkernel/usersync.go