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

Merge branch 'main' into fix/sgrulesDetailsFetcher

main
Elie 2021-07-20 17:54:09 +02:00 committed by GitHub
parent bc017f087c 2ac36fd416
commit f363461641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cmd/scan/output/assets/index.tmpl
View File

@ -47,11 +47,11 @@
<main>
{{ if (lt .Coverage 100) }}
<form role="search">
<label for="search" class="visuallyhidden">Search Resources:</label>
<input type="search" id="search" name="search" placeholder="Search Resources...">
<label for="select" class="visuallyhidden">Select Resource Type:</label>
<label for="search" class="visuallyhidden">Search resources by id:</label>
<input type="search" id="search" name="search" placeholder="Search resources by id...">
<label for="select" class="visuallyhidden">Select a resource type:</label>
<select id="select" name="select">
<option value="">Resource Type</option>
<option value="">Select a resource type</option>
{{ range $type := getResourceTypes }}
<option value="{{$type}}">{{ $type }}</option>
{{end}}

8
pkg/cmd/scan/output/testdata/output.html vendored
View File

@ -376,11 +376,11 @@ input[type="search"], select {
<main>
<form role="search">
<label for="search" class="visuallyhidden">Search Resources:</label>
<input type="search" id="search" name="search" placeholder="Search Resources...">
<label for="select" class="visuallyhidden">Select Resource Type:</label>
<label for="search" class="visuallyhidden">Search resources by id:</label>
<input type="search" id="search" name="search" placeholder="Search resources by id...">
<label for="select" class="visuallyhidden">Select a resource type:</label>
<select id="select" name="select">
<option value="">Resource Type</option>
<option value="">Select a resource type</option>
<option value="aws_unmanaged_resource">aws_unmanaged_resource</option>

8
pkg/cmd/scan/output/testdata/output_empty.html vendored
View File

@ -376,11 +376,11 @@ input[type="search"], select {
<main>
<form role="search">
<label for="search" class="visuallyhidden">Search Resources:</label>
<input type="search" id="search" name="search" placeholder="Search Resources...">
<label for="select" class="visuallyhidden">Select Resource Type:</label>
<label for="search" class="visuallyhidden">Search resources by id:</label>
<input type="search" id="search" name="search" placeholder="Search resources by id...">
<label for="select" class="visuallyhidden">Select a resource type:</label>
<select id="select" name="select">
<option value="">Resource Type</option>
<option value="">Select a resource type</option>
</select>
<input type="reset" value="Reset Filters">

1
pkg/remote/aws/ec2_route_enumerator.go
View File

@ -36,6 +36,7 @@ func (e *EC2RouteEnumerator) Enumerate() ([]resource.Resource, error) {
routeId, _ := aws.CalculateRouteID(routeTable.RouteTableId, route.DestinationCidrBlock, route.DestinationIpv6CidrBlock)
data := map[string]interface{}{
"route_table_id": *routeTable.RouteTableId,
"origin": *route.Origin,
}
if route.DestinationCidrBlock != nil && *route.DestinationCidrBlock != "" {
data["destination_cidr_block"] = *route.DestinationCidrBlock

6
pkg/remote/ec2_scanner_test.go
View File

@ -1850,10 +1850,12 @@ func TestEC2Route(t *testing.T) {
{
DestinationCidrBlock: awssdk.String("1.1.1.1/32"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
{
DestinationIpv6CidrBlock: awssdk.String("::/0"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
},
},
@ -1867,10 +1869,12 @@ func TestEC2Route(t *testing.T) {
{
DestinationCidrBlock: awssdk.String("0.0.0.0/0"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
{
DestinationIpv6CidrBlock: awssdk.String("::/0"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
},
},
@ -1890,10 +1894,12 @@ func TestEC2Route(t *testing.T) {
{
DestinationCidrBlock: awssdk.String("10.1.1.0/24"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
{
DestinationCidrBlock: awssdk.String("10.1.2.0/24"),
GatewayId: awssdk.String("igw-030e74f73bd67f21b"),
Origin: awssdk.String("CreateRoute"),
},
},
},