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.

Sign up for GitHub

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

Jump to bottom

Consider security groups with source security groups when hashing #2376

Merged
merged 13 commits into from
Jun 19, 2015
+279 −27
Merged

Consider security groups with source security groups when hashing #2376

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7e0a340
Consider security groups with source security groups when hashing
jszwedko Jun 11, 2015
8a21bd2
fix existing tests
catsby Jun 16, 2015
b25fb8a
remove meta usage, stub test
catsby Jun 16, 2015
2d06c81
update test
catsby Jun 16, 2015
3bf89fb
update tests with another example
catsby Jun 16, 2015
c1cdac1
clean up old, incompatible test
catsby Jun 16, 2015
359826b
clean up some conflicts with
catsby Jun 16, 2015
640836e
rename method, update docs
catsby Jun 17, 2015
24ee2e5
remove debugging
catsby Jun 18, 2015
645a5aa
add warning message to explain scenario of conflicting rules
catsby Jun 19, 2015
a3cbb74
Merge branch 'master' into jszwedko-fix-sg
catsby Jun 19, 2015
d2176b2
Merge branch 'master' into jszwedko-fix-sg
catsby Jun 19, 2015
44eb55f
update link to actually work
catsby Jun 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix existing tests
  • Loading branch information
@catsby
catsby committed Jun 16, 2015
commit 8a21bd23eaa97116df4bd29e594ebf49931b97e2
9 changes: 5 additions & 4 deletions builtin/providers/aws/resource_aws_security_group_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
Expand Down Expand Up @@ -92,15 +93,15 @@ func TestIpPermissionIDHash(t *testing.T) {
}{
{simple, "ingress", "sg-82613597"},
{egress, "egress", "sg-363054720"},
{egress_all, "egress", "sg-857124156"},
{vpc_security_group_source, "egress", "sg-1900174468"},
{security_group_source, "egress", "sg-1409919872"},
{egress_all, "egress", "sg-2766285362"},
{vpc_security_group_source, "egress", "sg-2661404947"},
{security_group_source, "egress", "sg-1841245863"},
}

for _, tc := range cases {
actual := ipPermissionIDHash(tc.Type, tc.Input)
if actual != tc.Output {
t.Errorf("input: %s - %#v\noutput: %s", tc.Type, tc.Input, actual)
t.Errorf("input: %s - %s\noutput: %s", tc.Type, awsutil.StringValue(tc.Input), actual)
}
}
}
Expand Down