Make deleted bots still show up when searched for by id

appengine/swarming/handlers_endpoints.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """This module defines Swarming Server endpoints handlers."""
 
 import logging
 import os
 
 from google.appengine.api import datastore_errors
@@ skipping 537 matching lines @@
       path='{bot_id}/get',
       http_method='GET')
   @auth.require(acl.is_privileged_user)
   def get(self, request):
     """Returns information about a known bot.
 
     This includes its state and dimensions, and if it is currently running a
     task.
     """
     logging.info('%s', request)
-    bot = get_or_raise(bot_management.get_info_key(request.bot_id))
+    bot_id = request.bot_id
+    bot = bot_management.get_info_key(bot_id).get()
+

[M-A Ruel, 2017/01/31 18:45:04]

remove one line or even better both :)

[kjlubick, 2017/01/31 19:04:40]

Done.

+
+    if not bot:
+      # If there is not BotInfo, look if there are BotEvent child of this
+      # entity. If this is the case, it means the bot was deleted but it's
+      # useful to show information about it to the user even if the bot was
+      # deleted. For example, it could be an machine-provider bot.
+      events = bot_management.get_events_query(bot_id, True).fetch(1)
+      if not events:
+        raise endpoints.NotFoundException('%s not found.' % bot_id)
+      bot = bot_management.BotInfo(
+          key=bot_management.get_info_key(bot_id),
+          dimensions_flat=bot_management.dimensions_to_flat(
+              events[0].dimensions),
+          state=events[0].state,
+          external_ip=events[0].external_ip,
+          authenticated_as=events[0].authenticated_as,
+          version=events[0].version,
+          quarantined=events[0].quarantined,
+          task_id=events[0].task_id,
+          last_seen_ts=events[0].ts,
+          lease_id=events[0].lease_id,
+          lease_expiration_ts=events[0].lease_expiration_ts,
+          machine_type=events[0].machine_type,
+          deleted=True)
+
     return message_conversion.bot_info_to_rpc(bot, utils.utcnow())

[M-A Ruel, 2017/01/31 18:45:04]

modify bot_info_to_rpc instead to accept a new flag deleted. It's cleaner IMHO.

[kjlubick, 2017/01/31 19:04:40]

Done.

 
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       BotId, swarming_rpcs.DeletedResponse,
       name='delete',
       path='{bot_id}/delete')
   @auth.require(acl.is_admin)
   def delete(self, request):
     """Deletes the bot corresponding to a provided bot_id.
 
@@ skipping 203 matching lines @@
 def get_routes():
   return (
     endpoints_webapp2.api_routes(SwarmingServerService) +
     endpoints_webapp2.api_routes(SwarmingTaskService) +
     endpoints_webapp2.api_routes(SwarmingTasksService) +
     endpoints_webapp2.api_routes(SwarmingBotService) +
     endpoints_webapp2.api_routes(SwarmingBotsService) +
     # components.config endpoints for validation and configuring of luci-config
     # service URL.
     endpoints_webapp2.api_routes(config.ConfigApi))