From 805791fd19e89207e7ee374911d20eee804aac4b Mon Sep 17 00:00:00 2001 From: Nilesh Chate Date: Wed, 24 May 2023 11:30:03 +0530 Subject: [PATCH 1/3] remove groupm bidder --- exchange/adapter_builders.go | 1 - exchange/bidder_test.go | 2 +- exchange/utils_test.go | 28 +++++++-------- openrtb_ext/bidders.go | 2 -- static/bidder-info/groupm.yaml | 20 ----------- static/bidder-params/groupm.json | 61 -------------------------------- 6 files changed, 15 insertions(+), 99 deletions(-) delete mode 100644 static/bidder-info/groupm.yaml delete mode 100644 static/bidder-params/groupm.json diff --git a/exchange/adapter_builders.go b/exchange/adapter_builders.go index e2b3af82122..53dac48897b 100755 --- a/exchange/adapter_builders.go +++ b/exchange/adapter_builders.go @@ -266,7 +266,6 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder { openrtb_ext.BidderGamoshi: gamoshi.Builder, openrtb_ext.BidderGlobalsun: globalsun.Builder, openrtb_ext.BidderGrid: grid.Builder, - openrtb_ext.BidderGroupm: pubmatic.Builder, openrtb_ext.BidderGumGum: gumgum.Builder, openrtb_ext.BidderHuaweiAds: huaweiads.Builder, openrtb_ext.BidderIionads: limelightDigital.Builder, diff --git a/exchange/bidder_test.go b/exchange/bidder_test.go index 4e94a18f324..87d04185cba 100644 --- a/exchange/bidder_test.go +++ b/exchange/bidder_test.go @@ -2725,7 +2725,7 @@ func TestExtraBidWithBidAdjustments(t *testing.T) { } bidAdjustments := map[string]float64{ string(openrtb_ext.BidderPubmatic): 2, - string(openrtb_ext.BidderGroupm): 3, + "groupm": 3, } bidReqOptions := bidRequestOptions{ diff --git a/exchange/utils_test.go b/exchange/utils_test.go index e054f33c232..7a8a6ba38e2 100644 --- a/exchange/utils_test.go +++ b/exchange/utils_test.go @@ -3822,7 +3822,7 @@ func Test_isBidderInExtAlternateBidderCodes(t *testing.T) { name: "adapter defined in alternatebiddercodes but currentMultiBidBidder not in AllowedBidders list", args: args{ adapter: string(openrtb_ext.BidderPubmatic), - currentMultiBidBidder: string(openrtb_ext.BidderGroupm), + currentMultiBidBidder: "groupm", adapterABC: &openrtb_ext.ExtAlternateBidderCodes{ Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{ string(openrtb_ext.BidderPubmatic): { @@ -3837,11 +3837,11 @@ func Test_isBidderInExtAlternateBidderCodes(t *testing.T) { name: "adapter defined in alternatebiddercodes with currentMultiBidBidder mentioned in AllowedBidders list", args: args{ adapter: string(openrtb_ext.BidderPubmatic), - currentMultiBidBidder: string(openrtb_ext.BidderGroupm), + currentMultiBidBidder: "groupm", adapterABC: &openrtb_ext.ExtAlternateBidderCodes{ Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{ string(openrtb_ext.BidderPubmatic): { - AllowedBidderCodes: []string{string(openrtb_ext.BidderGroupm)}, + AllowedBidderCodes: []string{"groupm"}, }, }, }, @@ -3852,7 +3852,7 @@ func Test_isBidderInExtAlternateBidderCodes(t *testing.T) { name: "adapter defined in alternatebiddercodes with AllowedBidders list as *", args: args{ adapter: string(openrtb_ext.BidderPubmatic), - currentMultiBidBidder: string(openrtb_ext.BidderGroupm), + currentMultiBidBidder: "groupm", adapterABC: &openrtb_ext.ExtAlternateBidderCodes{ Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{ string(openrtb_ext.BidderPubmatic): { @@ -3963,7 +3963,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapter: string(openrtb_ext.BidderPubmatic), reqMultiBid: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -3978,14 +3978,14 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapterABC: &openrtb_ext.ExtAlternateBidderCodes{ Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{ string(openrtb_ext.BidderPubmatic): { - AllowedBidderCodes: []string{string(openrtb_ext.BidderGroupm)}, + AllowedBidderCodes: []string{"groupm"}, }, }, }, }, want: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4000,7 +4000,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapter: string(openrtb_ext.BidderAppnexus), reqMultiBid: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4015,14 +4015,14 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapterABC: &openrtb_ext.ExtAlternateBidderCodes{ Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{ string(openrtb_ext.BidderAppnexus): { - AllowedBidderCodes: []string{string(openrtb_ext.BidderGroupm)}, + AllowedBidderCodes: []string{"groupm"}, }, }, }, }, want: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4037,7 +4037,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapter: string(openrtb_ext.BidderPubmatic), reqMultiBid: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4059,7 +4059,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { }, want: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4082,7 +4082,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { adapter: string(openrtb_ext.BidderAppnexus), reqMultiBid: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { @@ -4104,7 +4104,7 @@ func Test_buildRequestExtMultiBid(t *testing.T) { }, want: []*openrtb_ext.ExtMultiBid{ { - Bidder: string(openrtb_ext.BidderGroupm), + Bidder: "groupm", MaxBids: ptrutil.ToPtr(3), }, { diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index 5a342a98de5..4fd384c771b 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -173,7 +173,6 @@ const ( BidderGamoshi BidderName = "gamoshi" BidderGlobalsun BidderName = "globalsun" BidderGrid BidderName = "grid" - BidderGroupm BidderName = "groupm" BidderGumGum BidderName = "gumgum" BidderHuaweiAds BidderName = "huaweiads" BidderIionads BidderName = "iionads" @@ -364,7 +363,6 @@ func CoreBidderNames() []BidderName { BidderGamoshi, BidderGlobalsun, BidderGrid, - BidderGroupm, BidderGumGum, BidderHuaweiAds, BidderIionads, diff --git a/static/bidder-info/groupm.yaml b/static/bidder-info/groupm.yaml deleted file mode 100644 index 189527d5471..00000000000 --- a/static/bidder-info/groupm.yaml +++ /dev/null @@ -1,20 +0,0 @@ -endpoint: "https://hbopenbid.pubmatic.com/translator?source=prebid-server" -maintainer: - email: "header-bidding@pubmatic.com" -gvlVendorID: 98 -capabilities: - app: - mediaTypes: - - banner - - video - site: - mediaTypes: - - banner - - video -userSync: - iframe: - url: "https://ads.pubmatic.com/AdServer/js/user_sync.html?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&predirect={{.RedirectURL}}" - userMacro: "" - # groupm appends the user id to end of the redirect url and does not utilize a macro - - diff --git a/static/bidder-params/groupm.json b/static/bidder-params/groupm.json deleted file mode 100644 index cfebd2adb19..00000000000 --- a/static/bidder-params/groupm.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Groupm Adapter Params", - "description": "A schema which validates params accepted by the Groupm adapter", - "type": "object", - "properties": { - "publisherId": { - "type": "string", - "description": "An ID which identifies the publisher" - }, - "adSlot": { - "type": "string", - "description": "An ID which identifies the ad slot" - }, - "pmzoneid": { - "type": "string", - "description": "Comma separated zone id. Used im deal targeting & site section targeting. e.g drama,sport" - }, - "dctr": { - "type": "string", - "description": "Deals Custom Targeting, pipe separated key-value pairs e.g key1=V1,V2,V3|key2=v1|key3=v3,v5" - }, - "wrapper": { - "type": "object", - "description": "Specifies Groupm openwrap configuration for a publisher", - "properties": { - "profile": { - "type": "integer", - "description": "An ID which identifies the openwrap profile of publisher" - }, - "version": { - "type": "integer", - "description": "An ID which identifies version of the openwrap profile" - } - }, - "required": ["profile"] - }, - "keywords": { - "type": "array", - "minItems": 1, - "items": { - "type": "object", - "description": "A key with one or more values associated with it. These are used in buy-side segment targeting.", - "properties": { - "key": { - "type": "string" - }, - "value": { - "type": "array", - "minItems": 1, - "items": { - "type": "string" - } - } - }, - "required": ["key", "value"] - } - } - }, - "required": ["publisherId"] -} From ee2b6ed18499d5225c8e683ed7cddbc04286bbd2 Mon Sep 17 00:00:00 2001 From: Nilesh Chate Date: Thu, 25 May 2023 13:20:36 +0530 Subject: [PATCH 2/3] add groupm to disabled bidders --- exchange/adapter_util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/exchange/adapter_util.go b/exchange/adapter_util.go index 056dbf3568e..4876cef7ae7 100644 --- a/exchange/adapter_util.go +++ b/exchange/adapter_util.go @@ -91,6 +91,7 @@ func GetDisabledBiddersErrorMessages(infos config.BidderInfos) map[string]string "yssp": `Bidder "yssp" is no longer available in Prebid Server. If you're looking to use the Yahoo SSP adapter, please rename it to "yahoossp" in your configuration.`, "andbeyondmedia": `Bidder "andbeyondmedia" is no longer available in Prebid Server. If you're looking to use the AndBeyond.Media SSP adapter, please rename it to "beyondmedia" in your configuration.`, "oftmedia": `Bidder "oftmedia" is no longer available in Prebid Server. Please update your configuration.`, + "groupm": `Bidder "groupm" is no longer available in Prebid Server. Please update your configuration.`, } for name, info := range infos { From 70be0eba139338b4f36ce1eb1f157ef6f78d5b74 Mon Sep 17 00:00:00 2001 From: Nilesh Chate Date: Thu, 25 May 2023 13:24:08 +0530 Subject: [PATCH 3/3] update groupm disabled ut --- exchange/adapter_util_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exchange/adapter_util_test.go b/exchange/adapter_util_test.go index 4a6f468ecdc..b08a85de802 100644 --- a/exchange/adapter_util_test.go +++ b/exchange/adapter_util_test.go @@ -213,6 +213,7 @@ func TestGetDisabledBiddersErrorMessages(t *testing.T) { "yssp": `Bidder "yssp" is no longer available in Prebid Server. If you're looking to use the Yahoo SSP adapter, please rename it to "yahoossp" in your configuration.`, "andbeyondmedia": `Bidder "andbeyondmedia" is no longer available in Prebid Server. If you're looking to use the AndBeyond.Media SSP adapter, please rename it to "beyondmedia" in your configuration.`, "oftmedia": `Bidder "oftmedia" is no longer available in Prebid Server. Please update your configuration.`, + "groupm": `Bidder "groupm" is no longer available in Prebid Server. Please update your configuration.`, }, }, { @@ -225,6 +226,7 @@ func TestGetDisabledBiddersErrorMessages(t *testing.T) { "yssp": `Bidder "yssp" is no longer available in Prebid Server. If you're looking to use the Yahoo SSP adapter, please rename it to "yahoossp" in your configuration.`, "andbeyondmedia": `Bidder "andbeyondmedia" is no longer available in Prebid Server. If you're looking to use the AndBeyond.Media SSP adapter, please rename it to "beyondmedia" in your configuration.`, "oftmedia": `Bidder "oftmedia" is no longer available in Prebid Server. Please update your configuration.`, + "groupm": `Bidder "groupm" is no longer available in Prebid Server. Please update your configuration.`, }, }, { @@ -238,6 +240,7 @@ func TestGetDisabledBiddersErrorMessages(t *testing.T) { "appnexus": `Bidder "appnexus" has been disabled on this instance of Prebid Server. Please work with the PBS host to enable this bidder again.`, "andbeyondmedia": `Bidder "andbeyondmedia" is no longer available in Prebid Server. If you're looking to use the AndBeyond.Media SSP adapter, please rename it to "beyondmedia" in your configuration.`, "oftmedia": `Bidder "oftmedia" is no longer available in Prebid Server. Please update your configuration.`, + "groupm": `Bidder "groupm" is no longer available in Prebid Server. Please update your configuration.`, }, }, { @@ -251,6 +254,7 @@ func TestGetDisabledBiddersErrorMessages(t *testing.T) { "appnexus": `Bidder "appnexus" has been disabled on this instance of Prebid Server. Please work with the PBS host to enable this bidder again.`, "andbeyondmedia": `Bidder "andbeyondmedia" is no longer available in Prebid Server. If you're looking to use the AndBeyond.Media SSP adapter, please rename it to "beyondmedia" in your configuration.`, "oftmedia": `Bidder "oftmedia" is no longer available in Prebid Server. Please update your configuration.`, + "groupm": `Bidder "groupm" is no longer available in Prebid Server. Please update your configuration.`, }, }, }