sundowndev
/
driftctl
mirror of https://github.com/sundowndev/driftctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from cloudskiff/fix/fail_on_bad_fmt 

add fmt check in ci
main
William BEUIL 2020-12-23 11:16:40 +01:00 committed by GitHub
parent 4d9c048f2d 4a3ef8751e
commit 6aa5da86ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.circleci/config.yml
View File

@ -17,6 +17,17 @@ jobs:
- image: golang:1.15
steps:
- checkout
- run:
name: Enforce Go Formatted Code
command: |
go fmt ./...
if [[ -z $(git status --porcelain) ]]; then
echo "Git directory is clean."
else
echo "Git directory is dirty. Run make fmt locally and commit any formatting fixes or generated code."
git status --porcelain
exit 1
fi
- run: make install-tools
- run: make test
- run:

2
pkg/middlewares/aws_instance_eip.go
View File

@ -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() &&

46
pkg/middlewares/aws_instance_eip_test.go
View File

@ -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{
@ -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"),
},
},
@ -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{
@ -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"),
},
},
@ -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")
}
})