saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Deprecate salt.utils.iam in Carbon

Browse source 
salt.utils.aws has more feature complete methods to retrieve same data
This commit is contained in:
Stanislav Blokhin 2015-09-11 22:35:09 +02:00
parent e23caa8ccf
commit 1e6e5ddc9c
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/utils/iam.py
View file

@ -13,6 +13,7 @@ import time
import pprint
from salt.ext.six.moves import range
import salt.ext.six as six
import salt.utils
try:
import requests
HAS_REQUESTS = True # pylint: disable=W0612
@ -68,6 +69,11 @@ def get_iam_region(version='latest', url='http://169.254.169.254',
'''
Gets instance identity document and returns region
'''
salt.utils.warn_until(
'Carbon',
'''The \'get_iam_region\' function has been deprecated in favor of
\'salt.utils.aws.get_region_from_metadata\'. Please update your code
to reflect this.''')
instance_identity_url = '{0}/{1}/dynamic/instance-identity/document'.format(url, version)
region = None
@ -85,6 +91,10 @@ def get_iam_metadata(version='latest', url='http://169.254.169.254',
'''
Grabs the first IAM role from this instances metadata if it exists.
'''
salt.utils.warn_until(
'Carbon',
'''The \'get_iam_metadata\' function has been deprecated in favor of
\'salt.utils.aws.creds\'. Please update your code to reflect this.''')
iam_url = '{0}/{1}/meta-data/iam/security-credentials/'.format(url, version)
roles = _retry_get_url(iam_url, num_retries, timeout).splitlines()