From 5a8fc9dda620aca553a86cfae648723d32a88931 Mon Sep 17 00:00:00 2001 From: Gordon Tian Date: Wed, 5 Jun 2024 11:35:20 +0800 Subject: [PATCH 1/3] rename Adapter from liftoff to vungle --- adapters/{liftoff => vungle}/param_test.go | 6 +++--- .../{liftoff/liftoff.go => vungle/vungle.go} | 16 ++++++++-------- .../liftoff_test.go => vungle/vungle_test.go} | 8 ++++---- .../vungletest}/exemplary/app_video_instl.json | 2 +- .../exemplary/app_video_rewarded.json | 2 +- .../vungletest}/exemplary/site_video_instl.json | 2 +- .../exemplary/site_video_rewarded.json | 2 +- .../supplemental/appid_placementid_check.json | 2 +- .../missing_appid_or_placementid.json | 2 +- .../no_site_or_app_video_rewarded.json | 0 .../supplemental/response_code_204.json | 2 +- .../supplemental/response_code_400.json | 2 +- .../supplemental/response_code_non_200.json | 2 +- .../supplemental/vungle_ext_check.json} | 2 +- exchange/adapter_builders.go | 4 ++-- openrtb_ext/bidders.go | 4 ++-- openrtb_ext/imp_liftoff.go | 2 +- static/bidder-info/{liftoff.yaml => vungle.yaml} | 0 .../bidder-params/{liftoff.json => vungle.json} | 4 ++-- 19 files changed, 32 insertions(+), 32 deletions(-) rename adapters/{liftoff => vungle}/param_test.go (82%) rename adapters/{liftoff/liftoff.go => vungle/vungle.go} (91%) rename adapters/{liftoff/liftoff_test.go => vungle/vungle_test.go} (56%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/exemplary/app_video_instl.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/exemplary/app_video_rewarded.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/exemplary/site_video_instl.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/exemplary/site_video_rewarded.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/appid_placementid_check.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/missing_appid_or_placementid.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/no_site_or_app_video_rewarded.json (100%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/response_code_204.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/response_code_400.json (98%) rename adapters/{liftoff/liftofftest => vungle/vungletest}/supplemental/response_code_non_200.json (98%) rename adapters/{liftoff/liftofftest/supplemental/liftoff_ext_check.json => vungle/vungletest/supplemental/vungle_ext_check.json} (98%) rename static/bidder-info/{liftoff.yaml => vungle.yaml} (100%) rename static/bidder-params/{liftoff.json => vungle.json} (89%) diff --git a/adapters/liftoff/param_test.go b/adapters/vungle/param_test.go similarity index 82% rename from adapters/liftoff/param_test.go rename to adapters/vungle/param_test.go index a5e5a61fb9a..ff73b5ef960 100644 --- a/adapters/liftoff/param_test.go +++ b/adapters/vungle/param_test.go @@ -1,4 +1,4 @@ -package liftoff +package vungle import ( "encoding/json" @@ -26,7 +26,7 @@ func TestValidParams(t *testing.T) { } for _, p := range validParams { - if err := validator.Validate(openrtb_ext.BidderLiftoff, json.RawMessage(p)); err != nil { + if err := validator.Validate(openrtb_ext.BidderVungle, json.RawMessage(p)); err != nil { t.Errorf("Schema rejected valid params: %s", p) } } @@ -39,7 +39,7 @@ func TestInvalidParams(t *testing.T) { } for _, p := range invalidParams { - if err := validator.Validate(openrtb_ext.BidderLiftoff, json.RawMessage(p)); err == nil { + if err := validator.Validate(openrtb_ext.BidderVungle, json.RawMessage(p)); err == nil { t.Errorf("Schema allowed invalid params: %s", p) } } diff --git a/adapters/liftoff/liftoff.go b/adapters/vungle/vungle.go similarity index 91% rename from adapters/liftoff/liftoff.go rename to adapters/vungle/vungle.go index d1c39d54081..9d479b81e31 100644 --- a/adapters/liftoff/liftoff.go +++ b/adapters/vungle/vungle.go @@ -1,4 +1,4 @@ -package liftoff +package vungle import ( "encoding/json" @@ -19,18 +19,18 @@ type adapter struct { Endpoint string } -type liftoffImpressionExt struct { +type vungleImpressionExt struct { *adapters.ExtImpBidder // Ext represents the vungle extension. - Ext openrtb_ext.ImpExtLiftoff `json:"vungle"` + Ext openrtb_ext.ImpExtVungle `json:"vungle"` } -// Builder builds a new instance of the Liftoff adapter for the given bidder with the given config. +// Builder builds a new instance of the Vungle adapter for the given bidder with the given config. func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) { return &adapter{Endpoint: config.Endpoint}, nil } -// MakeRequests split impressions into bid requests and change them into the form that liftoff can handle. +// MakeRequests split impressions into bid requests and change them into the form that vungle can handle. func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { var requests []*adapters.RequestData var errs []error @@ -51,14 +51,14 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte imp.BidFloor = convertedValue } - var impExt liftoffImpressionExt + var impExt vungleImpressionExt if err := json.Unmarshal(imp.Ext, &impExt); err != nil { errs = append(errs, fmt.Errorf("failed unmarshalling imp ext (err)%s", err.Error())) continue } // get placement_reference_id & pub_app_store_id - var bidderImpExt openrtb_ext.ImpExtLiftoff + var bidderImpExt openrtb_ext.ImpExtVungle if err := json.Unmarshal(impExt.Bidder, &bidderImpExt); err != nil { errs = append(errs, fmt.Errorf("failed unmarshalling bidder imp ext (err)%s", err.Error())) continue @@ -116,7 +116,7 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte return requests, errs } -// MakeBids collect bid response from liftoff and change them into the form that Prebid Server can handle. +// MakeBids collect bid response from vungle and change them into the form that Prebid Server can handle. func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) { if adapters.IsResponseStatusCodeNoContent(responseData) { return nil, nil diff --git a/adapters/liftoff/liftoff_test.go b/adapters/vungle/vungle_test.go similarity index 56% rename from adapters/liftoff/liftoff_test.go rename to adapters/vungle/vungle_test.go index 4003bd21171..6200924eea3 100644 --- a/adapters/liftoff/liftoff_test.go +++ b/adapters/vungle/vungle_test.go @@ -1,4 +1,4 @@ -package liftoff +package vungle import ( "testing" @@ -10,12 +10,12 @@ import ( func TestJsonSamples(t *testing.T) { conf := config.Adapter{ - Endpoint: "https://liftoff.io/bit/t", + Endpoint: "https://vungle.io/bit/t", } - bidder, buildErr := Builder(openrtb_ext.BidderLiftoff, conf, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 667, DataCenter: "2"}) + bidder, buildErr := Builder(openrtb_ext.BidderVungle, conf, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 667, DataCenter: "2"}) if buildErr != nil { t.Fatalf("Builder returned unexpected error %v", buildErr) } - adapterstest.RunJSONBidderTest(t, "liftofftest", bidder) + adapterstest.RunJSONBidderTest(t, "vungletest", bidder) } diff --git a/adapters/liftoff/liftofftest/exemplary/app_video_instl.json b/adapters/vungle/vungletest/exemplary/app_video_instl.json similarity index 98% rename from adapters/liftoff/liftofftest/exemplary/app_video_instl.json rename to adapters/vungle/vungletest/exemplary/app_video_instl.json index 4f714c72880..a0766528bbe 100644 --- a/adapters/liftoff/liftofftest/exemplary/app_video_instl.json +++ b/adapters/vungle/vungletest/exemplary/app_video_instl.json @@ -45,7 +45,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/exemplary/app_video_rewarded.json b/adapters/vungle/vungletest/exemplary/app_video_rewarded.json similarity index 98% rename from adapters/liftoff/liftofftest/exemplary/app_video_rewarded.json rename to adapters/vungle/vungletest/exemplary/app_video_rewarded.json index 5dcc3460254..5e86fe9a61a 100644 --- a/adapters/liftoff/liftofftest/exemplary/app_video_rewarded.json +++ b/adapters/vungle/vungletest/exemplary/app_video_rewarded.json @@ -42,7 +42,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/exemplary/site_video_instl.json b/adapters/vungle/vungletest/exemplary/site_video_instl.json similarity index 98% rename from adapters/liftoff/liftofftest/exemplary/site_video_instl.json rename to adapters/vungle/vungletest/exemplary/site_video_instl.json index 0392fda94a3..56a8deb8520 100644 --- a/adapters/liftoff/liftofftest/exemplary/site_video_instl.json +++ b/adapters/vungle/vungletest/exemplary/site_video_instl.json @@ -45,7 +45,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/exemplary/site_video_rewarded.json b/adapters/vungle/vungletest/exemplary/site_video_rewarded.json similarity index 98% rename from adapters/liftoff/liftofftest/exemplary/site_video_rewarded.json rename to adapters/vungle/vungletest/exemplary/site_video_rewarded.json index 73f3aea4676..9388c5be22a 100644 --- a/adapters/liftoff/liftofftest/exemplary/site_video_rewarded.json +++ b/adapters/vungle/vungletest/exemplary/site_video_rewarded.json @@ -42,7 +42,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/appid_placementid_check.json b/adapters/vungle/vungletest/supplemental/appid_placementid_check.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/appid_placementid_check.json rename to adapters/vungle/vungletest/supplemental/appid_placementid_check.json index 5dcc3460254..5e86fe9a61a 100644 --- a/adapters/liftoff/liftofftest/supplemental/appid_placementid_check.json +++ b/adapters/vungle/vungletest/supplemental/appid_placementid_check.json @@ -42,7 +42,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/missing_appid_or_placementid.json b/adapters/vungle/vungletest/supplemental/missing_appid_or_placementid.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/missing_appid_or_placementid.json rename to adapters/vungle/vungletest/supplemental/missing_appid_or_placementid.json index e22fe62da35..4eda9800645 100644 --- a/adapters/liftoff/liftofftest/supplemental/missing_appid_or_placementid.json +++ b/adapters/vungle/vungletest/supplemental/missing_appid_or_placementid.json @@ -41,7 +41,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/no_site_or_app_video_rewarded.json b/adapters/vungle/vungletest/supplemental/no_site_or_app_video_rewarded.json similarity index 100% rename from adapters/liftoff/liftofftest/supplemental/no_site_or_app_video_rewarded.json rename to adapters/vungle/vungletest/supplemental/no_site_or_app_video_rewarded.json diff --git a/adapters/liftoff/liftofftest/supplemental/response_code_204.json b/adapters/vungle/vungletest/supplemental/response_code_204.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/response_code_204.json rename to adapters/vungle/vungletest/supplemental/response_code_204.json index a39770abe1f..16a4dbc66ac 100644 --- a/adapters/liftoff/liftofftest/supplemental/response_code_204.json +++ b/adapters/vungle/vungletest/supplemental/response_code_204.json @@ -39,7 +39,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/response_code_400.json b/adapters/vungle/vungletest/supplemental/response_code_400.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/response_code_400.json rename to adapters/vungle/vungletest/supplemental/response_code_400.json index 1a619447dd4..6975362ed18 100644 --- a/adapters/liftoff/liftofftest/supplemental/response_code_400.json +++ b/adapters/vungle/vungletest/supplemental/response_code_400.json @@ -39,7 +39,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/response_code_non_200.json b/adapters/vungle/vungletest/supplemental/response_code_non_200.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/response_code_non_200.json rename to adapters/vungle/vungletest/supplemental/response_code_non_200.json index 1c79a057329..3582a4b245c 100644 --- a/adapters/liftoff/liftofftest/supplemental/response_code_non_200.json +++ b/adapters/vungle/vungletest/supplemental/response_code_non_200.json @@ -39,7 +39,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/adapters/liftoff/liftofftest/supplemental/liftoff_ext_check.json b/adapters/vungle/vungletest/supplemental/vungle_ext_check.json similarity index 98% rename from adapters/liftoff/liftofftest/supplemental/liftoff_ext_check.json rename to adapters/vungle/vungletest/supplemental/vungle_ext_check.json index 9a9cdebfd59..c2c179734e5 100644 --- a/adapters/liftoff/liftofftest/supplemental/liftoff_ext_check.json +++ b/adapters/vungle/vungletest/supplemental/vungle_ext_check.json @@ -39,7 +39,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://liftoff.io/bit/t", + "uri": "https://vungle.io/bit/t", "headers": { "Content-Type": ["application/json"], "Accept": ["application/json"], diff --git a/exchange/adapter_builders.go b/exchange/adapter_builders.go index 09c7bf83777..1593773b064 100755 --- a/exchange/adapter_builders.go +++ b/exchange/adapter_builders.go @@ -111,7 +111,6 @@ import ( "github.com/prebid/prebid-server/v2/adapters/kiviads" "github.com/prebid/prebid-server/v2/adapters/krushmedia" "github.com/prebid/prebid-server/v2/adapters/lemmadigital" - "github.com/prebid/prebid-server/v2/adapters/liftoff" "github.com/prebid/prebid-server/v2/adapters/limelightDigital" lmkiviads "github.com/prebid/prebid-server/v2/adapters/lm_kiviads" "github.com/prebid/prebid-server/v2/adapters/lockerdome" @@ -194,6 +193,7 @@ import ( "github.com/prebid/prebid-server/v2/adapters/visx" "github.com/prebid/prebid-server/v2/adapters/vox" "github.com/prebid/prebid-server/v2/adapters/vrtcal" + "github.com/prebid/prebid-server/v2/adapters/vungle" "github.com/prebid/prebid-server/v2/adapters/xeworks" "github.com/prebid/prebid-server/v2/adapters/yahooAds" "github.com/prebid/prebid-server/v2/adapters/yandex" @@ -323,7 +323,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder { openrtb_ext.BidderLmKiviads: lmkiviads.Builder, openrtb_ext.BidderKrushmedia: krushmedia.Builder, openrtb_ext.BidderLemmadigital: lemmadigital.Builder, - openrtb_ext.BidderLiftoff: liftoff.Builder, + openrtb_ext.BidderVungle: vungle.Builder, openrtb_ext.BidderLimelightDigital: limelightDigital.Builder, openrtb_ext.BidderLockerDome: lockerdome.Builder, openrtb_ext.BidderLogan: logan.Builder, diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index b6cda02b89c..f0f0c02303b 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -129,7 +129,7 @@ var coreBidderNames []BidderName = []BidderName{ BidderLmKiviads, BidderKrushmedia, BidderLemmadigital, - BidderLiftoff, + BidderVungle, BidderLimelightDigital, BidderLockerDome, BidderLogan, @@ -439,7 +439,6 @@ const ( BidderLmKiviads BidderName = "lm_kiviads" BidderKrushmedia BidderName = "krushmedia" BidderLemmadigital BidderName = "lemmadigital" - BidderLiftoff BidderName = "liftoff" BidderLimelightDigital BidderName = "limelightDigital" BidderLockerDome BidderName = "lockerdome" BidderLogan BidderName = "logan" @@ -522,6 +521,7 @@ const ( BidderVisx BidderName = "visx" BidderVox BidderName = "vox" BidderVrtcal BidderName = "vrtcal" + BidderVungle BidderName = "vungle" BidderXeworks BidderName = "xeworks" BidderYahooAds BidderName = "yahooAds" BidderYandex BidderName = "yandex" diff --git a/openrtb_ext/imp_liftoff.go b/openrtb_ext/imp_liftoff.go index d8a93d8906a..00a87832f10 100644 --- a/openrtb_ext/imp_liftoff.go +++ b/openrtb_ext/imp_liftoff.go @@ -1,6 +1,6 @@ package openrtb_ext -type ImpExtLiftoff struct { +type ImpExtVungle struct { BidToken string `json:"bid_token"` PubAppStoreID string `json:"app_store_id"` PlacementRefID string `json:"placement_reference_id"` diff --git a/static/bidder-info/liftoff.yaml b/static/bidder-info/vungle.yaml similarity index 100% rename from static/bidder-info/liftoff.yaml rename to static/bidder-info/vungle.yaml diff --git a/static/bidder-params/liftoff.json b/static/bidder-params/vungle.json similarity index 89% rename from static/bidder-params/liftoff.json rename to static/bidder-params/vungle.json index 32aa7f89a53..6ad85e17800 100644 --- a/static/bidder-params/liftoff.json +++ b/static/bidder-params/vungle.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Liftoff Adapter Params", - "description": "A schema which validates params accepted by the Liftoff adapter", + "title": "Vungle Adapter Params", + "description": "A schema which validates params accepted by the Vungle adapter", "type": "object", "properties": { "app_store_id": { From c252c33858bb65a2f6a45ac129a54a48a49314df Mon Sep 17 00:00:00 2001 From: Gordon Tian Date: Wed, 5 Jun 2024 14:37:32 +0800 Subject: [PATCH 2/3] add warning message for liftoff --- exchange/adapter_util.go | 1 + openrtb_ext/bidders.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/exchange/adapter_util.go b/exchange/adapter_util.go index cd70530bfc3..0d277d15723 100644 --- a/exchange/adapter_util.go +++ b/exchange/adapter_util.go @@ -120,6 +120,7 @@ func GetDisabledBidderWarningMessages(infos config.BidderInfos) map[string]strin "applogy": `Bidder "applogy" is no longer available in Prebid Server. Please update your configuration.`, "rhythmone": `Bidder "rhythmone" is no longer available in Prebid Server. Please update your configuration.`, "nanointeractive": `Bidder "nanointeractive" is no longer available in Prebid Server. Please update your configuration.`, + "liftoff": `Bidder "liftoff" is no longer available in Prebid Server. If you're looking to use the Vungle Exchange adapter, please rename it to "vungle" in your configuration.`, } return mergeRemovedAndDisabledBidderWarningMessages(removed, infos) diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index f0f0c02303b..adcee3ad09a 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -129,7 +129,6 @@ var coreBidderNames []BidderName = []BidderName{ BidderLmKiviads, BidderKrushmedia, BidderLemmadigital, - BidderVungle, BidderLimelightDigital, BidderLockerDome, BidderLogan, @@ -212,6 +211,7 @@ var coreBidderNames []BidderName = []BidderName{ BidderVisx, BidderVox, BidderVrtcal, + BidderVungle, BidderXeworks, BidderYahooAds, BidderYandex, From 37a8fc369bd1ee1be2af876690acc00cb5e67430 Mon Sep 17 00:00:00 2001 From: Gordon Tian Date: Thu, 6 Jun 2024 23:28:42 +0800 Subject: [PATCH 3/3] rename file --- openrtb_ext/{imp_liftoff.go => imp_vungle.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openrtb_ext/{imp_liftoff.go => imp_vungle.go} (100%) diff --git a/openrtb_ext/imp_liftoff.go b/openrtb_ext/imp_vungle.go similarity index 100% rename from openrtb_ext/imp_liftoff.go rename to openrtb_ext/imp_vungle.go