Skip to content

Commit 8a9ec20

Browse files
wata727wata727
authored
Update aws-sdk-go and AWS provider rules (#317)
1 parent da1e9e5 commit 8a9ec20

File tree

38 files changed

+440
-55
lines changed

38 files changed

+440
-55
lines changed

‎aws/mock/ec2.go

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/rules/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ These rules enforce best practices and naming conventions:
124124
|aws_amplify_branch_invalid_framework|✔|
125125
|aws_amplify_branch_invalid_pull_request_environment_name|✔|
126126
|aws_amplify_branch_invalid_stage|✔|
127+
|aws_amplify_branch_invalid_ttl|✔|
127128
|aws_amplify_domain_association_invalid_app_id|✔|
128-
|aws_amplify_domain_association_invalid_domain_name|✔|
129129
|aws_amplify_webhook_invalid_app_id|✔|
130130
|aws_amplify_webhook_invalid_branch_name|✔|
131131
|aws_amplify_webhook_invalid_description|✔|

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/agext/levenshtein v1.2.2 // indirect
7-
github.com/aws/aws-sdk-go v1.42.43
7+
github.com/aws/aws-sdk-go v1.43.26
88
github.com/dave/dst v0.26.2
99
github.com/fatih/color v1.9.0 // indirect
1010
github.com/golang/mock v1.6.0
@@ -47,9 +47,9 @@ require (
4747
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
4848
github.com/vmihailenco/tagparser v0.1.1 // indirect
4949
golang.org/x/mod v0.4.2 // indirect
50-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
51-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
52-
golang.org/x/text v0.3.6 // indirect
50+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
51+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
52+
golang.org/x/text v0.3.7 // indirect
5353
golang.org/x/tools v0.1.1 // indirect
5454
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
5555
)

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXva
66
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
77
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
88
github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
9-
github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
109
github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
1110
github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
1211
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
1312
github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
14-
github.com/aws/aws-sdk-go v1.42.43 h1:rLcxH9YgI3zN7TnjBn1Z6V62GPjOEW1IQd0m11Y/nXE=
15-
github.com/aws/aws-sdk-go v1.42.43/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
13+
github.com/aws/aws-sdk-go v1.43.26 h1:/ABcm/2xp+Vu+iUx8+TmlwXMGjO7fmZqJMoZjml4y/4=
14+
github.com/aws/aws-sdk-go v1.43.26/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
1615
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
1716
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1817
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -167,7 +166,6 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
167166
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
168167
github.com/terraform-linters/tflint-plugin-sdk v0.10.0 h1:Cjdj0aYaqsqdoEEbBJ0SSpvhtfwKVuOZQLgV72xcH2s=
169168
github.com/terraform-linters/tflint-plugin-sdk v0.10.0/go.mod h1:buSG6YRD4H7GzQpPerADmNBFaYOx31B8o8u9l+7SegY=
170-
github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvcciqcxEHac4CYj89xI=
171169
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
172170
github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U=
173171
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
@@ -211,8 +209,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
211209
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
212210
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
213211
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
214-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=
215-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
212+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
213+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
216214
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
217215
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
218216
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -240,16 +238,18 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
240238
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
241239
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
242240
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
243-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
244-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
245241
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
242+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
243+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
244+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
246245
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
246+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
247247
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
248248
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
249249
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
250250
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
251-
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
252-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
251+
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
252+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
253253
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
254254
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
255255
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎rules/models/aws-sdk-go

Submodule aws-sdk-go updated 494 files

‎rules/models/aws_amplify_app_invalid_access_token.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package models
44

55
import (
66
"log"
7+
"regexp"
78

89
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
910
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -17,6 +18,7 @@ type AwsAmplifyAppInvalidAccessTokenRule struct {
1718
attributeName string
1819
max int
1920
min int
21+
pattern *regexp.Regexp
2022
}
2123

2224
// NewAwsAmplifyAppInvalidAccessTokenRule returns new rule with default attributes
@@ -26,6 +28,7 @@ func NewAwsAmplifyAppInvalidAccessTokenRule() *AwsAmplifyAppInvalidAccessTokenRu
2628
attributeName: "access_token",
2729
max: 255,
2830
min: 1,
31+
pattern: regexp.MustCompile(`^(?s).+$`),
2932
}
3033
}
3134

@@ -86,6 +89,13 @@ func (r *AwsAmplifyAppInvalidAccessTokenRule) Check(runner tflint.Runner) error
8689
attribute.Expr.Range(),
8790
)
8891
}
92+
if !r.pattern.MatchString(val) {
93+
runner.EmitIssue(
94+
r,
95+
`access_token does not match valid pattern ^(?s).+$`,
96+
attribute.Expr.Range(),
97+
)
98+
}
8999
return nil
90100
})
91101
if err != nil {

‎rules/models/aws_amplify_app_invalid_basic_auth_credentials.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package models
44

55
import (
66
"log"
7+
"regexp"
78

89
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
910
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -16,6 +17,7 @@ type AwsAmplifyAppInvalidBasicAuthCredentialsRule struct {
1617
resourceType string
1718
attributeName string
1819
max int
20+
pattern *regexp.Regexp
1921
}
2022

2123
// NewAwsAmplifyAppInvalidBasicAuthCredentialsRule returns new rule with default attributes
@@ -24,6 +26,7 @@ func NewAwsAmplifyAppInvalidBasicAuthCredentialsRule() *AwsAmplifyAppInvalidBasi
2426
resourceType: "aws_amplify_app",
2527
attributeName: "basic_auth_credentials",
2628
max: 2000,
29+
pattern: regexp.MustCompile(`^(?s).*$`),
2730
}
2831
}
2932

@@ -77,6 +80,13 @@ func (r *AwsAmplifyAppInvalidBasicAuthCredentialsRule) Check(runner tflint.Runne
7780
attribute.Expr.Range(),
7881
)
7982
}
83+
if !r.pattern.MatchString(val) {
84+
runner.EmitIssue(
85+
r,
86+
`basic_auth_credentials does not match valid pattern ^(?s).*$`,
87+
attribute.Expr.Range(),
88+
)
89+
}
8090
return nil
8191
})
8292
if err != nil {

‎rules/models/aws_amplify_app_invalid_build_spec.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
package models
44

55
import (
6+
"fmt"
67
"log"
8+
"regexp"
79

810
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
911
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -17,6 +19,7 @@ type AwsAmplifyAppInvalidBuildSpecRule struct {
1719
attributeName string
1820
max int
1921
min int
22+
pattern *regexp.Regexp
2023
}
2124

2225
// NewAwsAmplifyAppInvalidBuildSpecRule returns new rule with default attributes
@@ -26,6 +29,7 @@ func NewAwsAmplifyAppInvalidBuildSpecRule() *AwsAmplifyAppInvalidBuildSpecRule {
2629
attributeName: "build_spec",
2730
max: 25000,
2831
min: 1,
32+
pattern: regexp.MustCompile(`^(?s).+$`),
2933
}
3034
}
3135

@@ -86,6 +90,13 @@ func (r *AwsAmplifyAppInvalidBuildSpecRule) Check(runner tflint.Runner) error {
8690
attribute.Expr.Range(),
8791
)
8892
}
93+
if !r.pattern.MatchString(val) {
94+
runner.EmitIssue(
95+
r,
96+
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).+$`),
97+
attribute.Expr.Range(),
98+
)
99+
}
89100
return nil
90101
})
91102
if err != nil {

‎rules/models/aws_amplify_app_invalid_description.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
package models
44

55
import (
6+
"fmt"
67
"log"
8+
"regexp"
79

810
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
911
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
@@ -16,6 +18,7 @@ type AwsAmplifyAppInvalidDescriptionRule struct {
1618
resourceType string
1719
attributeName string
1820
max int
21+
pattern *regexp.Regexp
1922
}
2023

2124
// NewAwsAmplifyAppInvalidDescriptionRule returns new rule with default attributes
@@ -24,6 +27,7 @@ func NewAwsAmplifyAppInvalidDescriptionRule() *AwsAmplifyAppInvalidDescriptionRu
2427
resourceType: "aws_amplify_app",
2528
attributeName: "description",
2629
max: 1000,
30+
pattern: regexp.MustCompile(`^(?s).*$`),
2731
}
2832
}
2933

@@ -77,6 +81,13 @@ func (r *AwsAmplifyAppInvalidDescriptionRule) Check(runner tflint.Runner) error
7781
attribute.Expr.Range(),
7882
)
7983
}
84+
if !r.pattern.MatchString(val) {
85+
runner.EmitIssue(
86+
r,
87+
fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
88+
attribute.Expr.Range(),
89+
)
90+
}
8091
return nil
8192
})
8293
if err != nil {

0 commit comments

Comments
 (0)