commit 231d2da44bf64e977ee54b791dcdc25ad1fe8e87
author Alex Klein <saklein@chromium.org> Mon Jul 22 16:44:45 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Aug 07 23:11:27 2019 +0000
tree 6c1c36c4355bbf7860a995d3488b03e10dae26ae
parent 69339cc091c2873ce1cabbb4aeae7a1809a54eab

Build API: Implement validate_only calls.

Add validate-only support to all existing endpoints and
tests to enforce the setting is respected.
Add is_in validator to help transition some endpoints
to decorator-only validation.
Some cleanup and standardization in the controller tests.

BUG=chromium:987263
TEST=run_tests

Cq-Depend: chromium:1726252
Change-Id: I108dfc1a221847eae47a18f2f60e12d2575c9ea8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1726253
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>

api/controller/binhost.py

diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index 679c467..7bf4bfe 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -9,6 +9,7 @@
 
 import urlparse
 
+from chromite.api import controller
 from chromite.api import validate
 from chromite.api.controller import controller_util
 from chromite.api.gen.chromite.api import binhost_pb2
@@ -28,7 +29,8 @@
 
 
 @validate.require('build_target.name')
-def GetBinhosts(input_proto, output_proto):
+@validate.validation_complete
+def GetBinhosts(input_proto, output_proto, _config):
   """Get a list of binhosts."""
   build_target = build_target_util.BuildTarget(input_proto.build_target.name)
 
@@ -41,7 +43,8 @@
 
 
 @validate.require('build_target.name')
-def GetPrivatePrebuiltAclArgs(input_proto, output_proto):
+@validate.validation_complete
+def GetPrivatePrebuiltAclArgs(input_proto, output_proto, _config):
   """Get the ACL args from the files in the private overlays."""
   build_target = build_target_util.BuildTarget(input_proto.build_target.name)
 
@@ -56,7 +59,8 @@
     new_arg.value = value
 
 
-def PrepareBinhostUploads(input_proto, output_proto):
+@validate.require('uri')
+def PrepareBinhostUploads(input_proto, output_proto, config):
   """Return a list of files to uplooad to the binhost.
 
   See BinhostService documentation in api/proto/binhost.proto.
@@ -64,6 +68,7 @@
   Args:
     input_proto (PrepareBinhostUploadsRequest): The input proto.
     output_proto (PrepareBinhostUploadsResponse): The output proto.
+    config (api_config.ApiConfig): The API call config.
   """
   target_name = (input_proto.sysroot.build_target.name
                  or input_proto.build_target.name)
@@ -85,6 +90,9 @@
   if not gs.PathIsGs(uri):
     raise ValueError('Upload URI %s must be Google Storage.' % uri)
 
+  if config.validate_only:
+    return controller.RETURN_CODE_VALID_INPUT
+
   parsed_uri = urlparse.urlparse(uri)
   upload_uri = gs.GetGsURL(parsed_uri.netloc, for_gsutil=True).rstrip('/')
   upload_path = parsed_uri.path.lstrip('/')
@@ -104,8 +112,9 @@
     output_proto.upload_targets.add().path = upload_target.strip('/')
 
 
-@validate.require('build_target.name', 'uri')
-def SetBinhost(input_proto, output_proto):
+@validate.require('build_target.name', 'key', 'uri')
+@validate.validation_complete
+def SetBinhost(input_proto, output_proto, _config):
   """Set the URI for a given binhost key and build target.
 
   See BinhostService documentation in api/proto/binhost.proto.
@@ -113,6 +122,7 @@
   Args:
     input_proto (SetBinhostRequest): The input proto.
     output_proto (SetBinhostResponse): The output proto.
+    _config (api_config.ApiConfig): The API call config.
   """
   target = input_proto.build_target.name
   key = binhost_pb2.BinhostKey.Name(input_proto.key)
@@ -133,7 +143,10 @@
                                                 private=private)
 
 
-def RegenBuildCache(input_proto, _output_proto):
+@validate.require('overlay_type')
+@validate.is_in('overlay_type', _OVERLAY_TYPE_TO_NAME)
+@validate.validation_complete
+def RegenBuildCache(input_proto, _output_proto, _config):
   """Regenerate the Build Cache for a build target.
 
   See BinhostService documentation in api/proto/binhost.proto.
@@ -141,9 +154,7 @@
   Args:
     input_proto (RegenBuildCacheRequest): The input proto.
     _output_proto (RegenBuildCacheResponse): The output proto.
+    _config (api_config.ApiConfig): The API call config.
   """
   overlay_type = input_proto.overlay_type
-  if overlay_type in _OVERLAY_TYPE_TO_NAME:
-    binhost.RegenBuildCache(_OVERLAY_TYPE_TO_NAME[overlay_type])
-  else:
-    cros_build_lib.Die('Overlay_type must be specified.')
+  binhost.RegenBuildCache(_OVERLAY_TYPE_TO_NAME[overlay_type])