From adc4e0fdfe8578d5f81152d50556b57508bdfc1d Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 23 Aug 2016 13:55:49 -0600
Subject: [PATCH] Template context must be populated with key:value pairs

This situation has been on deprecation warning for a while to allow
people time to update their state files. For the Carbon release, we
are switching the warnings over to raise SaltInvocationErrors.
---
 doc/topics/releases/carbon.rst |  4 ++++
 salt/utils/__init__.py         | 25 +------------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/doc/topics/releases/carbon.rst b/doc/topics/releases/carbon.rst
index ce264814de..6a9e1ba3a7 100644
--- a/doc/topics/releases/carbon.rst
+++ b/doc/topics/releases/carbon.rst
@@ -297,6 +297,10 @@ General Deprecations
   - The ``salt.minion.parse_args_and_kwargs`` function has been removed. Please
   use the ``salt.minion.load_args_and_kwargs`` function instead.
 
+- When passing additional data to be used in a template context, ``context`` must be populated
+  with ``key: value`` pairs. Users must update their state files accordingly. Previous to this
+  release, users saw a deprecation warning. Now, a SaltInvocationError is raised instead.
+
 Cloud Deprecations
 ------------------
 
diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py
index 10fa48be19..d2da915b2d 100644
--- a/salt/utils/__init__.py
+++ b/salt/utils/__init__.py
@@ -1056,17 +1056,6 @@ def format_call(fun,
             continue
         extra[key] = copy.deepcopy(value)
 
-    # We'll be showing errors to the users until Salt Carbon comes out, after
-    # which, errors will be raised instead.
-    warn_until(
-        'Carbon',
-        'It\'s time to start raising `SaltInvocationError` instead of '
-        'returning warnings',
-        # Let's not show the deprecation warning on the console, there's no
-        # need.
-        _dont_call_warnings=True
-    )
-
     if extra:
         # Found unexpected keyword arguments, raise an error to the user
         if len(extra) == 1:
@@ -1090,20 +1079,8 @@ def format_call(fun,
                     '{0}.{1}'.format(fun.__module__, fun.__name__)
                 )
             )
+        raise SaltInvocationError(msg)
 
-        # Return a warning to the user explaining what's going on
-        ret.setdefault('warnings', []).append(
-            '{0}. If you were trying to pass additional data to be used '
-            'in a template context, please populate \'context\' with '
-            '\'key: value\' pairs. Your approach will work until Salt '
-            'Carbon is out.{1}'.format(
-                msg,
-                '' if 'full' not in ret else ' Please update your state files.'
-            )
-        )
-
-        # Lets pack the current extra kwargs as template context
-        ret.setdefault('context', {}).update(extra)
     return ret