commit d815ca6bd83f22046a45a806699e6745443e66d3
author Alex Klein <saklein@chromium.org> Fri Jan 10 12:21:30 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Jan 21 23:12:45 2020 +0000
tree 1030aff09365bc6c3c60a927bca82328a7529bea
parent 29a0aca434c4125f0a2f0c83ce1eab4a92387d0c

Build API config: Use a proto-based configuration

Switch the Build API to use a proto configuration rather than
CLI options. This provides cleaner backwards compatibility for
the build api itself.

BUG=chromium:1040978
TEST=run_tests

Change-Id: I515271b4244c354c38538b30dcc1cfa07517f821
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1994725
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Will Bradley <wbbradley@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>

scripts/build_api_unittest.py

diff --git a/scripts/build_api_unittest.py b/scripts/build_api_unittest.py
index ece1044..5feb94d 100644
--- a/scripts/build_api_unittest.py
+++ b/scripts/build_api_unittest.py
@@ -22,28 +22,27 @@
     self.find_mock = self.PatchObject(router_lib.Router, 'Route')
     self.input_json = os.path.join(self.tempdir, 'input.json')
     self.output_json = os.path.join(self.tempdir, 'output.json')
+    self.config_json = os.path.join(self.tempdir, 'config.json')
     self.tee_log = os.path.join(self.tempdir, 'tee_out.txt')
-    input_json_contents = """
-{
-  "buildTarget": {
-    "name": "amd64-generic"
-  }
-}
-    """
-    osutils.WriteFile(self.input_json, input_json_contents)
+
+    tee_config = '{"log_path": "%s"}' % self.tee_log
+
+    osutils.WriteFile(self.input_json, '{}')
+    osutils.WriteFile(self.config_json, tee_config)
+
 
   def testSmoke(self):
     """Basic sanity check"""
     build_api.main(['--input-json', self.input_json,
                     '--output-json', self.output_json,
-                    'chromite.api.PackageService/GetTargetVersions'])
+                    'chromite.api.VersionService/Get'])
 
   def testTee(self):
     """Call build_api with tee-log set, verify log contents."""
     build_api.main(['--input-json', self.input_json,
                     '--output-json', self.output_json,
-                    '--tee-log', self.tee_log,
-                    'chromite.api.PackageService/GetTargetVersions'])
+                    '--config-json', self.config_json,
+                    'chromite.api.VersionService/Get'])
     contents = osutils.ReadFile(self.tee_log)
     self.assertIn('Teeing stdout', contents)
 
@@ -52,6 +51,6 @@
     os.environ['BUILD_API_TEE_LOG_FILE'] = self.tee_log
     build_api.main(['--input-json', self.input_json,
                     '--output-json', self.output_json,
-                    'chromite.api.PackageService/GetTargetVersions'])
+                    'chromite.api.VersionService/Get'])
     contents = osutils.ReadFile(self.tee_log)
     self.assertIn('Teeing stdout and stderr to env path ', contents)