Add API for bootstrap and bot_code version

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 datetime
 import logging
+import os
 
 from google.appengine.api import datastore_errors
 from google.appengine.ext import ndb
 import endpoints
 import gae_ts_mon
 from protorpc import messages
 from protorpc import message_types
 from protorpc import protojson
 from protorpc import remote
 
@@ skipping 107 matching lines @@
 
 @swarming_api.api_class(resource_name='server', path='server')
 class SwarmingServerService(remote.Service):
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.ServerDetails,
       http_method='GET')
   @auth.require(acl.is_bot_or_user)
   def details(self, _request):
     """Returns information about the server."""
-    return swarming_rpcs.ServerDetails(server_version=utils.get_app_version())
+    host = 'https://' + os.environ['HTTP_HOST']
+    return swarming_rpcs.ServerDetails(
+        bot_version = bot_code.get_bot_version(host),
+        server_version = utils.get_app_version()
+      )

[M-A Ruel, 2016/09/26 16:36:15]

FTR, I'm really not a fan of terminating ) on a new line.

[kjlubick, 2016/09/26 16:50:38]

Fixed.

 
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
+      message_types.VoidMessage, swarming_rpcs.BootstrapToken,
+      http_method='GET')

[M-A Ruel, 2016/09/26 16:36:15]

I think this should be a POST, since it's generating something.

[kjlubick, 2016/09/26 16:50:38]

Done.

+  @auth.require(acl.is_bootstrapper)
+  def token(self, _request):
+    """Returns a token to bootstrap a new bot."""
+    return swarming_rpcs.BootstrapToken(
+        bootstrap_token = bot_code.generate_bootstrap_token(),
+      )
+
+  @gae_ts_mon.instrument_endpoint()
+  @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.ClientPermissions,
       http_method='GET')
   @auth.public
   def permissions(self, _request):
     """Returns the caller's permissions."""
     return swarming_rpcs.ClientPermissions(
         delete_bot = acl.is_admin(),
         terminate_bot = acl.is_privileged_user(),
         get_configs = acl.is_user(),
         put_configs = acl.is_admin(),
@@ skipping 565 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))