Improve error handling and fail on start-change/end-change when the change can't be located

Author: DavidS-ovm

cmd/endchange.go

@@ -65,7 +65,7 @@ func EndChange(signals chan os.Signal, ready chan bool) int {
 	defer cancel()
 
 	lf := log.Fields{}
-	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_HAPPENING)
+	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_HAPPENING, true)
 	if err != nil {
 		log.WithError(err).WithFields(lf).Error("failed to identify change")
 		return 1
@@ -81,7 +81,7 @@ func EndChange(signals chan os.Signal, ready chan bool) int {
 		},
 	})
 	if err != nil {
-		log.WithContext(ctx).WithFields(lf).WithError(err).Error("failed to start change")
+		log.WithContext(ctx).WithFields(lf).WithError(err).Error("failed to end change")
 		return 1
 	}
 	log.WithContext(ctx).WithFields(lf).Info("processing")
@@ -93,7 +93,12 @@ func EndChange(signals chan os.Signal, ready chan bool) int {
 			"edges": msg.NumEdges,
 		}).Info("progress")
 	}
-	log.WithContext(ctx).WithFields(lf).Info("started change")
+	if stream.Err() != nil {
+		log.WithContext(ctx).WithFields(lf).WithError(stream.Err()).Error("failed to process end change")
+		return 1
+	}
+
+	log.WithContext(ctx).WithFields(lf).Info("finished change")
 	return 0
 }
 

cmd/getchange.go

@@ -67,7 +67,7 @@ func GetChange(signals chan os.Signal, ready chan bool) int {
 	defer cancel()
 
 	lf := log.Fields{}
-	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus(sdp.ChangeStatus_value[viper.GetString("status")]))
+	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus(sdp.ChangeStatus_value[viper.GetString("status")]), true)
 	if err != nil {
 		log.WithError(err).WithFields(lf).Error("failed to identify change")
 		return 1

cmd/root.go

@@ -185,7 +185,7 @@ func ensureToken(ctx context.Context, signals chan os.Signal) (context.Context,
 }
 
 // getChangeUuid returns the UUID of a change, as selected by --uuid or --change, or a state with the specified status and having --ticket-link
-func getChangeUuid(ctx context.Context, expectedStatus sdp.ChangeStatus) (uuid.UUID, error) {
+func getChangeUuid(ctx context.Context, expectedStatus sdp.ChangeStatus, errNotFound bool) (uuid.UUID, error) {
 	var changeUuid uuid.UUID
 	var err error
 
@@ -231,9 +231,9 @@ func getChangeUuid(ctx context.Context, expectedStatus sdp.ChangeStatus) (uuid.U
 		}
 	}
 
-	// if changeUuid == uuid.Nil {
-	// 	return uuid.Nil, errors.New("no change specified; use one of --change, --ticket-link or --uuid")
-	// }
+	if errNotFound && changeUuid == uuid.Nil {
+		return uuid.Nil, errors.New("no change specified; use one of --change, --ticket-link or --uuid")
+	}
 
 	return changeUuid, nil
 }

cmd/startchange.go

@@ -65,7 +65,7 @@ func StartChange(signals chan os.Signal, ready chan bool) int {
 	defer cancel()
 
 	lf := log.Fields{}
-	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_DEFINING)
+	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_DEFINING, true)
 	if err != nil {
 		log.WithError(err).WithFields(lf).Error("failed to identify change")
 		return 1
@@ -93,6 +93,11 @@ func StartChange(signals chan os.Signal, ready chan bool) int {
 			"edges": msg.NumEdges,
 		}).Info("progress")
 	}
+	if stream.Err() != nil {
+		log.WithContext(ctx).WithFields(lf).WithError(stream.Err()).Error("failed to process start change")
+		return 1
+	}
+
 	log.WithContext(ctx).WithFields(lf).Info("started change")
 	return 0
 }

cmd/submitplan.go

@@ -228,7 +228,7 @@ func SubmitPlan(signals chan os.Signal, ready chan bool) int {
 	}
 
 	client := AuthenticatedChangesClient(ctx)
-	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_DEFINING)
+	changeUuid, err := getChangeUuid(ctx, sdp.ChangeStatus_CHANGE_STATUS_DEFINING, false)
 	if err != nil {
 		log.WithContext(ctx).WithError(err).WithFields(lf).Error("failed to searching for existing changes")
 		return 1