-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed utils and put in the right folder, updated the civogo lib to the last version Close #39
- Loading branch information
1 parent
34d310f
commit 4e43800
Showing
15 changed files
with
109 additions
and
53 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
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 was deleted.
Oops, something went wrong.
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,77 @@ | ||
| package utils | ||
|
|
||
| // ValidateNameSize is a functo check the size of a name | ||
| // func ValidateNameSize | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/civo/civogo" | ||
| ) | ||
|
|
||
| func ValidateName(v interface{}, k string) (ws []string, es []error) { | ||
| var errs []error | ||
| var warns []string | ||
| value, ok := v.(string) | ||
| if !ok { | ||
| errs = append(errs, fmt.Errorf("expected name to be string")) | ||
| return warns, errs | ||
| } | ||
| whiteSpace := regexp.MustCompile(`\s+`) | ||
| if whiteSpace.Match([]byte(value)) { | ||
| errs = append(errs, fmt.Errorf("name cannot contain whitespace. Got %s", value)) | ||
| return warns, errs | ||
| } | ||
| return warns, errs | ||
| } | ||
|
|
||
| func ValidateNameSize(v interface{}, k string) (ws []string, es []error) { | ||
| var errs []error | ||
| var warns []string | ||
| value, ok := v.(string) | ||
| if !ok { | ||
| errs = append(errs, fmt.Errorf("expected name to be string")) | ||
| return warns, errs | ||
| } | ||
| whiteSpace := regexp.MustCompile(`\s+`) | ||
| if whiteSpace.Match([]byte(value)) { | ||
| errs = append(errs, fmt.Errorf("name cannot contain whitespace. Got %s", value)) | ||
| return warns, errs | ||
| } | ||
|
|
||
| if len(value) > 36 { | ||
| errs = append(errs, fmt.Errorf("the len of the name has to be less than 36. Got %d", len(value))) | ||
| return warns, errs | ||
| } | ||
|
|
||
| return warns, errs | ||
| } | ||
|
|
||
| // util function to help the import function | ||
| func ResourceCommonParseID(id string) (string, string, error) { | ||
| parts := strings.SplitN(id, ":", 2) | ||
|
|
||
| if len(parts) != 2 || parts[0] == "" || parts[1] == "" { | ||
| return "", "", fmt.Errorf("unexpected format of ID (%s), expected attribute1:attribute2", id) | ||
| } | ||
|
|
||
| return parts[0], parts[1], nil | ||
| } | ||
|
|
||
| // CheckAPPName is a function to check if the app name is valid | ||
| func CheckAPPName(appName string, client *civogo.Client) bool { | ||
| allAPP, err := client.ListKubernetesMarketplaceApplications() | ||
| if err != nil { | ||
| return false | ||
| } | ||
|
|
||
| for _, v := range allAPP { | ||
| if strings.Contains(appName, v.Name) { | ||
| return true | ||
| } | ||
| } | ||
|
|
||
| return false | ||
| } |