azurerm_image - change os_disk property to a list #1443
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package validate | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/url" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/schema" | ||
| "strings" | ||
| ) | ||
|
|
||
| func UrlIsHttpOrHttps(i interface{}, k string) (_ []string, errors []error) { | ||
|
There was a problem hiding this comment. There may have been a precedent here you are following, but traditionally initialisms in Go are capitalized: https://github.com/golang/go/wiki/CodeReviewComments#initialisms
|
||
| return UrlWithScheme([]string{"http", "https"})(i, k) | ||
| } | ||
|
|
||
| func UrlWithScheme(validSchemes []string) schema.SchemaValidateFunc { | ||
|
There was a problem hiding this comment. See other comment on initialisms. |
||
| return func(i interface{}, k string) (_ []string, errors []error) { | ||
| v, ok := i.(string) | ||
| if !ok { | ||
| errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) | ||
| return | ||
| } | ||
|
|
||
| if v == "" { | ||
| errors = append(errors, fmt.Errorf("expected %q url to not be empty", k)) | ||
| return | ||
| } | ||
|
|
||
| url, err := url.Parse(v) | ||
| if err != nil { | ||
| errors = append(errors, fmt.Errorf("%q url is in an invalid format: %q (%+v)", k, v, err)) | ||
| return | ||
| } | ||
|
|
||
| if url.Host == "" { | ||
| errors = append(errors, fmt.Errorf("%q url has no host: %q", k, v)) | ||
| return | ||
| } | ||
|
|
||
| for _, s := range validSchemes { | ||
| if url.Scheme == s { | ||
| return //last check so just return | ||
| } | ||
| } | ||
|
|
||
| errors = append(errors, fmt.Errorf("expected %q url %q to have a schema of: %q", k, v, strings.Join(validSchemes, ","))) | ||
| 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 validate | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestHelper_Validate_UrlIsHttpOrHttps(t *testing.T) { | ||
|
There was a problem hiding this comment. I would just call this |
||
| cases := []struct { | ||
| Url string | ||
| Errors int | ||
| }{ | ||
| { | ||
| Url: "", | ||
| Errors: 1, | ||
| }, | ||
| { | ||
| Url: "this is not a url", | ||
| Errors: 1, | ||
| }, | ||
| { | ||
| Url: "www.example.com", | ||
| Errors: 1, | ||
| }, | ||
| { | ||
| Url: "ftp://www.example.com", | ||
| Errors: 1, | ||
| }, | ||
| { | ||
| Url: "http://www.example.com", | ||
| Errors: 0, | ||
| }, | ||
| { | ||
| Url: "https://www.example.com", | ||
| Errors: 0, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range cases { | ||
| _, errors := UrlIsHttpOrHttps(tc.Url, "test") | ||
|
There was a problem hiding this comment. these cases should be inside a |
||
|
|
||
| if len(errors) != tc.Errors { | ||
| t.Fatalf("Expected UrlIsHttpOrHttps to have an error for %q", tc.Url) | ||
| } | ||
| } | ||
| } | ||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you move this up to the first group of imports?