letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename "authz2" types to just "authz" (#4701) 

This cleans up after the authzv2 migration and makes names a little
easier to read, since there is no longer a v1/v2 distinction. This
leaves the names of tables the same since they would require a migration
to change.
This commit is contained in:
Jacob Hoffman-Andrews 2020-03-10 16:40:46 -07:00 committed by GitHub
parent 9232f0e9a4
commit 2bf12b93e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sa/database.go
View File

@ -136,7 +136,7 @@ func initTables(dbMap *gorp.DbMap) {
dbMap.AddTableWithName(requestedNameModel{}, "requestedNames").SetKeys(false, "OrderID") dbMap.AddTableWithName(requestedNameModel{}, "requestedNames").SetKeys(false, "OrderID")
dbMap.AddTableWithName(orderFQDNSet{}, "orderFqdnSets").SetKeys(true, "ID") dbMap.AddTableWithName(orderFQDNSet{}, "orderFqdnSets").SetKeys(true, "ID")
dbMap.AddTableWithName(authzModel{}, "authz2").SetKeys(true, "ID") dbMap.AddTableWithName(authzModel{}, "authz2").SetKeys(true, "ID")
dbMap.AddTableWithName(orderToAuthz2Model{}, "orderToAuthz2").SetKeys(false, "OrderID", "AuthzID") dbMap.AddTableWithName(orderToAuthzModel{}, "orderToAuthz2").SetKeys(false, "OrderID", "AuthzID")
dbMap.AddTableWithName(recordedSerialModel{}, "serials").SetKeys(true, "ID") dbMap.AddTableWithName(recordedSerialModel{}, "serials").SetKeys(true, "ID")
dbMap.AddTableWithName(precertificateModel{}, "precertificates").SetKeys(true, "ID") dbMap.AddTableWithName(precertificateModel{}, "precertificates").SetKeys(true, "ID")
} }

7
sa/model.go
View File

@ -350,11 +350,6 @@ type requestedNameModel struct {
} }
type orderToAuthzModel struct { type orderToAuthzModel struct {
OrderID int64
AuthzID string
}
type orderToAuthz2Model struct {
OrderID int64 OrderID int64
AuthzID int64 AuthzID int64
} }
@ -449,7 +444,7 @@ func statusUint(status core.AcmeStatus) uint8 {
return statusToUint[string(status)] return statusToUint[string(status)]
} }
const authz2Fields = "id, identifierType, identifierValue, registrationID, status, expires, challenges, attempted, token, validationError, validationRecord" const authzFields = "id, identifierType, identifierValue, registrationID, status, expires, challenges, attempted, token, validationError, validationRecord"
type authzModel struct { type authzModel struct {
ID int64 `db:"id"` ID int64 `db:"id"`

10
sa/sa.go
View File

@ -903,7 +903,7 @@ func (ssa *SQLStorageAuthority) NewOrder(ctx context.Context, req *corepb.Order)
} }
for _, id := range req.V2Authorizations { for _, id := range req.V2Authorizations {
otoa := &orderToAuthz2Model{ otoa := &orderToAuthzModel{
OrderID: order.ID, OrderID: order.ID,
AuthzID: id, AuthzID: id,
} }
@ -1443,7 +1443,7 @@ func (ssa *SQLStorageAuthority) GetAuthorizations2(ctx context.Context, req *sap
expires > ? AND expires > ? AND
identifierType = ? AND identifierType = ? AND
identifierValue IN (%s)`, identifierValue IN (%s)`,
authz2Fields, authzFields,
strings.Join(qmarks, ","), strings.Join(qmarks, ","),
) )
_, err := ssa.dbMap.Select( _, err := ssa.dbMap.Select(
@ -1624,7 +1624,7 @@ func (ssa *SQLStorageAuthority) GetPendingAuthorization2(ctx context.Context, re
identifierType = :dnsType AND identifierType = :dnsType AND
identifierValue = :ident identifierValue = :ident
ORDER BY expires ASC ORDER BY expires ASC
LIMIT 1 `, authz2Fields), LIMIT 1 `, authzFields),
map[string]interface{}{ map[string]interface{}{
"regID": *req.RegistrationID, "regID": *req.RegistrationID,
"status": statusUint(core.StatusPending), "status": statusUint(core.StatusPending),
@ -1676,7 +1676,7 @@ func (ssa *SQLStorageAuthority) GetValidOrderAuthorizations2(ctx context.Context
authz2.expires > :expires AND authz2.expires > :expires AND
authz2.status = :status AND authz2.status = :status AND
orderToAuthz2.orderID = :orderID`, orderToAuthz2.orderID = :orderID`,
authz2Fields, authzFields,
), ),
map[string]interface{}{ map[string]interface{}{
"regID": *req.AcctID, "regID": *req.AcctID,
@ -1758,7 +1758,7 @@ func (ssa *SQLStorageAuthority) GetValidAuthorizations2(ctx context.Context, req
expires > ? AND expires > ? AND
identifierType = ? AND identifierType = ? AND
identifierValue IN (%s)`, identifierValue IN (%s)`,
authz2Fields, authzFields,
strings.Join(qmarks, ","), strings.Join(qmarks, ","),
), ),
params..., params...,

6
sa/sa_test.go
View File

@ -1140,17 +1140,17 @@ func TestGetAuthorizations2(t *testing.T) {
// Associate authorizations with an order so that GetAuthorizations2 thinks // Associate authorizations with an order so that GetAuthorizations2 thinks
// they are WFE2 authorizations. // they are WFE2 authorizations.
err := sa.dbMap.Insert(&orderToAuthz2Model{ err := sa.dbMap.Insert(&orderToAuthzModel{
OrderID: 1, OrderID: 1,
AuthzID: authzIDA, AuthzID: authzIDA,
}) })
test.AssertNotError(t, err, "sa.dbMap.Insert failed") test.AssertNotError(t, err, "sa.dbMap.Insert failed")
err = sa.dbMap.Insert(&orderToAuthz2Model{ err = sa.dbMap.Insert(&orderToAuthzModel{
OrderID: 1, OrderID: 1,
AuthzID: authzIDB, AuthzID: authzIDB,
}) })
test.AssertNotError(t, err, "sa.dbMap.Insert failed") test.AssertNotError(t, err, "sa.dbMap.Insert failed")
err = sa.dbMap.Insert(&orderToAuthz2Model{ err = sa.dbMap.Insert(&orderToAuthzModel{
OrderID: 1, OrderID: 1,
AuthzID: authzIDC, AuthzID: authzIDC,
}) })