fall back to legacy join on any error

Author: nklaassen

lib/join/joinclient/join.go

@@ -55,23 +55,25 @@ func Join(ctx context.Context, params JoinParams) (*JoinResult, error) {
 	if params.ID.Role != types.RoleInstance && params.ID.Role != types.RoleBot {
 		return nil, trace.BadParameter("Only Instance and Bot roles may be used for direct join attempts")
 	}
+
 	slog.InfoContext(ctx, "Trying to join with the new join service")
 	result, err := joinNew(ctx, params)
-	if trace.IsNotImplemented(err) {
-		// Fall back to joining via legacy service.
-		slog.InfoContext(ctx, "Falling back to joining via the legacy join service", "error", err)
-		// Non-bots must generate their own host UUID when joining via legacy service.
-		if params.ID.Role != types.RoleBot {
-			hostID, err := hostid.Generate(ctx, params.JoinMethod)
-			if err != nil {
-				return nil, trace.Wrap(err, "generating host ID")
-			}
-			params.ID.HostUUID = hostID
+	if err == nil {
+		return result, nil
+	}
+
+	// Fall back to joining via legacy service.
+	slog.InfoContext(ctx, "Falling back to joining via the legacy join service", "error", err)
+	// Non-bots must generate their own host UUID when joining via legacy service.
+	if params.ID.Role != types.RoleBot {
+		hostID, err := hostid.Generate(ctx, params.JoinMethod)
+		if err != nil {
+			return nil, trace.Wrap(err, "generating host ID")
 		}
-		result, err := LegacyJoin(ctx, params)
-		return result, trace.Wrap(err)
+		params.ID.HostUUID = hostID
 	}
-	return result, trace.Wrap(err)
+	result, err = LegacyJoin(ctx, params)
+	return result, trace.Wrap(err, "joining via legacy join service")
 }
 
 // LegacyJoin is used to join the cluster via the legacy service with client-chosen host UUIDs.