Refactor task enqueuing

appengine/gce-backend/instance_templates.py

 # Copyright 2016 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.
 
 """Utilities for operating on instance templates."""
 
 import logging
 
 from google.appengine.ext import ndb
 
 from components import gce
 from components import net
-from components import utils
 
 import models
+import utilities
 
 
 def get_instance_template_key(base_name):
   """Returns a key for an InstanceTemplate.
 
   Args:
     base_name: Base name for the models.InstanceTemplate.
 
   Returns:
     ndb.Key for a models.InstanceTemplate entity.
@@ skipping 130 matching lines @@
   """Enqueues tasks to create missing instance templates."""
   # For each active InstanceTemplateRevision without a URL, schedule
   # creation of its instance template. Since we are outside a transaction
   # the InstanceTemplateRevision could be out of date and may already have
   # a task scheduled/completed. In either case it doesn't matter since
   # we make creating an instance template and updating the URL idempotent.
   for instance_template in models.InstanceTemplate.query():
     if instance_template.active:
       instance_template_revision = instance_template.active.get()
       if instance_template_revision and not instance_template_revision.url:
-        if not utils.enqueue_task(
-            '/internal/queues/create-instance-template',
-            'create-instance-template',
-            params={
-                'key': instance_template.active.urlsafe(),
-            },
-        ):
-          logging.warning(
-              'Failed to enqueue task for InstanceTemplateRevision: %s',
-              instance_template.active,
-          )
+        utilities.enqueue_task(
+            'create-instance-template', instance_template.active)
 
 
 def get_instance_template_to_delete(key):
   """Returns the URL of the instance template to delete.
 
   Args:
     key: ndb.Key for a models.InstanceTemplateRevision entity.
 
   Returns:
     The URL of the instance template to delete, or None if there isn't one.
@@ skipping 63 matching lines @@
       keys.append(key)
   return keys
 
 
 def schedule_deletion():
   """Enqueues tasks to delete drained instance templates."""
   for key in get_drained_instance_template_revisions():
     instance_template = key.get()
     if instance_template and instance_template.url:
       if not instance_template.active and not instance_template.drained:
-        if not utils.enqueue_task(
-            '/internal/queues/delete-instance-template',
-            'delete-instance-template',
-            params={
-                'key': key.urlsafe(),
-            },
-        ):
-          logging.warning(
-              'Failed to enqueue task for InstanceTemplateRevision: %s', key)
+        utilities.enqueue_task('delete-instance-template', key)