-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4431 from TimeIncOSS/f-aws-validators
provider/aws: Add validation for ECR repository name
- Loading branch information
Showing
8 changed files
with
181 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
| "time" | ||
| ) | ||
|
|
||
| func validateRdsId(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "only lowercase alphanumeric characters and hyphens allowed in %q", k)) | ||
| } | ||
| if !regexp.MustCompile(`^[a-z]`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "first character of %q must be a letter", k)) | ||
| } | ||
| if regexp.MustCompile(`--`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot contain two consecutive hyphens", k)) | ||
| } | ||
| if regexp.MustCompile(`-$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot end with a hyphen", k)) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func validateASGScheduleTimestamp(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| _, err := time.Parse(awsAutoscalingScheduleTimeLayout, value) | ||
| if err != nil { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot be parsed as iso8601 Timestamp Format", value)) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // validateTagFilters confirms the "value" component of a tag filter is one of | ||
| // AWS's three allowed types. | ||
| func validateTagFilters(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| if value != "KEY_ONLY" && value != "VALUE_ONLY" && value != "KEY_AND_VALUE" { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q must be one of \"KEY_ONLY\", \"VALUE_ONLY\", or \"KEY_AND_VALUE\"", k)) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func validateDbParamGroupName(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "only lowercase alphanumeric characters and hyphens allowed in %q", k)) | ||
| } | ||
| if !regexp.MustCompile(`^[a-z]`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "first character of %q must be a letter", k)) | ||
| } | ||
| if regexp.MustCompile(`--`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot contain two consecutive hyphens", k)) | ||
| } | ||
| if regexp.MustCompile(`-$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot end with a hyphen", k)) | ||
| } | ||
| if len(value) > 255 { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot be greater than 255 characters", k)) | ||
| } | ||
| return | ||
|
|
||
| } | ||
|
|
||
| func validateStreamViewType(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| viewTypes := map[string]bool{ | ||
| "KEYS_ONLY": true, | ||
| "NEW_IMAGE": true, | ||
| "OLD_IMAGE": true, | ||
| "NEW_AND_OLD_IMAGES": true, | ||
| } | ||
|
|
||
| if !viewTypes[value] { | ||
| errors = append(errors, fmt.Errorf("%q be a valid DynamoDB StreamViewType", k)) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func validateElbName(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| if !regexp.MustCompile(`^[0-9A-Za-z-]+$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "only alphanumeric characters and hyphens allowed in %q: %q", | ||
| k, value)) | ||
| } | ||
| if len(value) > 32 { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot be longer than 32 characters: %q", k, value)) | ||
| } | ||
| if regexp.MustCompile(`^-`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot begin with a hyphen: %q", k, value)) | ||
| } | ||
| if regexp.MustCompile(`-$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot end with a hyphen: %q", k, value)) | ||
| } | ||
| return | ||
|
|
||
| } | ||
|
|
||
| func validateEcrRepositoryName(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| if len(value) < 2 { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q must be at least 2 characters long: %q", k, value)) | ||
| } | ||
| if len(value) > 256 { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q cannot be longer than 256 characters: %q", k, value)) | ||
| } | ||
|
|
||
| // http://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_CreateRepository.html | ||
| pattern := `^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$` | ||
| if !regexp.MustCompile(pattern).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf( | ||
| "%q doesn't comply with restrictions (%q): %q", | ||
| k, pattern, value)) | ||
| } | ||
|
|
||
| return | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestValidateEcrRepositoryName(t *testing.T) { | ||
| validNames := []string{ | ||
| "nginx-web-app", | ||
| "project-a/nginx-web-app", | ||
| "domain.ltd/nginx-web-app", | ||
| "3chosome-thing.com/01different-pattern", | ||
| "0123456789/999999999", | ||
| "double/forward/slash", | ||
| "000000000000000", | ||
| } | ||
| for _, v := range validNames { | ||
| _, errors := validateEcrRepositoryName(v, "name") | ||
| if len(errors) != 0 { | ||
| t.Fatalf("%q should be a valid ECR repository name: %q", v, errors) | ||
| } | ||
| } | ||
|
|
||
| invalidNames := []string{ | ||
| // length > 256 | ||
| "3cho_some-thing.com/01different.-_pattern01different.-_pattern01diff" + | ||
| "erent.-_pattern01different.-_pattern01different.-_pattern01different" + | ||
| ".-_pattern01different.-_pattern01different.-_pattern01different.-_pa" + | ||
| "ttern01different.-_pattern01different.-_pattern234567", | ||
| // length < 2 | ||
| "i", | ||
| "special@character", | ||
| "different+special=character", | ||
| "double//slash", | ||
| "double..dot", | ||
| "/slash-at-the-beginning", | ||
| "slash-at-the-end/", | ||
| } | ||
| for _, v := range invalidNames { | ||
| _, errors := validateEcrRepositoryName(v, "name") | ||
| if len(errors) == 0 { | ||
| t.Fatalf("%q should be an invalid ECR repository name", v) | ||
| } | ||
| } | ||
| } |