Skip to content

Commit dd0a070

Browse files
YakDriverYakDriver
authored
Merge pull request #33405 from hashicorp/b-lightsail-fix-name-validation
lightsail: Fix regex name validation
2 parents 599628a + 20d6bea commit dd0a070

File tree

11 files changed

+50
-11
lines changed

11 files changed

+50
-11
lines changed

‎.changelog/33405.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
```release-note:bug
2+
resource/aws_lightsail_certificate: Fix validation of `name`
3+
```
4+
5+
```release-note:bug
6+
resource/aws_lightsail_database: Fix validation of `name`
7+
```
8+
9+
```release-note:bug
10+
resource/aws_lightsail_disk: Fix validation of `name`
11+
```
12+
13+
```release-note:bug
14+
resource/aws_lightsail_instance: Fix validation of `name`
15+
```
16+
17+
```release-note:bug
18+
resource/aws_lightsail_lb: Fix validation of `lb_name`
19+
```
20+
21+
```release-note:bug
22+
resource/aws_lightsail_lb_attachment: Fix validation of `lb_name`
23+
```
24+
25+
```release-note:bug
26+
resource/aws_lightsail_lb_certificate: Fix validation of `lb_name`
27+
```
28+
29+
```release-note:bug
30+
resource/aws_lightsail_lb_certificate_attachment: Fix validation of `lb_name`
31+
```
32+
33+
```release-note:bug
34+
resource/aws_lightsail_lb_https_redirection_policy: Fix validation of `lb_name`
35+
```
36+
37+
```release-note:bug
38+
resource/aws_lightsail_lb_stickiness_policy: Fix validation of `lb_name`
39+
```

‎internal/service/lightsail/certificate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func ResourceCertificate() *schema.Resource {
9090
ValidateFunc: validation.All(
9191
validation.StringLenBetween(2, 255),
9292
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
93-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
93+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
9494
),
9595
},
9696
"subject_alternative_names": {

‎internal/service/lightsail/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func ResourceDatabase() *schema.Resource {
165165
ForceNew: true,
166166
ValidateFunc: validation.All(
167167
validation.StringLenBetween(2, 255),
168-
validation.StringMatch(regexache.MustCompile(`^[_.^-]+[0-9A-Za-z-]+[_.^-]$`), "Must contain from 2 to 255 alphanumeric characters, or hyphens. The first and last character must be a letter or number"),
168+
validation.StringMatch(regexache.MustCompile(`^[^_.-]+[0-9A-Za-z-]+[^_.-]$`), "Must contain from 2 to 255 alphanumeric characters, or hyphens. The first and last character must be a letter or number"),
169169
),
170170
},
171171
"secondary_availability_zone": {

‎internal/service/lightsail/disk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func ResourceDisk() *schema.Resource {
5757
ValidateFunc: validation.All(
5858
validation.StringLenBetween(2, 255),
5959
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
60-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
60+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
6161
),
6262
},
6363
"size_in_gb": {

‎internal/service/lightsail/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func ResourceInstance() *schema.Resource {
7171
ValidateFunc: validation.All(
7272
validation.StringLenBetween(2, 255),
7373
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z]`), "must begin with an alphanumeric character"),
74-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
74+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
7575
),
7676
},
7777
"availability_zone": {

‎internal/service/lightsail/lb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func ResourceLoadBalancer() *schema.Resource {
8585
ValidateFunc: validation.All(
8686
validation.StringLenBetween(2, 255),
8787
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
88-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
88+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
8989
),
9090
},
9191
"support_code": {

‎internal/service/lightsail/lb_attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func ResourceLoadBalancerAttachment() *schema.Resource {
4141
ValidateFunc: validation.All(
4242
validation.StringLenBetween(2, 255),
4343
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
44-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
44+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
4545
),
4646
},
4747
"instance_name": {

‎internal/service/lightsail/lb_certificate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func ResourceLoadBalancerCertificate() *schema.Resource {
8787
ValidateFunc: validation.All(
8888
validation.StringLenBetween(2, 255),
8989
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
90-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
90+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
9191
),
9292
},
9393
"name": {
@@ -97,7 +97,7 @@ func ResourceLoadBalancerCertificate() *schema.Resource {
9797
ValidateFunc: validation.All(
9898
validation.StringLenBetween(2, 255),
9999
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
100-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
100+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
101101
),
102102
},
103103
"subject_alternative_names": {

‎internal/service/lightsail/lb_certificate_attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func ResourceLoadBalancerCertificateAttachment() *schema.Resource {
4242
ValidateFunc: validation.All(
4343
validation.StringLenBetween(2, 255),
4444
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
45-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
45+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
4646
),
4747
},
4848
"certificate_name": {

‎internal/service/lightsail/lb_https_redirection_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func ResourceLoadBalancerHTTPSRedirectionPolicy() *schema.Resource {
4545
ValidateFunc: validation.All(
4646
validation.StringLenBetween(2, 255),
4747
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
48-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
48+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
4949
),
5050
},
5151
},

‎internal/service/lightsail/lb_stickiness_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func ResourceLoadBalancerStickinessPolicy() *schema.Resource {
5050
ValidateFunc: validation.All(
5151
validation.StringLenBetween(2, 255),
5252
validation.StringMatch(regexache.MustCompile(`^[A-Za-z]`), "must begin with an alphabetic character"),
53-
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[_.^-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
53+
validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z_.-]+[^_.-]$`), "must contain only alphanumeric characters, underscores, hyphens, and dots"),
5454
),
5555
},
5656
},

0 commit comments

Comments
 (0)