swarming: refactor cipd input

appengine/swarming/server/config.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Instance specific settings."""
 
 import logging
 import posixpath
+import re
 
 from components import config
 from components import gitiles
 from components import net
 from components import utils
 from components.config import validation
 
 from proto import config_pb2
-from server import task_request
 
+import cipd
 
 SETTINGS_CFG_FILENAME = 'settings.cfg'
 SECONDS_IN_YEAR = 60 * 60 * 24 * 365
+NAMESPACE_RE = re.compile(r'^[a-z0-9A-Z\-._]+$')
 
 
 ConfigApi = config.ConfigApi
 
 
+def validate_url(value, ctx):
+  if not value:
+    ctx.error('is not set')
+  elif not value.startswith(('https://', 'http://')):
+    ctx.error('must start with "https://" or "http://"')
+
+
 def validate_isolate_settings(cfg, ctx):
   if bool(cfg.default_server) != bool(cfg.default_namespace):
     ctx.error(
         'either specify both default_server and default_namespace or none')
   elif cfg.default_server:
-    if not cfg.default_server.startswith(('https://', 'http://')):
-      ctx.error('default_server must start with "https://" or "http://"')
+    with ctx.prefix('default_server '):
+      validate_url(cfg.default_server, ctx)
 
-    if not task_request.NAMESPACE_RE.match(cfg.default_namespace):
+    if not NAMESPACE_RE.match(cfg.default_namespace):
       ctx.error('invalid namespace "%s"', cfg.default_namespace)
 
 
+def validate_cipd_package(cfg, ctx):
+  if not cipd.is_valid_package_name_template(cfg.package_name):
+    ctx.error('invalid package_name "%s"', cfg.package_name)
+  if not cipd.is_valid_version(cfg.version):
+    ctx.error('invalid version "%s"', cfg.version)
+
+
+def validate_cipd_settings(cfg, ctx=None):
+  """Validates CipdSettings message stored in settings.cfg."""
+  ctx = ctx or validation.Context.raise_on_error()
+  with ctx.prefix('default_server '):
+    validate_url(cfg.default_server, ctx)
+
+  with ctx.prefix('default_client_package: '):
+    validate_cipd_package(cfg.default_client_package, ctx)
+
+
 @validation.self_rule(SETTINGS_CFG_FILENAME, config_pb2.SettingsCfg)
 def validate_settings(cfg, ctx):
   """Validates settings.cfg file against proto message schema."""
   def within_year(value):
     if value < 0:
       ctx.error('cannot be negative')
     elif value > SECONDS_IN_YEAR:
       ctx.error('cannot be more than a year')
 
   with ctx.prefix('bot_death_timeout_secs '):
     within_year(cfg.bot_death_timeout_secs)
   with ctx.prefix('reusable_task_age_secs '):
     within_year(cfg.reusable_task_age_secs)
 
   if cfg.HasField('isolate'):
     with ctx.prefix('isolate: '):
       validate_isolate_settings(cfg.isolate, ctx)
 
+  if cfg.HasField('cipd'):
+    with ctx.prefix('cipd: '):
+      validate_cipd_settings(cfg.cipd, ctx)
+
 
 @utils.memcache('config:get_configs_url', time=60)
 def _get_configs_url():
   """Returns URL where luci-config fetches configs from."""
   url = None
   try:
     url = config.get_config_set_location(config.self_config_set())
   except net.Error:
     logging.info(
         'Could not get configs URL. Possibly config directory for this '
@@ skipping 54 matching lines @@
     'config_service_url': (
         'https://%s' % cfg_service_hostname if cfg_service_hostname else ''
     ),
   }
 
 
 @utils.cache_with_expiration(60)
 def settings():
   """Loads settings from an NDB-based cache or a default one if not present."""
   return _get_settings()[1]