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

Remove useless empty fields and remove todo

main
Elie 2021-05-10 16:50:49 +02:00
parent 7feb45f5dd
commit 6a2557573a
No known key found for this signature in database
GPG Key ID: 399AF69092C727B6
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/driftctl_test.go
View File

@ -721,9 +721,8 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
Attrs: &resource.Attributes{
"route": []interface{}{
map[string]interface{}{
"gateway_id": "igw-07b7844a8fd17a638",
"cidr_block": "0.0.0.0/0",
"ipv6_cidr_block": "",
"gateway_id": "igw-07b7844a8fd17a638",
"cidr_block": "0.0.0.0/0",
},
map[string]interface{}{
"gateway_id": "igw-07b7844a8fd17a638",
@ -739,13 +738,11 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
Id: "r-table1080289494",
Type: aws.AwsRouteResourceType,
Attrs: &resource.Attributes{
"route_table_id": "table",
"origin": "CreateRoute",
"destination_cidr_block": "0.0.0.0/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
"destination_prefix_list_id": "",
"instance_owner_id": "",
"route_table_id": "table",
"origin": "CreateRoute",
"destination_cidr_block": "0.0.0.0/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
},
},
&resource.AbstractResource{
@ -757,8 +754,6 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
"destination_ipv6_cidr_block": "::/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
"destination_prefix_list_id": "",
"instance_owner_id": "",
},
},
},
@ -775,13 +770,11 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
Id: "r-table1080289494",
Type: aws.AwsRouteResourceType,
Attrs: &resource.Attributes{
"route_table_id": "table",
"origin": "CreateRoute",
"destination_cidr_block": "0.0.0.0/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
"destination_prefix_list_id": "",
"instance_owner_id": "",
"route_table_id": "table",
"origin": "CreateRoute",
"destination_cidr_block": "0.0.0.0/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
},
}, nil)
factory.(*terraform.MockResourceFactory).On("CreateAbstractResource", "aws_route", "r-table2750132062", mock.MatchedBy(func(input map[string]interface{}) bool {
@ -801,8 +794,6 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
"destination_ipv6_cidr_block": "::/0",
"gateway_id": "igw-07b7844a8fd17a638",
"state": "active",
"destination_prefix_list_id": "",
"instance_owner_id": "",
},
}, nil)
},

1
pkg/middlewares/aws_default_igw_route.go
View File

@ -49,7 +49,6 @@ func (m AwsDefaultInternetGatewayRoute) Execute(remoteResources, resourcesFromSt
// Else, resource is not added to newRemoteResources slice so it will be ignored
logrus.WithFields(logrus.Fields{
// "route": route.String(), TODO
"id": route.TerraformId(),
"type": route.TerraformType(),
}).Debug("Ignoring default internet gateway route as it is not managed by IaC")

26
pkg/middlewares/aws_route_table_expander.go
View File

@ -3,7 +3,6 @@ package middlewares
import (
"fmt"
awssdk "github.com/aws/aws-sdk-go/aws"
"github.com/sirupsen/logrus"
"github.com/cloudskiff/driftctl/pkg/alerter"
@ -92,7 +91,15 @@ func (m *AwsRouteTableExpander) handleTable(table *resource.AbstractResource, re
}
for _, route := range routes.([]interface{}) {
route := route.(map[string]interface{})
routeId, err := aws.CalculateRouteID(&table.Id, awssdk.String(route["cidr_block"].(string)), awssdk.String(route["ipv6_cidr_block"].(string)))
cidrBlock := ""
if route["cidr_block"] != nil {
cidrBlock = route["cidr_block"].(string)
}
ipv6CidrBlock := ""
if route["ipv6_cidr_block"] != nil {
ipv6CidrBlock = route["ipv6_cidr_block"].(string)
}
routeId, err := aws.CalculateRouteID(&table.Id, &cidrBlock, &ipv6CidrBlock)
if err != nil {
m.alerter.SendAlert(aws.AwsRouteTableResourceType, newInvalidRouteAlert(aws.AwsRouteTableResourceType, table.Id))
continue
@ -101,7 +108,6 @@ func (m *AwsRouteTableExpander) handleTable(table *resource.AbstractResource, re
data := map[string]interface{}{
"destination_cidr_block": route["cidr_block"],
"destination_ipv6_cidr_block": route["ipv6_cidr_block"],
"destination_prefix_list_id": "",
"egress_only_gateway_id": route["egress_only_gateway_id"],
"gateway_id": route["gateway_id"],
"id": routeId,
@ -124,7 +130,6 @@ func (m *AwsRouteTableExpander) handleTable(table *resource.AbstractResource, re
newRes := m.resourceFactory.CreateAbstractResource(aws.AwsRouteResourceType, routeId, data)
*results = append(*results, newRes)
logrus.WithFields(logrus.Fields{
// "route": newRes.String(), TODO
"route": routeId,
}).Debug("Created new route from route table")
}
@ -139,7 +144,15 @@ func (m *AwsRouteTableExpander) handleDefaultTable(table *resource.AbstractResou
}
for _, route := range routes.([]interface{}) {
route := route.(map[string]interface{})
routeId, err := aws.CalculateRouteID(&table.Id, awssdk.String(route["cidr_block"].(string)), awssdk.String(route["ipv6_cidr_block"].(string)))
cidrBlock := ""
if route["cidr_block"] != nil {
cidrBlock = route["cidr_block"].(string)
}
ipv6CidrBlock := ""
if route["ipv6_cidr_block"] != nil {
ipv6CidrBlock = route["ipv6_cidr_block"].(string)
}
routeId, err := aws.CalculateRouteID(&table.Id, &cidrBlock, &ipv6CidrBlock)
if err != nil {
m.alerter.SendAlert(aws.AwsDefaultRouteTableResourceType, newInvalidRouteAlert(aws.AwsDefaultRouteTableResourceType, table.Id))
continue
@ -148,12 +161,10 @@ func (m *AwsRouteTableExpander) handleDefaultTable(table *resource.AbstractResou
data := map[string]interface{}{
"destination_cidr_block": route["cidr_block"],
"destination_ipv6_cidr_block": route["ipv6_cidr_block"],
"destination_prefix_list_id": "",
"egress_only_gateway_id": route["egress_only_gateway_id"],
"gateway_id": route["gateway_id"],
"id": routeId,
"instance_id": route["instance_id"],
"instance_owner_id": "",
"nat_gateway_id": route["nat_gateway_id"],
"network_interface_id": route["network_interface_id"],
"origin": "CreateRoute",
@ -170,7 +181,6 @@ func (m *AwsRouteTableExpander) handleDefaultTable(table *resource.AbstractResou
newRes := m.resourceFactory.CreateAbstractResource(aws.AwsRouteResourceType, routeId, data)
*results = append(*results, newRes)
logrus.WithFields(logrus.Fields{
// "route": newRes.String(), TODO
"route": routeId,
}).Debug("Created new route from default route table")
}