Skip to content

Commit e9746d8

Browse files
authored
Merge pull request #1545 from snyk/fix/aws_route_table_timeouts
Fix false-positive on timeouts attribute in aws_route_table and aws_default_route_table
2 parents 0afdf95 + 3fd14d6 commit e9746d8

File tree

15 files changed

+331071
-57317
lines changed

15 files changed

+331071
-57317
lines changed

pkg/iac/terraform/state/terraform_state_reader_test.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ func TestTerraformStateReader_Source(t *testing.T) {
9696

9797
func TestTerraformStateReader_AWS_Resources(t *testing.T) {
9898
tests := []struct {
99-
name string
100-
dirName string
101-
wantErr bool
99+
name string
100+
dirName string
101+
wantErr bool
102+
providerVersion string
102103
}{
103104
{name: "IAM user module", dirName: "module.iam_iam-user", wantErr: false},
104105
{name: "Data source", dirName: "data_source", wantErr: false},
@@ -133,7 +134,8 @@ func TestTerraformStateReader_AWS_Resources(t *testing.T) {
133134
{name: "IAM group policy", dirName: "aws_iam_group_policy", wantErr: false},
134135
{name: "IAM group policy attachment", dirName: "aws_iam_group_policy_attachment", wantErr: false},
135136
{name: "VPC security group rule", dirName: "aws_vpc_security_group_rule", wantErr: false},
136-
{name: "route table", dirName: "aws_route_table", wantErr: false},
137+
{name: "default route table", dirName: "aws_default_route_table", wantErr: false, providerVersion: "3.62.0"},
138+
{name: "route table", dirName: "aws_route_table", wantErr: false, providerVersion: "3.62.0"},
137139
{name: "route table associations", dirName: "aws_route_assoc", wantErr: false},
138140
{name: "route", dirName: "aws_route", wantErr: false},
139141
{name: "NAT gateway", dirName: "aws_nat_gateway", wantErr: false},
@@ -212,10 +214,13 @@ func TestTerraformStateReader_AWS_Resources(t *testing.T) {
212214
shouldUpdate := tt.dirName == *goldenfile.Update
213215

214216
var realProvider *aws.AWSTerraformProvider
217+
if tt.providerVersion == "" {
218+
tt.providerVersion = "3.19.0"
219+
}
215220

216221
if shouldUpdate {
217222
var err error
218-
realProvider, err = aws.NewAWSTerraformProvider("3.19.0", progress, os.TempDir())
223+
realProvider, err = aws.NewAWSTerraformProvider(tt.providerVersion, progress, os.TempDir())
219224
if err != nil {
220225
t.Fatal(err)
221226
}
@@ -229,7 +234,7 @@ func TestTerraformStateReader_AWS_Resources(t *testing.T) {
229234
library := terraform.NewProviderLibrary()
230235
library.AddProvider(terraform.AWS, provider)
231236

232-
repo := testresource.InitFakeSchemaRepository(terraform.AWS, "3.19.0")
237+
repo := testresource.InitFakeSchemaRepository(terraform.AWS, tt.providerVersion)
233238
resourceaws.InitResourcesMetadata(repo)
234239

235240
factory := terraform.NewTerraformResourceFactory(repo)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[
2+
{
3+
"Id": "rtb-03fda555c6c35a1e5",
4+
"Type": "aws_default_route_table",
5+
"Attrs": {
6+
"arn": "arn:aws:ec2:us-east-1:282061376516:route-table/rtb-03fda555c6c35a1e5",
7+
"default_route_table_id": "rtb-03fda555c6c35a1e5",
8+
"id": "rtb-03fda555c6c35a1e5",
9+
"owner_id": "282061376516",
10+
"vpc_id": "vpc-092fed41ffac6df72"
11+
}
12+
}
13+
]

0 commit comments

Comments
 (0)