provider: add get_session method and convert all hooks and lookups

This makes hooks respect the universal region and profile settings add in the config.

Author: danielkza

stacker/hooks/aws_lambda.py

@@ -11,10 +11,10 @@
 import hashlib
 from io import BytesIO as StringIO
 from zipfile import ZipFile, ZIP_DEFLATED
+
 import botocore
 import formic
 from troposphere.awslambda import Code
-from stacker.session_cache import get_session
 
 from stacker.util import (
     get_config_directory,
@@ -508,7 +508,7 @@ def create_template(self):
     payload_acl = kwargs.get('payload_acl', 'private')
 
     # Always use the global client for s3
-    session = get_session(bucket_region)
+    session = provider.get_session(region=bucket_region)
     s3_client = session.client('s3')
 
     ensure_s3_bucket(s3_client, bucket_name, bucket_region)

stacker/hooks/ecs.py

@@ -7,7 +7,6 @@
 from past.builtins import basestring
 import logging
 
-from stacker.session_cache import get_session
 
 logger = logging.getLogger(__name__)
 
@@ -26,7 +25,7 @@ def create_clusters(provider, context, **kwargs):
     Returns: boolean for whether or not the hook succeeded.
 
     """
-    conn = get_session(provider.region).client('ecs')
+    conn = provider.get_session().client('ecs')
 
     try:
         clusters = kwargs["clusters"]

stacker/hooks/iam.py

@@ -5,7 +5,6 @@
 import copy
 import logging
 
-from stacker.session_cache import get_session
 from botocore.exceptions import ClientError
 
 from awacs.aws import Statement, Allow, Policy
@@ -32,7 +31,7 @@ def create_ecs_service_role(provider, context, **kwargs):
 
     """
     role_name = kwargs.get("role_name", "ecsServiceRole")
-    client = get_session(provider.region).client('iam')
+    client = provider.get_session().client('iam')
 
     try:
         client.create_role(
@@ -125,7 +124,7 @@ def get_cert_contents(kwargs):
 
 
 def ensure_server_cert_exists(provider, context, **kwargs):
-    client = get_session(provider.region).client('iam')
+    client = provider.get_session().client('iam')
     cert_name = kwargs["cert_name"]
     status = "unknown"
     try:

stacker/hooks/keypair.py

@@ -8,7 +8,6 @@
 
 from botocore.exceptions import ClientError
 
-from stacker.session_cache import get_session
 from stacker.hooks import utils
 from stacker.ui import get_raw_input
 
@@ -220,8 +219,8 @@ def ensure_keypair_exists(provider, context, **kwargs):
                      "specified at the same time")
         return False
 
-    session = get_session(region=provider.region,
-                          profile=kwargs.get("profile"))
+    session = provider.get_session(
+        profile=kwargs.get("profile"))
     ec2 = session.client("ec2")
 
     keypair = get_existing_key_pair(ec2, keypair_name)

stacker/hooks/route53.py

@@ -3,8 +3,6 @@
 from __future__ import absolute_import
 import logging
 
-from stacker.session_cache import get_session
-
 from stacker.util import create_route53_zone
 
 logger = logging.getLogger(__name__)
@@ -21,7 +19,7 @@ def create_domain(provider, context, **kwargs):
     Returns: boolean for whether or not the hook succeeded.
 
     """
-    session = get_session(provider.region)
+    session = provider.get_session()
     client = session.client("route53")
     domain = kwargs.get("domain")
     if not domain:

stacker/lookups/handlers/ami.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from stacker.session_cache import get_session
+
 import re
 import operator
 
@@ -22,31 +22,31 @@ def __init__(self, search_string):
 
 class AmiLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, provider, **kwargs):
+    def handle(cls, value, context, provider):
         """Fetch the most recent AMI Id using a filter
-    
+
         For example:
-    
+
             ${ami [<region>@]owners:self,account,amazon name_regex:serverX-[0-9]+ architecture:x64,i386}
-    
+
             The above fetches the most recent AMI where owner is self
             account or amazon and the ami name matches the regex described,
             the architecture will be either x64 or i386
-    
+
             You can also optionally specify the region in which to perform the
             AMI lookup.
-    
+
             Valid arguments:
-    
+
             owners (comma delimited) REQUIRED ONCE:
                 aws_account_id | amazon | self
-    
+
             name_regex (a regex) REQUIRED ONCE:
                 e.g. my-ubuntu-server-[0-9]+
-    
+
             executable_users (comma delimited) OPTIONAL ONCE:
                 aws_account_id | amazon | self
-    
+
             Any other arguments specified are sent as filters to the aws api
             For example, "architecture:x86_64" will add a filter
         """  # noqa
@@ -57,13 +57,13 @@ def handle(cls, value, provider, **kwargs):
         else:
             region = provider.region
 
-        ec2 = get_session(region).client('ec2')
+        ec2 = provider.get_session(region=region).client('ec2')
 
         values = {}
         describe_args = {}
 
         # now find any other arguments that can be filters
-        matches = re.findall('([0-9a-zA-z_-]+:[^\s$]+)', value)
+        matches = re.findall(r'([0-9a-zA-z_-]+:[^\s$]+)', value)
         for match in matches:
             k, v = match.split(':', 1)
             values[k] = v
@@ -77,10 +77,9 @@ def handle(cls, value, provider, **kwargs):
             raise Exception("'name_regex' value required when using ami")
         name_regex = values.pop('name_regex')
 
-        executable_users = None
-        if values.get('executable_users'):
-            executable_users = values.pop('executable_users').split(',')
-            describe_args["ExecutableUsers"] = executable_users
+        executable_users = values.get('executable_users')
+        if executable_users:
+            describe_args["ExecutableUsers"] = executable_users.split(',')
 
         filters = []
         for k, v in values.items():

stacker/lookups/handlers/dynamodb.py

@@ -4,7 +4,6 @@
 from builtins import str
 from botocore.exceptions import ClientError
 import re
-from stacker.session_cache import get_session
 
 from . import LookupHandler
 from ...util import read_value_from_path
@@ -14,7 +13,7 @@
 
 class DynamodbLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, **kwargs):
+    def handle(cls, value, context, provider):
         """Get a value from a dynamodb table
 
         dynamodb field types should be in the following format:
@@ -53,7 +52,7 @@ def handle(cls, value, **kwargs):
         projection_expression = _build_projection_expression(clean_table_keys)
 
         # lookup the data from dynamodb
-        dynamodb = get_session(region).client('dynamodb')
+        dynamodb = provider.get_session(region=region).client('dynamodb')
         try:
             response = dynamodb.get_item(
                 TableName=table_name,

stacker/lookups/handlers/kms.py

@@ -2,7 +2,6 @@
 from __future__ import division
 from __future__ import absolute_import
 import codecs
-from stacker.session_cache import get_session
 
 from . import LookupHandler
 from ...util import read_value_from_path
@@ -12,7 +11,7 @@
 
 class KmsLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, **kwargs):
+    def handle(cls, value, context, provider):
         """Decrypt the specified value with a master key in KMS.
 
         kmssimple field types should be in the following format:
@@ -55,7 +54,7 @@ def handle(cls, value, **kwargs):
         if "@" in value:
             region, value = value.split("@", 1)
 
-        kms = get_session(region).client('kms')
+        kms = provider.get_session(region=region).client('kms')
 
         # encode str value as an utf-8 bytestring for use with codecs.decode.
         value = value.encode('utf-8')

stacker/lookups/handlers/output.py

@@ -17,7 +17,7 @@
 
 class OutputLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, context, provider, **kwargs):
+    def handle(cls, value, context, provider):
         """Fetch an output from the designated stack."""
 
         d = deconstruct(value)

stacker/lookups/handlers/rxref.py

@@ -22,7 +22,7 @@
 
 class RxrefLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, provider=None, context=None, **kwargs):
+    def handle(cls, value, context, provider):
         """Fetch an output from the designated stack.
 
         Args:

stacker/lookups/handlers/ssmstore.py

@@ -3,8 +3,6 @@
 from __future__ import absolute_import
 from builtins import str
 
-from stacker.session_cache import get_session
-
 from . import LookupHandler
 from ...util import read_value_from_path
 
@@ -13,7 +11,7 @@
 
 class SsmstoreLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, **kwargs):
+    def handle(cls, value, context, provider):
         """Retrieve (and decrypt if applicable) a parameter from
         AWS SSM Parameter Store.
 
@@ -48,7 +46,7 @@ def handle(cls, value, **kwargs):
         if "@" in value:
             region, value = value.split("@", 1)
 
-        client = get_session(region).client("ssm")
+        client = provider.get_session(region=region).client("ssm")
         response = client.get_parameters(
             Names=[
                 value,

stacker/lookups/handlers/xref.py

@@ -21,7 +21,7 @@
 
 class XrefLookup(LookupHandler):
     @classmethod
-    def handle(cls, value, provider=None, **kwargs):
+    def handle(cls, value, context, provider):
         """Fetch an output from the designated stack.
 
         Args:
@@ -34,9 +34,6 @@ def handle(cls, value, provider=None, **kwargs):
             str: output from the specified stack
         """
 
-        if provider is None:
-            raise ValueError('Provider is required')
-
         d = deconstruct(value)
         stack_fqn = d.stack_name
         output = provider.get_output(stack_fqn, d.output_name)