Skip to content

baremetal: Validate os images exist #3363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Mar 31, 2020
Merged

baremetal: Validate os images exist #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d7da3
Improve validation test readability by using fluent builder pattern
andfasano Mar 25, 2020
ccaf134
validation: add new validation rule to verify a given url exists appl…
andfasano Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/types/baremetal/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ type Platform struct {
// for the bootstrap node. The URL must contain a sha256 hash of the image
// e.g https://mirror.example.com/images/qemu.qcow2.gz?sha256=a07bd...
// +optional
BootstrapOSImage string `json:"bootstrapOSImage,omitempty"`
BootstrapOSImage string `json:"bootstrapOSImage,omitempty" validate:"omitempty,osimageuri,urlexist"`

// ClusterOSImage is a URL to override the default OS image
// for cluster nodes. The URL must contain a sha256 hash of the image
// e.g https://mirror.example.com/images/metal.qcow2.gz?sha256=3b5a8...
// +optional
ClusterOSImage string `json:"clusterOSImage,omitempty"`
ClusterOSImage string `json:"clusterOSImage,omitempty" validate:"omitempty,osimageuri,urlexist"`
}
50 changes: 40 additions & 10 deletions pkg/types/baremetal/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package validation
import (
"fmt"
"net"
"net/http"
"net/url"
"reflect"
"strings"
Expand Down Expand Up @@ -115,6 +116,43 @@ func validateHosts(hosts []*baremetal.Host, fldPath *field.Path) field.ErrorList
return hostErrs
}

func validateOSImages(p *baremetal.Platform, fldPath *field.Path) field.ErrorList {
platformErrs := field.ErrorList{}

validate := validator.New()

customErrs := make(map[string]error)
validate.RegisterValidation("osimageuri", func(fl validator.FieldLevel) bool {
err := validateOSImageURI(fl.Field().String())
if err != nil {
customErrs[fl.FieldName()] = err
}
return err == nil
})
validate.RegisterValidation("urlexist", func(fl validator.FieldLevel) bool {
if res, err := http.Head(fl.Field().String()); err == nil {
return res.StatusCode == http.StatusOK
}
return false
})
err := validate.Struct(p)

if err != nil {
baseType := reflect.TypeOf(p).Elem().Name()
for _, err := range err.(validator.ValidationErrors) {
childName := fldPath.Child(err.Namespace()[len(baseType)+1:])
switch err.Tag() {
case "osimageuri":
platformErrs = append(platformErrs, field.Invalid(childName, err.Value(), customErrs[err.Field()].Error()))
case "urlexist":
platformErrs = append(platformErrs, field.NotFound(childName, err.Value()))
}
}
}

return platformErrs
}

// ValidatePlatform checks that the specified platform is valid.
func ValidatePlatform(p *baremetal.Platform, n *types.Networking, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{}
Expand Down Expand Up @@ -199,16 +237,8 @@ func ValidatePlatform(p *baremetal.Platform, n *types.Networking, fldPath *field
if err := validateIPNotinMachineCIDR(p.BootstrapProvisioningIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("bootstrapHostIP"), p.BootstrapProvisioningIP, err.Error()))
}
if p.BootstrapOSImage != "" {
if err := validateOSImageURI(p.BootstrapOSImage); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("bootstrapOSImage"), p.BootstrapOSImage, err.Error()))
}
}
if p.ClusterOSImage != "" {
if err := validateOSImageURI(p.ClusterOSImage); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("clusterOSImage"), p.ClusterOSImage, err.Error()))
}
}

allErrs = append(allErrs, validateOSImages(p, fldPath)...)

allErrs = append(allErrs, validateHosts(p.Hosts, fldPath)...)

Expand Down
Loading