Skip to content

Commit

Permalink
fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Guibert committed Dec 22, 2020
1 parent 1eb97df commit b6d9274
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pkg/middlewares/aws_instance_eip.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (a AwsInstanceEIP) hasEIP(instance *aws.AwsInstance, resources *[]resource.
return false
}

func (a AwsInstanceEIP) ignorePublicIpAndDns(instance *aws.AwsInstance, resourcesSet ...*[]resource.Resource) {
func (a AwsInstanceEIP) ignorePublicIpAndDns(instance *aws.AwsInstance, resourcesSet ...*[]resource.Resource) {
for _, resources := range resourcesSet {
for _, res := range *resources {
if res.TerraformType() == instance.TerraformType() &&
Expand Down
46 changes: 23 additions & 23 deletions pkg/middlewares/aws_instance_eip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ func TestAwsInstanceEIP_Execute(t *testing.T) {
resourcesFromState *[]resource.Resource
}
tests := []struct {
name string
args args
name string
args args
expected args
}{
{
name: "test that public ip and dns are nulled whith eip",
args: args{
name: "test that public ip and dns are nulled whith eip",
args: args{
remoteResources: &[]resource.Resource{
&aws.AwsInstance{
Id: "instance1",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance1",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
&aws.AwsInstance{
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
},
resourcesFromState: &[]resource.Resource{
&aws.AwsInstance{
Id: "instance1",
PublicIp: awssdk.String("5.6.7.8"),
Id: "instance1",
PublicIp: awssdk.String("5.6.7.8"),
PublicDns: awssdk.String("example.com"),
},
&aws.AwsEip{
Expand All @@ -51,8 +51,8 @@ func TestAwsInstanceEIP_Execute(t *testing.T) {
Id: "instance1",
},
&aws.AwsInstance{
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
},
Expand All @@ -67,24 +67,24 @@ func TestAwsInstanceEIP_Execute(t *testing.T) {
},
},
{
name: "test that public ip and dns are nulled when eip association",
args: args{
name: "test that public ip and dns are nulled when eip association",
args: args{
remoteResources: &[]resource.Resource{
&aws.AwsInstance{
Id: "instance1",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance1",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
&aws.AwsInstance{
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
},
resourcesFromState: &[]resource.Resource{
&aws.AwsInstance{
Id: "instance1",
PublicIp: awssdk.String("5.6.7.8"),
Id: "instance1",
PublicIp: awssdk.String("5.6.7.8"),
PublicDns: awssdk.String("example.com"),
},
&aws.AwsEipAssociation{
Expand All @@ -98,8 +98,8 @@ func TestAwsInstanceEIP_Execute(t *testing.T) {
Id: "instance1",
},
&aws.AwsInstance{
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
Id: "instance2",
PublicIp: awssdk.String("1.2.3.4"),
PublicDns: awssdk.String("dns-of-eip.com"),
},
},
Expand All @@ -120,7 +120,7 @@ func TestAwsInstanceEIP_Execute(t *testing.T) {
if err := a.Execute(tt.args.remoteResources, tt.args.resourcesFromState); err != nil {
t.Fatal(err)
}
if ! reflect.DeepEqual(tt.args, tt.expected) {
if !reflect.DeepEqual(tt.args, tt.expected) {
t.Fatalf("Expected results mismatch")
}
})
Expand Down

0 comments on commit b6d9274

Please sign in to comment.