return enrollment ID string rather than mdm request struct

http/mdm/mdm_cert.go

@@ -168,7 +168,7 @@ func CertWithEnrollmentIDMiddleware(next http.Handler, hasher HashFn, store stor
  return
  }
  }
- mr, err := store.EnrollmentFromHash(r.Context(), hasher(cert))
+ id, err := store.EnrollmentFromHash(r.Context(), hasher(cert))
  if err != nil {
  ctxlog.Logger(r.Context(), logger).Info(
  "msg", "retreiving enrollment from hash",
@@ -177,7 +177,7 @@ func CertWithEnrollmentIDMiddleware(next http.Handler, hasher HashFn, store stor
  http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
  return
  }
- if mr == nil || mr.ID == "" {
+ if id == "" {
  if enforce {
  ctxlog.Logger(r.Context(), logger).Info(
  "err", "missing enrollment id",
@@ -192,7 +192,7 @@ func CertWithEnrollmentIDMiddleware(next http.Handler, hasher HashFn, store stor
  return
  }
  }
- ctx := context.WithValue(r.Context(), contextEnrollmentID, mr.ID)
+ ctx := context.WithValue(r.Context(), contextEnrollmentID, id)
  next.ServeHTTP(w, r.WithContext(ctx))
  }
 }

storage/allmulti/certauth.go

@@ -35,9 +35,9 @@ func (ms *MultiAllStorage) AssociateCertHash(r *mdm.Request, hash string) error
  return err
 }
 
-func (ms *MultiAllStorage) EnrollmentFromHash(ctx context.Context, hash string) (*mdm.Request, error) {
+func (ms *MultiAllStorage) EnrollmentFromHash(ctx context.Context, hash string) (string, error) {
  val, err := ms.execStores(ctx, func(s storage.AllStorage) (interface{}, error) {
  return s.EnrollmentFromHash(ctx, hash)
  })
- return val.(*mdm.Request), err
+ return val.(string), err
 }

storage/file/certauth.go

@@ -70,10 +70,10 @@ func (s *FileStorage) AssociateCertHash(r *mdm.Request, hash string) error {
  return e.writeFile(CertAuthFilename, []byte(hash))
 }
 
-func (s *FileStorage) EnrollmentFromHash(_ context.Context, hash string) (*mdm.Request, error) {
+func (s *FileStorage) EnrollmentFromHash(_ context.Context, hash string) (string, error) {
  f, err := os.Open(path.Join(s.path, CertAuthAssociationsFilename))
  if err != nil {
- return nil, err
+ return "", err
  }
  defer f.Close()
  scanner := bufio.NewScanner(f)
@@ -82,10 +82,10 @@ func (s *FileStorage) EnrollmentFromHash(_ context.Context, hash string) (*mdm.R
  if strings.Contains(text, hash) {
  split := strings.Split(text, ",")
  if len(split) < 2 {
- return nil, errors.New("hash and enrollment id not present on line")
+ return "", errors.New("hash and enrollment id not present on line")
  }
- return &mdm.Request{EnrollID: &mdm.EnrollID{ID: split[0]}}, nil
+ return split[0], nil
  }
  }
- return nil, nil
+ return "", nil
 }

storage/mysql/certauth.go

@@ -52,15 +52,15 @@ UPDATE sha256 = new.sha256;`,
  return err
 }
 
-func (s *MySQLStorage) EnrollmentFromHash(ctx context.Context, hash string) (*mdm.Request, error) {
+func (s *MySQLStorage) EnrollmentFromHash(ctx context.Context, hash string) (string, error) {
  var id string
  err := s.db.QueryRowContext(
  ctx,
  `SELECT id FROM cert_auth_associations WHERE sha256 = ? LIMIT 1;`,
  hash,
  ).Scan(&id)
  if errors.Is(err, sql.ErrNoRows) {
- return nil, nil
+ return "", nil
  }
- return &mdm.Request{EnrollID: &mdm.EnrollID{ID: id}}, err
+ return id, err
 }

storage/mysql/queue.go

@@ -56,6 +56,9 @@ SELECT command_uuid FROM commands WHERE command_uuid = ? FOR UPDATE;
 `,
  uuid,
  )
+ if err != nil {
+ return err
+ }
  // delete command result (i.e. NotNows) and this queued command
  _, err = tx.ExecContext(
  ctx, `

storage/pgsql/certauth.go

@@ -53,15 +53,15 @@ ON CONFLICT ON CONSTRAINT cert_auth_associations_pkey DO UPDATE SET updated_at=n
  return err
 }
 
-func (s *PgSQLStorage) EnrollmentFromHash(ctx context.Context, hash string) (*mdm.Request, error) {
+func (s *PgSQLStorage) EnrollmentFromHash(ctx context.Context, hash string) (string, error) {
  var id string
  err := s.db.QueryRowContext(
  ctx,
  `SELECT id FROM cert_auth_associations WHERE sha256 = $1 LIMIT 1;`,
  hash,
  ).Scan(&id)
  if errors.Is(err, sql.ErrNoRows) {
- return nil, nil
+ return "", nil
  }
- return &mdm.Request{EnrollID: &mdm.EnrollID{ID: id}}, err
+ return id, err
 }

storage/storage.go

@@ -66,10 +66,9 @@ type CertAuthStore interface {
 }
 
 type CertAuthRetriever interface {
- // EnrollmentFromHash retrieves an MDM request from a cert hash.
- // Implementations should return a nil pointer if no result is found.
- // The ID member ought to be populated when non-nil.
- EnrollmentFromHash(ctx context.Context, hash string) (*mdm.Request, error)
+ // EnrollmentFromHash retrieves an enrollment ID from a cert hash.
+ // Implementations should return an empty string if no result is found.
+ EnrollmentFromHash(ctx context.Context, hash string) (string, error)
 }
 
 // StoreMigrator retrieves MDM check-ins