diff --git a/aws/mock/ec2.go b/aws/mock/ec2.go index 50b64f8a..7e8d3ca9 100644 --- a/aws/mock/ec2.go +++ b/aws/mock/ec2.go @@ -3686,6 +3686,56 @@ func (mr *MockEC2APIMockRecorder) CreateReservedInstancesListingWithContext(arg0 return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateReservedInstancesListingWithContext", reflect.TypeOf((*MockEC2API)(nil).CreateReservedInstancesListingWithContext), varargs...) } +// CreateRestoreImageTask mocks base method. +func (m *MockEC2API) CreateRestoreImageTask(arg0 *ec2.CreateRestoreImageTaskInput) (*ec2.CreateRestoreImageTaskOutput, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateRestoreImageTask", arg0) + ret0, _ := ret[0].(*ec2.CreateRestoreImageTaskOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateRestoreImageTask indicates an expected call of CreateRestoreImageTask. +func (mr *MockEC2APIMockRecorder) CreateRestoreImageTask(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRestoreImageTask", reflect.TypeOf((*MockEC2API)(nil).CreateRestoreImageTask), arg0) +} + +// CreateRestoreImageTaskRequest mocks base method. +func (m *MockEC2API) CreateRestoreImageTaskRequest(arg0 *ec2.CreateRestoreImageTaskInput) (*request.Request, *ec2.CreateRestoreImageTaskOutput) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateRestoreImageTaskRequest", arg0) + ret0, _ := ret[0].(*request.Request) + ret1, _ := ret[1].(*ec2.CreateRestoreImageTaskOutput) + return ret0, ret1 +} + +// CreateRestoreImageTaskRequest indicates an expected call of CreateRestoreImageTaskRequest. +func (mr *MockEC2APIMockRecorder) CreateRestoreImageTaskRequest(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRestoreImageTaskRequest", reflect.TypeOf((*MockEC2API)(nil).CreateRestoreImageTaskRequest), arg0) +} + +// CreateRestoreImageTaskWithContext mocks base method. +func (m *MockEC2API) CreateRestoreImageTaskWithContext(arg0 context.Context, arg1 *ec2.CreateRestoreImageTaskInput, arg2 ...request.Option) (*ec2.CreateRestoreImageTaskOutput, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "CreateRestoreImageTaskWithContext", varargs...) + ret0, _ := ret[0].(*ec2.CreateRestoreImageTaskOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateRestoreImageTaskWithContext indicates an expected call of CreateRestoreImageTaskWithContext. +func (mr *MockEC2APIMockRecorder) CreateRestoreImageTaskWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1}, arg2...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRestoreImageTaskWithContext", reflect.TypeOf((*MockEC2API)(nil).CreateRestoreImageTaskWithContext), varargs...) +} + // CreateRoute mocks base method. func (m *MockEC2API) CreateRoute(arg0 *ec2.CreateRouteInput) (*ec2.CreateRouteOutput, error) { m.ctrl.T.Helper() @@ -3986,6 +4036,56 @@ func (mr *MockEC2APIMockRecorder) CreateSpotDatafeedSubscriptionWithContext(arg0 return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSpotDatafeedSubscriptionWithContext", reflect.TypeOf((*MockEC2API)(nil).CreateSpotDatafeedSubscriptionWithContext), varargs...) } +// CreateStoreImageTask mocks base method. +func (m *MockEC2API) CreateStoreImageTask(arg0 *ec2.CreateStoreImageTaskInput) (*ec2.CreateStoreImageTaskOutput, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateStoreImageTask", arg0) + ret0, _ := ret[0].(*ec2.CreateStoreImageTaskOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateStoreImageTask indicates an expected call of CreateStoreImageTask. +func (mr *MockEC2APIMockRecorder) CreateStoreImageTask(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateStoreImageTask", reflect.TypeOf((*MockEC2API)(nil).CreateStoreImageTask), arg0) +} + +// CreateStoreImageTaskRequest mocks base method. +func (m *MockEC2API) CreateStoreImageTaskRequest(arg0 *ec2.CreateStoreImageTaskInput) (*request.Request, *ec2.CreateStoreImageTaskOutput) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateStoreImageTaskRequest", arg0) + ret0, _ := ret[0].(*request.Request) + ret1, _ := ret[1].(*ec2.CreateStoreImageTaskOutput) + return ret0, ret1 +} + +// CreateStoreImageTaskRequest indicates an expected call of CreateStoreImageTaskRequest. +func (mr *MockEC2APIMockRecorder) CreateStoreImageTaskRequest(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateStoreImageTaskRequest", reflect.TypeOf((*MockEC2API)(nil).CreateStoreImageTaskRequest), arg0) +} + +// CreateStoreImageTaskWithContext mocks base method. +func (m *MockEC2API) CreateStoreImageTaskWithContext(arg0 context.Context, arg1 *ec2.CreateStoreImageTaskInput, arg2 ...request.Option) (*ec2.CreateStoreImageTaskOutput, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "CreateStoreImageTaskWithContext", varargs...) + ret0, _ := ret[0].(*ec2.CreateStoreImageTaskOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateStoreImageTaskWithContext indicates an expected call of CreateStoreImageTaskWithContext. +func (mr *MockEC2APIMockRecorder) CreateStoreImageTaskWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1}, arg2...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateStoreImageTaskWithContext", reflect.TypeOf((*MockEC2API)(nil).CreateStoreImageTaskWithContext), varargs...) +} + // CreateSubnet mocks base method. func (m *MockEC2API) CreateSubnet(arg0 *ec2.CreateSubnetInput) (*ec2.CreateSubnetOutput, error) { m.ctrl.T.Helper() @@ -14732,6 +14832,89 @@ func (mr *MockEC2APIMockRecorder) DescribeStaleSecurityGroupsWithContext(arg0, a return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStaleSecurityGroupsWithContext", reflect.TypeOf((*MockEC2API)(nil).DescribeStaleSecurityGroupsWithContext), varargs...) } +// DescribeStoreImageTasks mocks base method. +func (m *MockEC2API) DescribeStoreImageTasks(arg0 *ec2.DescribeStoreImageTasksInput) (*ec2.DescribeStoreImageTasksOutput, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DescribeStoreImageTasks", arg0) + ret0, _ := ret[0].(*ec2.DescribeStoreImageTasksOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// DescribeStoreImageTasks indicates an expected call of DescribeStoreImageTasks. +func (mr *MockEC2APIMockRecorder) DescribeStoreImageTasks(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStoreImageTasks", reflect.TypeOf((*MockEC2API)(nil).DescribeStoreImageTasks), arg0) +} + +// DescribeStoreImageTasksPages mocks base method. +func (m *MockEC2API) DescribeStoreImageTasksPages(arg0 *ec2.DescribeStoreImageTasksInput, arg1 func(*ec2.DescribeStoreImageTasksOutput, bool) bool) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DescribeStoreImageTasksPages", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// DescribeStoreImageTasksPages indicates an expected call of DescribeStoreImageTasksPages. +func (mr *MockEC2APIMockRecorder) DescribeStoreImageTasksPages(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStoreImageTasksPages", reflect.TypeOf((*MockEC2API)(nil).DescribeStoreImageTasksPages), arg0, arg1) +} + +// DescribeStoreImageTasksPagesWithContext mocks base method. +func (m *MockEC2API) DescribeStoreImageTasksPagesWithContext(arg0 context.Context, arg1 *ec2.DescribeStoreImageTasksInput, arg2 func(*ec2.DescribeStoreImageTasksOutput, bool) bool, arg3 ...request.Option) error { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1, arg2} + for _, a := range arg3 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "DescribeStoreImageTasksPagesWithContext", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// DescribeStoreImageTasksPagesWithContext indicates an expected call of DescribeStoreImageTasksPagesWithContext. +func (mr *MockEC2APIMockRecorder) DescribeStoreImageTasksPagesWithContext(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStoreImageTasksPagesWithContext", reflect.TypeOf((*MockEC2API)(nil).DescribeStoreImageTasksPagesWithContext), varargs...) +} + +// DescribeStoreImageTasksRequest mocks base method. +func (m *MockEC2API) DescribeStoreImageTasksRequest(arg0 *ec2.DescribeStoreImageTasksInput) (*request.Request, *ec2.DescribeStoreImageTasksOutput) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DescribeStoreImageTasksRequest", arg0) + ret0, _ := ret[0].(*request.Request) + ret1, _ := ret[1].(*ec2.DescribeStoreImageTasksOutput) + return ret0, ret1 +} + +// DescribeStoreImageTasksRequest indicates an expected call of DescribeStoreImageTasksRequest. +func (mr *MockEC2APIMockRecorder) DescribeStoreImageTasksRequest(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStoreImageTasksRequest", reflect.TypeOf((*MockEC2API)(nil).DescribeStoreImageTasksRequest), arg0) +} + +// DescribeStoreImageTasksWithContext mocks base method. +func (m *MockEC2API) DescribeStoreImageTasksWithContext(arg0 context.Context, arg1 *ec2.DescribeStoreImageTasksInput, arg2 ...request.Option) (*ec2.DescribeStoreImageTasksOutput, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "DescribeStoreImageTasksWithContext", varargs...) + ret0, _ := ret[0].(*ec2.DescribeStoreImageTasksOutput) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// DescribeStoreImageTasksWithContext indicates an expected call of DescribeStoreImageTasksWithContext. +func (mr *MockEC2APIMockRecorder) DescribeStoreImageTasksWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1}, arg2...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeStoreImageTasksWithContext", reflect.TypeOf((*MockEC2API)(nil).DescribeStoreImageTasksWithContext), varargs...) +} + // DescribeSubnets mocks base method. func (m *MockEC2API) DescribeSubnets(arg0 *ec2.DescribeSubnetsInput) (*ec2.DescribeSubnetsOutput, error) { m.ctrl.T.Helper() diff --git a/go.mod b/go.mod index 2e19d6f4..0e579077 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/terraform-linters/tflint-ruleset-aws go 1.16 require ( - github.com/aws/aws-sdk-go v1.38.12 + github.com/aws/aws-sdk-go v1.38.19 github.com/dave/dst v0.26.2 github.com/golang/mock v1.5.0 github.com/google/go-cmp v0.5.5 - github.com/hashicorp/aws-sdk-go-base v0.7.0 + github.com/hashicorp/aws-sdk-go-base v0.7.1 github.com/hashicorp/hcl/v2 v2.9.1 github.com/hashicorp/terraform-plugin-sdk/v2 v2.5.0 github.com/mitchellh/go-homedir v1.1.0 @@ -15,6 +15,6 @@ require ( github.com/onsi/gomega v1.10.4 // indirect github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e github.com/terraform-linters/tflint-plugin-sdk v0.8.2 - github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210401223222-6eda2394d8c0 + github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210416160120-9a609f330537 github.com/zclconf/go-cty v1.8.1 ) diff --git a/go.sum b/go.sum index ba343d87..db6514cf 100644 --- a/go.sum +++ b/go.sum @@ -57,9 +57,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.38.6/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.38.12 h1:khtODkUna3iF53Cg3dCF4e6oWgrAEbZDU4x1aq+G0WY= -github.com/aws/aws-sdk-go v1.38.12/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.38.19 h1:eg7LfiWRNYjbeS+w2+lHwZOKIgnh0NdYr6LkakZ112Y= +github.com/aws/aws-sdk-go v1.38.19/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= @@ -167,8 +166,8 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/hashicorp/aws-sdk-go-base v0.7.0 h1:Umcq11kcoARameDgxPiYBbyltTZqO7GgBVSdq4pzX/w= -github.com/hashicorp/aws-sdk-go-base v0.7.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= +github.com/hashicorp/aws-sdk-go-base v0.7.1 h1:7s/aR3hFn74tYPVihzDyZe7y/+BorN70rr9ZvpV3j3o= +github.com/hashicorp/aws-sdk-go-base v0.7.1/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= @@ -331,8 +330,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/terraform-linters/tflint-plugin-sdk v0.8.2 h1:A46VFbdBH8K1JwFjC4X5hbW35oL6gIoRxjlzzz27q7I= github.com/terraform-linters/tflint-plugin-sdk v0.8.2/go.mod h1:UsVDOw0Urg0POULWugZ6XFzWJ6i0NaTFYtlYrQe4Auw= -github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210401223222-6eda2394d8c0 h1:s/T5KnH1uRtK/nBFW3ZPISUPp0TecnZhzbNQ8frrRqA= -github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210401223222-6eda2394d8c0/go.mod h1:zHbWVcgJdvGPS7TgOYxr1p2Fgrtok7rVw9EOhSgtC9M= +github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210416160120-9a609f330537 h1:m2JnN7NfPAplhEJCLyJyAO0DYqQ6kTV7LhMa1RHaacM= +github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210416160120-9a609f330537/go.mod h1:vhDBdj6c+svsuvFHJePdiN+XTqp+oZZ0+Ldqc6OPHHQ= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= diff --git a/rules/models/aws-sdk-go b/rules/models/aws-sdk-go index f19d3d56..42d176a7 160000 --- a/rules/models/aws-sdk-go +++ b/rules/models/aws-sdk-go @@ -1 +1 @@ -Subproject commit f19d3d56170cc53564eae1e8d83deaa36001bca4 +Subproject commit 42d176a721654f5ab0f6f9ae1706265edb083770 diff --git a/rules/models/mappings/storagegateway.hcl b/rules/models/mappings/storagegateway.hcl index b18cd16e..2b7f6c05 100644 --- a/rules/models/mappings/storagegateway.hcl +++ b/rules/models/mappings/storagegateway.hcl @@ -49,14 +49,14 @@ mapping "aws_storagegateway_smb_file_share" { authentication = Authentication default_storage_class = StorageClass guess_mime_type_enabled = Boolean - invalid_user_list = FileShareUserList + // invalid_user_list = FileShareUserList kms_encrypted = Boolean kms_key_arn = KMSKey // smb_file_share_defaults = NFSFileShareDefaults object_acl = ObjectACL read_only = Boolean requester_pays = Boolean - valid_user_list = FileShareUserList + // valid_user_list = FileShareUserList } mapping "aws_storagegateway_upload_buffer" { diff --git a/rules/tags/resources.go b/rules/tags/resources.go index 3e0d0ebc..72205cc9 100644 --- a/rules/tags/resources.go +++ b/rules/tags/resources.go @@ -52,6 +52,8 @@ var Resources = []string{ "aws_codebuild_project", "aws_codebuild_report_group", "aws_codecommit_repository", + "aws_codedeploy_app", + "aws_codedeploy_deployment_group", "aws_codepipeline", "aws_codepipeline_webhook", "aws_codestarconnections_connection", @@ -134,6 +136,7 @@ var Resources = []string{ "aws_efs_file_system", "aws_egress_only_internet_gateway", "aws_eip", + "aws_eks_addon", "aws_eks_cluster", "aws_eks_fargate_profile", "aws_eks_node_group", @@ -204,6 +207,7 @@ var Resources = []string{ "aws_mq_broker", "aws_mq_configuration", "aws_msk_cluster", + "aws_mwaa_environment", "aws_nat_gateway", "aws_neptune_cluster", "aws_neptune_cluster_instance", @@ -246,6 +250,8 @@ var Resources = []string{ "aws_resourcegroups_group", "aws_route53_health_check", "aws_route53_resolver_endpoint", + "aws_route53_resolver_firewall_domain_list", + "aws_route53_resolver_firewall_rule_group", "aws_route53_resolver_query_log_config", "aws_route53_resolver_rule", "aws_route53_zone",