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

Merge pull request #26290 from rallytime/fix-25192

Browse source 
Only call convert_to_arn when action name is provided
This commit is contained in:
Mike Place 2015-08-13 12:48:58 -06:00
commit 5dd5ac1198
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
salt/modules/boto_cloudwatch.py
View file

@ -220,12 +220,25 @@ def create_or_update_alarm(
if isinstance(ok_actions, string_types):
ok_actions = ok_actions.split(",")
# convert action names into ARN's
alarm_actions = convert_to_arn(alarm_actions, region, key, keyid, profile)
insufficient_data_actions = convert_to_arn(
insufficient_data_actions, region, key, keyid, profile
)
ok_actions = convert_to_arn(ok_actions, region, key, keyid, profile)
# convert provided action names into ARN's
if alarm_actions:
alarm_actions = convert_to_arn(alarm_actions,
region=region,
key=key,
keyid=keyid,
profile=profile)
if insufficient_data_actions:
insufficient_data_actions = convert_to_arn(insufficient_data_actions,
region=region,
key=key,
keyid=keyid,
profile=profile)
if ok_actions:
ok_actions = convert_to_arn(ok_actions,
region=region,
key=key,
keyid=keyid,
profile=profile)
conn = _get_conn(region, key, keyid, profile)
if not conn: