Merge pull request #1467 from letsencrypt/drop-ocspresponses

Remove checking of ocspResponses table

cmd/ocsp-responder/main.go

@@ -82,10 +82,6 @@ func (src *DBSource) Response(req *ocsp.Request) ([]byte, bool) {
 			src.log.Info(fmt.Sprintf("OCSP Response sent for CA=%s, Serial=%s", hex.EncodeToString(src.caKeyHash), serialString))
 		}
 	}()
-	// Note: we first check for an OCSP response in the certificateStatus table (
-	// the new method) if we don't find a response there we instead look in the
-	// ocspResponses table (the old method) while transitioning between the two
-	// tables.
 	err := src.dbMap.SelectOne(
 		&response,
 		"SELECT ocspResponse FROM certificateStatus WHERE serial = :serial",
@@ -94,19 +90,6 @@ func (src *DBSource) Response(req *ocsp.Request) ([]byte, bool) {
 	if err != nil && err != sql.ErrNoRows {
 		src.log.Err(fmt.Sprintf("Failed to retrieve response from certificateStatus table: %s", err))
 	}
-	// TODO(#970): Delete this ocspResponses check once the table has been removed
-	if len(response) == 0 {
-		// Ignoring possible error, if response hasn't been filled, attempt to find
-		// response in old table
-		err = src.dbMap.SelectOne(
-			&response,
-			"SELECT response from ocspResponses WHERE serial = :serial ORDER BY id DESC LIMIT 1;",
-			map[string]interface{}{"serial": serialString},
-		)
-		if err != nil && err != sql.ErrNoRows {
-			src.log.Err(fmt.Sprintf("Failed to retrieve response from ocspResponses table: %s", err))
-		}
-	}
 	if err != nil {
 		return nil, false
 	}

cmd/ocsp-responder/main_test.go

@@ -124,7 +124,6 @@ func TestErrorLog(t *testing.T) {
 	test.Assert(t, !found, "Somehow found OCSP response")
 
 	test.AssertEquals(t, len(mockLog.GetAllMatching("Failed to retrieve response from certificateStatus table")), 1)
-	test.AssertEquals(t, len(mockLog.GetAllMatching("Failed to retrieve response from ocspResponses table")), 1)
 }
 
 func mustRead(path string) []byte {