Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resove issue with ignored region argument #15168

Merged

Conversation

colinbjohnson
Copy link
Contributor

Resolves: #14752

Tests Performed - Automated

Ubuntu 12.04

ran tests in both us-east-1 and us-west-1 regions
./tests/runtests.py -n unit.modules.boto_secgroup_test

Ubuntu 14.04

ran tests in both us-east-1 and us-west-1 regions
./tests/runtests.py -n unit.modules.boto_secgroup_test

Tests Performed - Manual:

Test success condition for all publicly exposed methods.

salt-call boto_secgroup.create boto_name boto_description region=us-east-1 --log-level debug
salt-call boto_secgroup.exists boto_name region=us-east-1 --log-level debug
salt-call boto_secgroup.exists not_boto_name region=us-east-1 --log-level debug
salt-call boto_secgroup.delete boto_name region=us-east-1 --log-level debug
salt-call boto_secgroup.create boto_name boto_description region=us-east-1 --log-level debug
salt-call boto_secgroup.authorize boto_name region=us-east-1 ip_protocol=tcp from_port=80 to_port=80 cidr_ip='["10.0.0.0/0", "192.168.0.0/0"]' --log-level debug
salt-call boto_secgroup.get_config boto_name region=us-east-1 --log-level debug
salt-call boto_secgroup.revoke boto_name region=us-east-1 ip_protocol=tcp from_port=80 to_port=80 cidr_ip=10.0.0.0/0 --log-level debug
salt-call boto_secgroup.get_config boto_name region=us-east-1 --log-level debug

salt-call boto_secgroup.create boto_name boto_description region=us-west-1 --log-level debug
salt-call boto_secgroup.exists boto_name region=us-west-1 --log-level debug
salt-call boto_secgroup.exists not_boto_name region=us-west-1 --log-level debug
salt-call boto_secgroup.delete boto_name region=us-west-1 --log-level debug
salt-call boto_secgroup.create boto_name boto_description region=us-west-1 --log-level debug
salt-call boto_secgroup.authorize boto_name region=us-west-1 ip_protocol=tcp from_port=80 to_port=80 cidr_ip='["10.0.0.0/0", "192.168.0.0/0"]' --log-level debug
salt-call boto_secgroup.get_config boto_name region=us-west-1 --log-level debug
salt-call boto_secgroup.revoke boto_name region=us-west-1 ip_protocol=tcp from_port=80 to_port=80 cidr_ip=10.0.0.0/0 --log-level debug
salt-call boto_secgroup.get_config boto_name region=us-west-1 --log-level debug

And, yes, confirmation that I didn't miss any regions:

cjohnson04:salt cjohnson$ grep -ir '_get_group' salt/modules/boto_secgroup.py
salt/modules/boto_secgroup.py:    group = _get_group(conn, name, vpc_id, group_id, region)
salt/modules/boto_secgroup.py:def _get_group(conn, name=None, vpc_id=None, group_id=None, region=None):
salt/modules/boto_secgroup.py:    group = _get_group(conn, name, vpc_id, region)
salt/modules/boto_secgroup.py:    sg = _get_group(conn, name, vpc_id, group_id, region)
salt/modules/boto_secgroup.py:    group = _get_group(conn, name, vpc_id, group_id, region)
salt/modules/boto_secgroup.py:    group = _get_group(conn, name, vpc_id, group_id, region)
salt/modules/boto_secgroup.py:    group = _get_group(conn, name, vpc_id, group_id, region)

@ghost
Copy link

ghost commented Aug 22, 2014

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/7195/

thatch45 added a commit that referenced this pull request Aug 22, 2014
@thatch45 thatch45 merged commit 0817e60 into saltstack:develop Aug 22, 2014
@thatch45
Copy link
Member

Thanks @colinbjohnson !

@ryan-lane
Copy link
Contributor

@basepi please backport to 2014.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

modules.boto_secgroup._get_group() ignores region argument
5 participants