Skip to content

Commit

Permalink
UOE-6319: Prebid-server version upgrade to 0.157.0 (#148)
Browse files Browse the repository at this point in the history 
* Tappx User Syncer + Site Update (prebid#1674)

Co-authored-by: ubuntu <ahernandez@tappx.com>
Co-authored-by: Albert Grandes <agrandes@tappx.com>

* Beachfront Additional tests (prebid#1679)

* added place holder files for all but a couple of the intended new tests. I need to grok what those couple mean before being able to name a file.

* This covers most of the suggested cases and a couple more that occured to me. I'll look at the couple that I held off on next.

* added the unmarshal tests and found a couple problems to address in the process.

* removed my __debug_bin. should be in gitignore.

* A bit of clean up and commenting. Bumped version number. Added __debug_bin to .gitignore. This is the debugging binary created by Visual Studio Code, or at least version 1.52.1.

* missed a bunch of version strings

* removed IP faker

* If IP is not included in an AdM request, an error is now thrown for the AdM imp instead of faking it. The AdM endpoint is the only one that requires an IP. Also, added several "no-ip" test cases.

* Whent back to the fake IP solution instead of the error. Removed most of the "no-ip" test cases, leaving one.

* changed ip in adm-video.json to not match the faker ip

* removed a debugging comment

* New Adapter: Onetag (prebid#1695)

* Pubmatic: Trimming publisher ID before passing (prebid#1685)

* Trimming publisher ID before passing

* Fix typos in nobid.json (prebid#1704)

* Fix Typo In Adform Bidder Params (prebid#1705)

* Don't Load GVL v1 for TCF2 (+ TCF1 Cleanup) (prebid#1693)

* Typo fix for connectad bidder params (prebid#1706)

* Typo fix for invibes bidder params (prebid#1707)

* Typo fix nanointeractive bidder params (prebid#1708)

* Isolate /info/bidders Data Model + Add Uses HTTPS Flag (prebid#1692)

* Initial Commit

* Merge Conflict Fixes

* Removed Unncessary JSON Attributes

* Removed Dev Notes

* Add Missing validateDefaultAliases Test

* Improved Reversed Test

* Remove Var Scope Confusion

* Proper Tests For Bidder Param Validator

* Removed Unused Test Setup

* New Adapter: Epom (prebid#1680)

Co-authored-by: Vasyl Zarva <vasyan.z@gmail.com>

* New Adapter: Pangle (prebid#1697)

Co-authored-by: hcai <caihengsheng@bytedance.com>

* Fix Merge Conflict (prebid#1714)

* GumGum: adds pubId and irisid properties/parameters (prebid#1664)

* adds pubId and irisid properties

* updates per naming convention & makes a video copy

* updates when to copy banner, adds Publisher fallback and multiformat request

* adds more json tests

* rename the json file to remove whitespaces

* Accommodate Apple iOS LMT bug (prebid#1718)

* New Adapter: jixie (prebid#1698)

* initial commit

* added notes file for temp use

* jixie adapter development work

* jixie adaptor development work: mainly the test json files but also the jixie usersync code

* added a test case with accountid. and cosmetic line changes in the banner*json test file

* updated the jixie user sync: the endpoint and some params stuf

* tks and fixing per comments on pull request 1698

* responding to guscarreon's comments:
-more checking in makerequest of the bidder params (added 2 more test jsons)
-removed blank lines, lines commented out
-test_params: a case with unit alone
-BadInput error

* responding to review. put condition on jixie unit string in the bidder-params/jixie.json file.
removed checking in jixie.go that has become unnecssary. removed unnec test cases.
updated params-test

* added one failed params test

* removed a function that I no longer call!

* renamed JixieAdapter to adapter

* removed bidfloor from jixie explicit ext params

* Fix Regs Nil Condition (prebid#1723)

* Mobfox: Add rout to adexcange (prebid#1702)

Co-authored-by: mobfox <artem.iholkin@smartyads.com>

* New Adapter: TrustX (prebid#1726)

* New Adapter: UNICORN (prebid#1719)

* add bidder-info, bidder-params for UNICORN

* Add adapter

* Fixes GDPR bug about being overly strict on publisher restrictions (prebid#1730)

* 33Across: Updated exchange endpoint (prebid#1738)

* New Adapter: Adyoulike (prebid#1700)

Co-authored-by: Damien Dumas <damien.dumas@adyoulike.com>

* Hoist GVL ID To Bidder Info (prebid#1721)

* Improve Digital adapter: add support for native ads (prebid#1746)

* Add Support For SkAdN + Refactor Split Imps (prebid#1741)

* No Longer Move bid.ext To bid.ext.bidder (prebid#1742)

* No Longer Move bid.ext To bid.ext.bidder

* Remove Similar Behavior From seatbid.ext

* Avoid Second Bid Copy

* Removed Unused seatbid.ext

* Typo fix: adyoulike bidder param debug description (prebid#1755)

* Aliases: Better Error Message For Disabled Bidder (prebid#1751)

* beachfront: Changes to support real 204 (prebid#1737)

* Fix race condition in 33across.go (prebid#1757)

Co-authored-by: Gus Carreon <gcarreongutierrez@vpn-10-75-11-243.nym2.appnexus.com>

* Revert "Fix race condition in 33across.go (prebid#1757)" (prebid#1763)

This reverts commit bdf1e7b.

* Replace TravisCI With GitHub Actions (prebid#1754)

* Initial Commit

* Finished Configuration

* Remove TravisCI

* Remove TravisCI

* Fix Go Version Badge

* Correct Fix For Go Version Badge

* Removed Custom Config File Name

* Debug warnings (prebid#1724)

Co-authored-by: Veronika Solovei <veronika.solovei@xandr.com>

* Rubicon: Support sending segments to XAPI (prebid#1752)

Co-authored-by: Serhii Nahornyi <snahornyi@rubiconproject.com>

* validateNativeContextTypes function test cases (prebid#1743)

* Applogy: Fix Shared Memory Overwriting (prebid#1758)

* Pubmatic: Fix Shared Memory Overwriting (prebid#1759)

* Beachfront: Fix Shared Memory Overwriting (prebid#1762)

* Fix race condition in Beachfront adapter

* Removed nil check and simplified

* FPD: Allow imp.ext.data To Passthrough To Adapters (prebid#1765)

* Smaato: Add support for app (prebid#1767)

Co-authored-by: Bernhard Pickenbrock <bernhard.pickenbrock@smaato.com>

* Update sync types (prebid#1770)

* 33across: Fix Shared Memory Overwriting (prebid#1764)

This reverts commit f7df258.

* Fix race condition in Yeahmobi adapter (prebid#1761)

Co-authored-by: Gus Carreon <gcarreongutierrez@Guss-MacBook-Pro.local>

* Pubnative: Fix Shared Memory Overwriting (prebid#1760)

* Add request for registration (prebid#1780)

* Update OpenRTB Library (prebid#1733)

* Tappx changes - Backward compatible change of version (prebid#1777)

Co-authored-by: ubuntu <ahernandez@tappx.com>
Co-authored-by: Albert Grandes <agrandes@tappx.com>

* DMX: Enforcing w and h in imp (prebid#1778)

Co-authored-by: steve-a-districtm <steve@districtm.net>

* Remove Authorization Headers From Debug Response (prebid#1779)

* Hide Authorization Headers In Debug Response

* MakeExtHeaders Tests

* Add Empty Test

* Use http.Header Methods

* Updates From Code Review

* Fix Merge Conflict

* New Adapter: Bidmachine (prebid#1769)

* New Adapter: Criteo (prebid#1775)

* Fix shared memory issue when stripping authorization header from bid requests (prebid#1790)

* RTB House: update parameters (prebid#1785)

* update parameters required by RTB House adapter

* tabs to spaces

Co-authored-by: Przemyslaw Iwanczak <przemyslaw.iwanczak@rtbhouse.com>

* Generate seatbid[].bid[].ext.prebid.bidid (prebid#1772)

* Basic GDPR enforcement for specific publisher-vendors. (prebid#1782)

* New Adapter: Zemanta (prebid#1774)

* add zemanta adapter

* update openrtb package for zemanta

* fix loop iterator reference bug

* fix getMediaTypeForImp to match server behavior

* Zemanta: Rename Adapter To Outbrain (prebid#1797)

* Update openrtb library to v15 (prebid#1802)

* IX: Set bidVideo when category and duration is available (prebid#1794)

* Update IX defaults (prebid#1799)

Co-authored-by: Mike Burns <mike.burns@indexexchange.com>

* Update Adyoulike endpoint to hit production servers (prebid#1805)

* Openx: use bidfloor if set - prebid.js adapter behavior  (prebid#1795)

* [ORBIDDER] add gvlVendorID and set bid response currency (prebid#1798)

* New Adapter: ADXCG (prebid#1803)

* Update kidoz properties to type string (prebid#1808)

Remove definitions object from schema and define types and other parameters directly in properties objects to ensure compatibility with more downstream systems that use this schema.

* Update bidmachine properties to type string (prebid#1809)

Remove definitions object from schema and define types and other parameters directly in properties objects to ensure compatibility with more downstream systems that use this schema.

* transform native eventtrackers to imptrackers and jstracker (prebid#1811)

* TheMediaGrid: Added processing of imp[].ext.data (prebid#1807)

* Renaming package github.com/PubMatic-OpenWrap/openrtb to github.com/mxmCherry/openrtb

* Rename package github.com/PubMatic-OpenWrap/prebid-server to github.com/prebid/prebid-server

* UOE-6196: OpenWrap S2S: Remove adpod_id from AppNexus adapter

* Refactored code and fixed indentation

* Fixed indentation for json files

* Fixed indentation for json files

* Fixed import in adapters/gumgum/gumgum.go

* Reverted unwanted changes in test json files

* Fixed unwanted git merge changes

* Added missing field SkipDedup in ExtIncludeBrandCategory

* Added missing Bidder field in ExtBid type

* Exposing CookieSyncRequest for header-bidding

* Temporary path change for static folder

* Fixed static folder paths

* Fixed default value in config for usersync_if_ambiguous

* Fixed config after upgrade

* Updated router.go to uncomment defaultRequest validation

* Fixed path for accounts.filesystem.directorypath

* Fixed diff with OW

* Added DMX default usersync URL

* Reverted Dmx default usersync url, Will add it in properties file

Co-authored-by: prebidtappx <77485538+prebidtappx@users.noreply.github.com>
Co-authored-by: ubuntu <ahernandez@tappx.com>
Co-authored-by: Albert Grandes <agrandes@tappx.com>
Co-authored-by: Jim Naumann <muncha@users.noreply.github.com>
Co-authored-by: onetag-dev <38786435+onetag-dev@users.noreply.github.com>
Co-authored-by: agilfix <agilfix@appnexus.com>
Co-authored-by: Scott Kay <noreply@syntaxnode.com>
Co-authored-by: epomrnd <epomrnd@users.noreply.github.com>
Co-authored-by: Vasyl Zarva <vasyan.z@gmail.com>
Co-authored-by: Hengsheng Cai <luke.hengshengcai@gmail.com>
Co-authored-by: hcai <caihengsheng@bytedance.com>
Co-authored-by: susyt <susan@fox.camp>
Co-authored-by: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com>
Co-authored-by: mobfxoHB <74364234+mobfxoHB@users.noreply.github.com>
Co-authored-by: mobfox <artem.iholkin@smartyads.com>
Co-authored-by: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Co-authored-by: faithnh <faithnh.stepmania.master@gmail.com>
Co-authored-by: hhhjort <31041505+hhhjort@users.noreply.github.com>
Co-authored-by: Aparna Rao <pr.aparna@gmail.com>
Co-authored-by: guiann <guillaume.andouard@adyoulike.com>
Co-authored-by: Damien Dumas <damien.dumas@adyoulike.com>
Co-authored-by: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Co-authored-by: guscarreon <guscarreon@gmail.com>
Co-authored-by: Gus Carreon <gcarreongutierrez@vpn-10-75-11-243.nym2.appnexus.com>
Co-authored-by: Veronika Solovei <kalypsonika@gmail.com>
Co-authored-by: Veronika Solovei <veronika.solovei@xandr.com>
Co-authored-by: Serhii Nahornyi <sergiy3344@gmail.com>
Co-authored-by: Serhii Nahornyi <snahornyi@rubiconproject.com>
Co-authored-by: el-chuck <be.pickenbrock@gmail.com>
Co-authored-by: Bernhard Pickenbrock <bernhard.pickenbrock@smaato.com>
Co-authored-by: Gena <wertixvost@gmail.com>
Co-authored-by: Gus Carreon <gcarreongutierrez@Guss-MacBook-Pro.local>
Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: Steve Alliance <steve.alliance@gmail.com>
Co-authored-by: steve-a-districtm <steve@districtm.net>
Co-authored-by: Pavel Dunyashev <pasha.1992@mail.ru>
Co-authored-by: Benjamin <benjamin.chastanier@gmail.com>
Co-authored-by: Brian Sardo <1168933+bsardo@users.noreply.github.com>
Co-authored-by: Przemysław Iwańczak <36727380+piwanczak@users.noreply.github.com>
Co-authored-by: Przemyslaw Iwanczak <przemyslaw.iwanczak@rtbhouse.com>
Co-authored-by: Rok Sušnik <rokostik@gmail.com>
Co-authored-by: Rok Sušnik <rsusnik@outbrain.com>
Co-authored-by: ixjohnny <75964135+ixjohnny@users.noreply.github.com>
Co-authored-by: Michael Burns <mlb7687@users.noreply.github.com>
Co-authored-by: Mike Burns <mike.burns@indexexchange.com>
Co-authored-by: Laurentiu Badea <laurb9@users.noreply.github.com>
Co-authored-by: Arne Schulz <arne.schulz@otto.de>
Co-authored-by: adxcgcom <31470944+adxcgcom@users.noreply.github.com>
  • Loading branch information
@sachin-pubmatic @prebidtappx
@ah-tappx @agrandes-tappx @muncha @onetag-dev @agilfix @SyntaxNode @epomrnd @VasylZarva @chshpra @susyt @jxdeveloper1 @mobfxoHB @TheMediaGrid @faithnh @hhhjort @curlyblueeagle @guiann @jbartek25 @guscarreon @VeronikaSolovei9 @SerhiiNahornyi @el-chuck @GeneGenie @bretg @stevealliance @steve-a-districtm @meeeeeepo @benjaminch @bsardo @piwanczak @rokostik @ixjohnny @mlb7687 @laurb9 @arneschulz1984 @adxcgcom
49 people authored Apr 29, 2021
1 parent abe952c commit acefdc8
Show file tree
Hide file tree
Showing 1,135 changed files with 33,386 additions and 8,858 deletions.
9 changes: 9 additions & 0 deletions .github/release-drafter.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
change-template: '* $TITLE (#$NUMBER)'
template: |
## Changes
$CHANGES
## Contributors
$CONTRIBUTORS
26 changes: 26 additions & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Release

on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'

jobs:
release:
name: Create Release
if: github.event.base_ref == 'refs/heads/master'
runs-on: ubuntu-latest
steps:
- name: Get Version
id: get_version
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}

- name: Create & Publish Release
uses: release-drafter/release-drafter@v5.12.1
with:
name: ${{ steps.get_version.outputs.version }}
tag: ${{ steps.get_version.outputs.version }}
version: ${{ steps.get_version.outputs.version }}
publish: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ vendor
prebid-server
build
debug
__debug_bin

# config files
pbs.*
Expand Down
30 changes: 0 additions & 30 deletions .travis.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test: deps
ifeq "$(adapter)" ""
./validate.sh
else
go test github.com/PubMatic-OpenWrap/prebid-server/adapters/$(adapter) -bench=.
go test github.com/prebid/prebid-server/adapters/$(adapter) -bench=.
endif

# build will ensure all of our tests pass and then build the go binary
Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[![Build Status](https://travis-ci.org/prebid/prebid-server.svg?branch=master)](https://travis-ci.org/prebid/prebid-server)
[![Go Report Card](https://goreportcard.com/badge/github.com/PubMatic-OpenWrap/prebid-server?style=flat-square)](https://goreportcard.com/report/github.com/PubMatic-OpenWrap/prebid-server)
[![Build](https://img.shields.io/github/workflow/status/prebid/prebid-server/Validate/master?style=flat-square)](https://github.com/prebid/prebid-server/actions/workflows/validate.yml)
[![Go Report Card](https://goreportcard.com/badge/github.com/prebid/prebid-server?style=flat-square)](https://goreportcard.com/report/github.com/prebid/prebid-server)
![Go Version](https://img.shields.io/github/go-mod/go-version/prebid/prebid-server?style=flat-square)

# Prebid Server

Expand All @@ -16,6 +17,8 @@ For more information, see:
- [Prebid Server Overview](https://docs.prebid.org/prebid-server/overview/prebid-server-overview.html)
- [Current Bidders](http://prebid.org/dev-docs/pbs-bidders.html)

Please consider [registering your Prebid Server](https://docs.prebid.org/prebid-server/hosting/pbs-hosting.html#optional-registration) to get on the mailing list for updates, etc.

## Installation

First install [Go](https://golang.org/doc/install) version 1.14 or newer.
Expand Down
8 changes: 4 additions & 4 deletions account/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"encoding/json"
"fmt"

"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/errortypes"
"github.com/PubMatic-OpenWrap/prebid-server/metrics"
"github.com/PubMatic-OpenWrap/prebid-server/stored_requests"
jsonpatch "github.com/evanphx/json-patch"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/errortypes"
"github.com/prebid/prebid-server/metrics"
"github.com/prebid/prebid-server/stored_requests"
)

// GetAccount looks up the config.Account object referenced by the given accountID, with access rules applied
Expand Down
8 changes: 4 additions & 4 deletions account/account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"testing"

"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/errortypes"
"github.com/PubMatic-OpenWrap/prebid-server/metrics"
"github.com/PubMatic-OpenWrap/prebid-server/stored_requests"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/errortypes"
"github.com/prebid/prebid-server/metrics"
"github.com/prebid/prebid-server/stored_requests"
"github.com/stretchr/testify/assert"
)

Expand Down
32 changes: 16 additions & 16 deletions adapters/33across/33across.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"net/http"

"github.com/PubMatic-OpenWrap/openrtb"
"github.com/PubMatic-OpenWrap/prebid-server/adapters"
"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/errortypes"
"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
"github.com/mxmCherry/openrtb/v15/openrtb2"
"github.com/prebid/prebid-server/adapters"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/errortypes"
"github.com/prebid/prebid-server/openrtb_ext"
)

type TtxAdapter struct {
Expand Down Expand Up @@ -51,7 +51,7 @@ type bidTtxExt struct {
}

// MakeRequests create the object for TTX Reqeust.
func (a *TtxAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
func (a *TtxAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
var errs []error
var adapterRequests []*adapters.RequestData

Expand All @@ -77,14 +77,14 @@ func (a *TtxAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapters
return adapterRequests, errs
}

func (a *TtxAdapter) makeRequest(request openrtb.BidRequest, imp openrtb.Imp) (*adapters.RequestData, error) {
func (a *TtxAdapter) makeRequest(request openrtb2.BidRequest, imp openrtb2.Imp) (*adapters.RequestData, error) {
impCopy, err := makeImps(imp)

if err != nil {
return nil, err
}

request.Imp = []openrtb.Imp{*impCopy}
request.Imp = []openrtb2.Imp{*impCopy}

// Last Step
reqJSON, err := json.Marshal(request)
Expand All @@ -103,7 +103,7 @@ func (a *TtxAdapter) makeRequest(request openrtb.BidRequest, imp openrtb.Imp) (*
}, nil
}

func makeImps(imp openrtb.Imp) (*openrtb.Imp, error) {
func makeImps(imp openrtb2.Imp) (*openrtb2.Imp, error) {
if imp.Banner == nil && imp.Video == nil {
return nil, &errortypes.BadInput{
Message: fmt.Sprintf("Imp ID %s must have at least one of [Banner, Video] defined", imp.ID),
Expand Down Expand Up @@ -158,7 +158,7 @@ func makeImps(imp openrtb.Imp) (*openrtb.Imp, error) {
return &imp, nil
}

func makeReqExt(request *openrtb.BidRequest) ([]byte, error) {
func makeReqExt(request *openrtb2.BidRequest) ([]byte, error) {
var reqExt reqExt

if len(request.Ext) > 0 {
Expand All @@ -181,7 +181,7 @@ func makeReqExt(request *openrtb.BidRequest) ([]byte, error) {
}

// MakeBids make the bids for the bid response.
func (a *TtxAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
func (a *TtxAdapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
if response.StatusCode == http.StatusNoContent {
return nil, nil
}
Expand All @@ -198,7 +198,7 @@ func (a *TtxAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalReque
}}
}

var bidResp openrtb.BidResponse
var bidResp openrtb2.BidResponse

if err := json.Unmarshal(response.Body, &bidResp); err != nil {
return nil, []error{err}
Expand Down Expand Up @@ -227,8 +227,8 @@ func (a *TtxAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalReque

}

func validateVideoParams(video *openrtb.Video, prod string) (*openrtb.Video, error) {
videoCopy := video
func validateVideoParams(video *openrtb2.Video, prod string) (*openrtb2.Video, error) {
videoCopy := *video
if videoCopy.W == 0 ||
videoCopy.H == 0 ||
videoCopy.Protocols == nil ||
Expand All @@ -248,11 +248,11 @@ func validateVideoParams(video *openrtb.Video, prod string) (*openrtb.Video, err
videoCopy.Placement = 1

if videoCopy.StartDelay == nil {
videoCopy.StartDelay = openrtb.StartDelay.Ptr(0)
videoCopy.StartDelay = openrtb2.StartDelay.Ptr(0)
}
}

return videoCopy, nil
return &videoCopy, nil
}

func getBidType(ext bidExt) openrtb_ext.BidType {
Expand Down
6 changes: 3 additions & 3 deletions adapters/33across/33across_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package ttx
import (
"testing"

"github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest"
"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
"github.com/prebid/prebid-server/adapters/adapterstest"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/openrtb_ext"
)

func TestJsonSamples(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/33across/params_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
"github.com/prebid/prebid-server/openrtb_ext"
)

// This file actually intends to test static/bidder-params/33across.json
Expand Down
6 changes: 3 additions & 3 deletions adapters/33across/usersync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package ttx
import (
"text/template"

"github.com/PubMatic-OpenWrap/prebid-server/adapters"
"github.com/PubMatic-OpenWrap/prebid-server/usersync"
"github.com/prebid/prebid-server/adapters"
"github.com/prebid/prebid-server/usersync"
)

func New33AcrossSyncer(temp *template.Template) usersync.Usersyncer {
return adapters.NewSyncer("33across", 58, temp, adapters.SyncTypeIframe)
return adapters.NewSyncer("33across", temp, adapters.SyncTypeIframe)
}
7 changes: 3 additions & 4 deletions adapters/33across/usersync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"text/template"

"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/prebid/prebid-server/privacy"
"github.com/prebid/prebid-server/privacy/ccpa"
"github.com/prebid/prebid-server/privacy/gdpr"
"github.com/stretchr/testify/assert"
)

Expand All @@ -30,6 +30,5 @@ func Test33AcrossSyncer(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr=A&gdpr_consent=B&us_privacy=C&ru=%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz", syncInfo.URL)
assert.Equal(t, "iframe", syncInfo.Type)
assert.EqualValues(t, 58, syncer.GDPRVendorID())
assert.False(t, syncInfo.SupportCORS)
}
24 changes: 12 additions & 12 deletions adapters/acuityads/acuityads.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"net/http"
"text/template"

"github.com/PubMatic-OpenWrap/openrtb"
"github.com/PubMatic-OpenWrap/prebid-server/adapters"
"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/errortypes"
"github.com/PubMatic-OpenWrap/prebid-server/macros"
"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
"github.com/mxmCherry/openrtb/v15/openrtb2"
"github.com/prebid/prebid-server/adapters"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/errortypes"
"github.com/prebid/prebid-server/macros"
"github.com/prebid/prebid-server/openrtb_ext"
)

type AcuityAdsAdapter struct {
Expand All @@ -31,7 +31,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
return bidder, nil
}

func getHeaders(request *openrtb.BidRequest) http.Header {
func getHeaders(request *openrtb2.BidRequest) http.Header {
headers := http.Header{}
headers.Add("Content-Type", "application/json;charset=utf-8")
headers.Add("Accept", "application/json")
Expand All @@ -55,7 +55,7 @@ func getHeaders(request *openrtb.BidRequest) http.Header {
}

func (a *AcuityAdsAdapter) MakeRequests(
openRTBRequest *openrtb.BidRequest,
openRTBRequest *openrtb2.BidRequest,
reqInfo *adapters.ExtraRequestInfo,
) (
requestsToBidder []*adapters.RequestData,
Expand Down Expand Up @@ -87,7 +87,7 @@ func (a *AcuityAdsAdapter) MakeRequests(
}}, nil
}

func (a *AcuityAdsAdapter) getImpressionExt(imp *openrtb.Imp) (*openrtb_ext.ExtAcuityAds, error) {
func (a *AcuityAdsAdapter) getImpressionExt(imp *openrtb2.Imp) (*openrtb_ext.ExtAcuityAds, error) {
var bidderExt adapters.ExtImpBidder
if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
return nil, &errortypes.BadInput{
Expand Down Expand Up @@ -136,7 +136,7 @@ func (a *AcuityAdsAdapter) checkResponseStatusCodes(response *adapters.ResponseD
}

func (a *AcuityAdsAdapter) MakeBids(
openRTBRequest *openrtb.BidRequest,
openRTBRequest *openrtb2.BidRequest,
requestToBidder *adapters.RequestData,
bidderRawResponse *adapters.ResponseData,
) (
Expand All @@ -153,7 +153,7 @@ func (a *AcuityAdsAdapter) MakeBids(
}

responseBody := bidderRawResponse.Body
var bidResp openrtb.BidResponse
var bidResp openrtb2.BidResponse
if err := json.Unmarshal(responseBody, &bidResp); err != nil {
return nil, []error{&errortypes.BadServerResponse{
Message: "Bad Server Response",
Expand All @@ -178,7 +178,7 @@ func (a *AcuityAdsAdapter) MakeBids(
return bidResponse, nil
}

func getMediaTypeForImp(impId string, imps []openrtb.Imp) openrtb_ext.BidType {
func getMediaTypeForImp(impId string, imps []openrtb2.Imp) openrtb_ext.BidType {
mediaType := openrtb_ext.BidTypeBanner
for _, imp := range imps {
if imp.ID == impId {
Expand Down
6 changes: 3 additions & 3 deletions adapters/acuityads/acuityads_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package acuityads
import (
"testing"

"github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest"
"github.com/PubMatic-OpenWrap/prebid-server/config"
"github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext"
"github.com/prebid/prebid-server/adapters/adapterstest"
"github.com/prebid/prebid-server/config"
"github.com/prebid/prebid-server/openrtb_ext"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion adapters/acuityads/acuityadstest/exemplary/banner-app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@
]
}
]
}
}
1 change: 0 additions & 1 deletion adapters/acuityads/acuityadstest/exemplary/native-app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,3 @@
}
]
}

Loading

0 comments on commit acefdc8

Please sign in to comment.