fix(HMS-2757): improve unexpected rows error

Signed-off-by: Lukáš Zapletal <[email protected]>
RHEnVision · Oct 11, 2023 · e86523a · e86523a
1 parent 58de839
commit e86523a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/internal/dao/pgx/pubkey_pgx.go b/internal/dao/pgx/pubkey_pgx.go
@@ -88,7 +88,7 @@ func (x *pubkeyDao) Update(ctx context.Context, pubkey *models.Pubkey) error {
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -132,7 +132,7 @@ func (x *pubkeyDao) Delete(ctx context.Context, id int64) error {
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -191,7 +191,7 @@ func (x *pubkeyDao) UnscopedDeleteResource(ctx context.Context, id int64) error
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
diff --git a/internal/dao/pgx/reservation_pgx.go b/internal/dao/pgx/reservation_pgx.go
@@ -61,7 +61,7 @@ func (x *reservationDao) CreateAWS(ctx context.Context, reservation *models.AWSR
 			return fmt.Errorf("pgx error: %w", err)
 		}
 		if tag.RowsAffected() != 1 {
-			return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+			return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 		}
 
 		return nil
@@ -92,7 +92,7 @@ func (x *reservationDao) CreateAzure(ctx context.Context, reservation *models.Az
 			return fmt.Errorf("pgx error: %w", err)
 		}
 		if tag.RowsAffected() != 1 {
-			return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+			return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 		}
 
 		return nil
@@ -123,7 +123,7 @@ func (x *reservationDao) CreateGCP(ctx context.Context, reservation *models.GCPR
 			return fmt.Errorf("pgx error: %w", err)
 		}
 		if tag.RowsAffected() != 1 {
-			return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+			return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 		}
 
 		return nil
@@ -168,7 +168,7 @@ func (x *reservationDao) CreateInstance(ctx context.Context, instance *models.Re
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 
 	return nil
@@ -187,7 +187,7 @@ func (x *reservationDao) UpdateReservationInstance(ctx context.Context, reservat
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 
 	return nil
@@ -308,7 +308,7 @@ func (x *reservationDao) UpdateStatus(ctx context.Context, id int64, status stri
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -321,7 +321,7 @@ func (x *reservationDao) UnscopedUpdateAWSDetail(ctx context.Context, id int64,
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -334,7 +334,7 @@ func (x *reservationDao) UpdateReservationIDForAWS(ctx context.Context, id int64
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -347,7 +347,7 @@ func (x *reservationDao) UpdateOperationNameForGCP(ctx context.Context, id int64
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -360,7 +360,7 @@ func (x *reservationDao) FinishWithSuccess(ctx context.Context, id int64) error
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -373,7 +373,7 @@ func (x *reservationDao) FinishWithError(ctx context.Context, id int64, errorStr
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }
@@ -386,7 +386,7 @@ func (x *reservationDao) Delete(ctx context.Context, id int64) error {
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }

diff --git a/internal/dao/pgx/service_pgx.go b/internal/dao/pgx/service_pgx.go
@@ -36,7 +36,7 @@ func UnscopedUpdatePubkey(ctx context.Context, pubkey *models.Pubkey) error {
 		return fmt.Errorf("pgx error: %w", err)
 	}
 	if tag.RowsAffected() != 1 {
-		return fmt.Errorf("expected 1 row: %w", dao.ErrAffectedMismatch)
+		return fmt.Errorf("expected 1 row, got %d: %w", tag.RowsAffected(), dao.ErrAffectedMismatch)
 	}
 	return nil
 }

diff --git a/internal/jobs/launch_instance_aws.go b/internal/jobs/launch_instance_aws.go
@@ -181,6 +181,7 @@ func DoEnsurePubkeyOnAWS(ctx context.Context, args *LaunchInstanceAWSTaskArgs) e
 
 	// update the AWS key name in reservation details
 	awsReservation.Detail.PubkeyName = ec2Name
+	logger.Debug().Msgf("Updating AWS reservation detail %d", awsReservation.Reservation.ID)
 	err = resDao.UnscopedUpdateAWSDetail(ctx, awsReservation.Reservation.ID, awsReservation.Detail)
 	if err != nil {
 		span.SetStatus(codes.Error, "failed to save AWS pubkey name to DB")