Request Wrapper first pass

adapters/consumable/consumable.go

@@ -138,7 +138,7 @@ func (a *ConsumableAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *
 
 	gdpr := bidGdpr{}
 
-	ccpaPolicy, err := ccpa.ReadFromRequest(request)
+	ccpaPolicy, err := ccpa.ReadFromRequest(&openrtb_ext.RequestWrapper{BidRequest: request})
 	if err == nil {
 		body.CCPA = ccpaPolicy.Consent
 	}

adapters/sharethrough/butler.go

@@ -98,7 +98,7 @@ func (s StrOpenRTBTranslator) requestFromOpenRTB(imp openrtb2.Imp, request *open
 	}
 
 	usPolicySignal := ""
-	if usPolicy, err := ccpa.ReadFromRequest(request); err == nil {
+	if usPolicy, err := ccpa.ReadFromRequest(&openrtb_ext.RequestWrapper{BidRequest: request}); err == nil {
 		usPolicySignal = usPolicy.Consent
 	}
 

endpoints/openrtb2/amp_auction.go

@@ -310,7 +310,7 @@ func (deps *endpointDeps) parseAmpRequest(httpRequest *http.Request) (req *openr
 
 	// At this point, we should have a valid request that definitely has Targeting and Cache turned on
 
-	e = deps.validateRequest(req)
+	e = deps.validateRequest(&openrtb_ext.RequestWrapper{BidRequest: req})
 	errs = append(errs, e...)
 	return
 }
@@ -531,7 +531,7 @@ func readPolicy(consent string) (privacy.PolicyWriter, error) {
 	}
 
 	if ccpa.ValidateConsent(consent) {
-		return ccpa.ConsentWriter{consent}, nil
+		return ccpa.ConsentWriterLegacy{consent}, nil
 	}
 
 	return privacy.NilPolicyWriter{}, &errortypes.Warning{

endpoints/openrtb2/amp_auction_test.go

@@ -67,6 +67,7 @@ func TestGoodAmpRequests(t *testing.T) {
 
 		var response AmpResponse
 		if err := json.Unmarshal(recorder.Body.Bytes(), &response); err != nil {
+			t.Errorf("AMP response was: %s", recorder.Body.Bytes())
 			t.Fatalf("Error unmarshalling response: %s", err.Error())
 		}