From 39b0b8e32a4ed0675a38d97799e8a219cc549910 Mon Sep 17 00:00:00 2001
From: Vadim Shtayura <vadimsh@chromium.org>
Date: Thu, 31 Jan 2019 23:56:08 +0000
Subject: [PATCH] Add presubmit check that runs 'lucicfg validate <script>'.

R=tandrii@chromium.org
BUG=925532

Change-Id: I72ab6108cf43353e36ddeccd705acdd04716f785
Reviewed-on: https://chromium-review.googlesource.com/c/1448634
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
---
 presubmit_canned_checks.py  | 34 ++++++++++++++++++++++++++++++++++
 tests/presubmit_unittest.py |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index a442459c1..dbd56ecba 100644
--- a/presubmit_canned_checks.py
+++ b/presubmit_canned_checks.py
@@ -1432,3 +1432,37 @@ def CheckChangedLUCIConfigs(input_api, output_api):
         out_f = output_api.PresubmitNotifyResult
       outputs.append(out_f('Config validation: %s' % msg['text']))
   return outputs
+
+
+def CheckLucicfgGenOutput(input_api, output_api, entry_script):
+  """Verifies configs produced by `lucicfg` are up-to-date and pass validation.
+
+  Runs the check unconditionally, regardless of what files are modified. Examine
+  input_api.AffectedFiles() yourself before using CheckLucicfgGenOutput if this
+  is a concern.
+
+  Assumes `lucicfg` binary is in PATH and the user is logged in.
+
+  Args:
+    entry_script: path to the entry-point *.star script responsible for
+        generating a single config set. Either absolute or relative to the
+        currently running PRESUBMIT.py script.
+
+  Returns:
+    A list of input_api.Command objects containing verification commands.
+  """
+  return [
+      input_api.Command(
+        'lucicfg validate "%s"' % entry_script,
+        [
+            'lucicfg' if not input_api.is_windows else 'lucicfg.bat',
+            'validate', entry_script,
+            '-log-level', 'debug' if input_api.verbose else 'warning',
+        ],
+        {
+          'stderr': input_api.subprocess.STDOUT,
+          'shell': input_api.is_windows,  # to resolve *.bat
+          'cwd': input_api.PresubmitLocalPath(),
+        },
+        output_api.PresubmitError)
+  ]
diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index d535e48ab..899e04526 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -1664,7 +1664,7 @@ class CannedChecksUnittest(PresubmitTestsBase):
       'GetPythonUnitTests', 'GetPylint',
       'GetUnitTests', 'GetUnitTestsInDirectory', 'GetUnitTestsRecursively',
       'CheckCIPDManifest', 'CheckCIPDPackages', 'CheckCIPDClientDigests',
-      'CheckChangedLUCIConfigs',
+      'CheckChangedLUCIConfigs', 'CheckLucicfgGenOutput',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit_canned_checks, members)