From a6d353d06b07d16aa441affd11ac3c8910657b39 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 17 Jul 2023 15:41:41 -0400 Subject: [PATCH] updated server url and removed host variable requirement --- adapters/datablocks/datablocks.go | 12 +++--------- .../datablockstest/exemplary/multi-request.json | 10 +++++----- .../datablocks/datablockstest/exemplary/native.json | 6 +++--- .../datablockstest/exemplary/simple-banner.json | 6 +++--- .../datablockstest/exemplary/simple-video.json | 6 +++--- .../supplemental/bad-response-body.json | 6 +++--- .../supplemental/bad-server-response.json | 6 +++--- .../datablockstest/supplemental/bad-sourceId.json | 2 +- .../supplemental/no-content-response.json | 6 +++--- openrtb_ext/imp_datablocks.go | 1 - static/bidder-params/datablocks.json | 6 +----- 11 files changed, 28 insertions(+), 39 deletions(-) diff --git a/adapters/datablocks/datablocks.go b/adapters/datablocks/datablocks.go index 8929c84853a..a39721a44a3 100644 --- a/adapters/datablocks/datablocks.go +++ b/adapters/datablocks/datablocks.go @@ -27,7 +27,7 @@ func (a *DatablocksAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo * "Accept": {"application/json"}, } - // Pull the host and source ID info from the bidder params. + // Pull the source ID info from the bidder params. reqImps, err := splitImpressions(request.Imp) if err != nil { @@ -45,7 +45,7 @@ func (a *DatablocksAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo * continue } - urlParams := macros.EndpointTemplateParams{Host: reqExt.Host, SourceId: strconv.Itoa(reqExt.SourceId)} + urlParams := macros.EndpointTemplateParams{SourceId: strconv.Itoa(reqExt.SourceId)} url, err := macros.ResolveMacros(a.EndpointTemplate, urlParams) if err != nil { @@ -137,7 +137,7 @@ func getBidderParams(imp *openrtb2.Imp) (*openrtb_ext.ExtImpDatablocks, error) { var datablocksExt openrtb_ext.ExtImpDatablocks if err := json.Unmarshal(bidderExt.Bidder, &datablocksExt); err != nil { return nil, &errortypes.BadInput{ - Message: fmt.Sprintf("Cannot Resolve host or sourceId: %s", err.Error()), + Message: fmt.Sprintf("Cannot Resolve sourceId: %s", err.Error()), } } @@ -147,12 +147,6 @@ func getBidderParams(imp *openrtb2.Imp) (*openrtb_ext.ExtImpDatablocks, error) { } } - if len(datablocksExt.Host) < 1 { - return nil, &errortypes.BadInput{ - Message: "Invalid/Missing Host", - } - } - return &datablocksExt, nil } diff --git a/adapters/datablocks/datablockstest/exemplary/multi-request.json b/adapters/datablocks/datablockstest/exemplary/multi-request.json index 286e058a72e..eafd80927fa 100644 --- a/adapters/datablocks/datablockstest/exemplary/multi-request.json +++ b/adapters/datablocks/datablockstest/exemplary/multi-request.json @@ -17,7 +17,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -34,7 +34,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -54,7 +54,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=906295", + "uri": "http://pbserver.dblks.net/openrtb2?sid=906295", "body": { "id": "some-request-id", @@ -73,7 +73,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -91,7 +91,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } diff --git a/adapters/datablocks/datablockstest/exemplary/native.json b/adapters/datablocks/datablockstest/exemplary/native.json index 9487079c734..c4cf189e1b4 100644 --- a/adapters/datablocks/datablockstest/exemplary/native.json +++ b/adapters/datablocks/datablockstest/exemplary/native.json @@ -14,7 +14,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -38,7 +38,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=906295", + "uri": "http://pbserver.dblks.net/openrtb2?sid=906295", "body": { "id": "some-request-id", @@ -54,7 +54,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } diff --git a/adapters/datablocks/datablockstest/exemplary/simple-banner.json b/adapters/datablocks/datablockstest/exemplary/simple-banner.json index 289549ab588..5c01a29a519 100644 --- a/adapters/datablocks/datablockstest/exemplary/simple-banner.json +++ b/adapters/datablocks/datablockstest/exemplary/simple-banner.json @@ -21,7 +21,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -41,7 +41,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=906295", + "uri": "http://pbserver.dblks.net/openrtb2?sid=906295", "body": { "id": "some-request-id", @@ -64,7 +64,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } diff --git a/adapters/datablocks/datablockstest/exemplary/simple-video.json b/adapters/datablocks/datablockstest/exemplary/simple-video.json index 6f8073107f3..fcb2defa649 100644 --- a/adapters/datablocks/datablockstest/exemplary/simple-video.json +++ b/adapters/datablocks/datablockstest/exemplary/simple-video.json @@ -18,7 +18,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } @@ -39,7 +39,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=906295", + "uri": "http://pbserver.dblks.net/openrtb2?sid=906295", "body": { "id": "some-request-id", @@ -59,7 +59,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 906295 } } diff --git a/adapters/datablocks/datablockstest/supplemental/bad-response-body.json b/adapters/datablocks/datablockstest/supplemental/bad-response-body.json index 7c4801e1685..e60c6aabb7d 100644 --- a/adapters/datablocks/datablockstest/supplemental/bad-response-body.json +++ b/adapters/datablocks/datablockstest/supplemental/bad-response-body.json @@ -17,7 +17,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } @@ -37,7 +37,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=123", + "uri": "http://pbserver.dblks.net/openrtb2?sid=123", "body": { "id": "some-request-id", @@ -56,7 +56,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } diff --git a/adapters/datablocks/datablockstest/supplemental/bad-server-response.json b/adapters/datablocks/datablockstest/supplemental/bad-server-response.json index da2924f6f21..cdcc0c37d4c 100644 --- a/adapters/datablocks/datablockstest/supplemental/bad-server-response.json +++ b/adapters/datablocks/datablockstest/supplemental/bad-server-response.json @@ -17,7 +17,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } @@ -37,7 +37,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=123", + "uri": "http://pbserver.dblks.net/openrtb2?sid=123", "body": { "id": "some-request-id", @@ -56,7 +56,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } diff --git a/adapters/datablocks/datablockstest/supplemental/bad-sourceId.json b/adapters/datablocks/datablockstest/supplemental/bad-sourceId.json index 08f2fddf568..3182e71dc84 100644 --- a/adapters/datablocks/datablockstest/supplemental/bad-sourceId.json +++ b/adapters/datablocks/datablockstest/supplemental/bad-sourceId.json @@ -16,7 +16,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 0 } } diff --git a/adapters/datablocks/datablockstest/supplemental/no-content-response.json b/adapters/datablocks/datablockstest/supplemental/no-content-response.json index 7fc1b75c3ad..0e53f4720a9 100644 --- a/adapters/datablocks/datablockstest/supplemental/no-content-response.json +++ b/adapters/datablocks/datablockstest/supplemental/no-content-response.json @@ -17,7 +17,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } @@ -37,7 +37,7 @@ { "expectedRequest": { - "uri": "http://search.nutella.datablocks.net/openrtb2?sid=123", + "uri": "http://pbserver.dblks.net/openrtb2?sid=123", "body": { "id": "some-request-id", @@ -56,7 +56,7 @@ { "bidder": { - "host": "search.nutella.datablocks.net", + "host": "pbserver.dblks.net", "sourceId": 123 } } diff --git a/openrtb_ext/imp_datablocks.go b/openrtb_ext/imp_datablocks.go index c8659d3ff11..2be043c5976 100644 --- a/openrtb_ext/imp_datablocks.go +++ b/openrtb_ext/imp_datablocks.go @@ -3,5 +3,4 @@ package openrtb_ext // 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/static/bidder-params/datablocks.json b/static/bidder-params/datablocks.json index 2abb986786b..59b7f94706c 100644 --- a/static/bidder-params/datablocks.json +++ b/static/bidder-params/datablocks.json @@ -9,11 +9,7 @@ "type": "integer", "minimum": 1, "description": "Website Source Id" - }, - "host": { - "type": "string", - "description": "Network Host to request from" } }, - "required": ["host", "sourceId"] + "required": ["sourceId"] }