fix tag validation

Author: MartinWeindel

pkg/vsphere/apis/provider_spec.go

@@ -35,6 +35,13 @@ const (
 type VsphereProviderSpec struct {
 	V1 *VsphereProviderSpec1 `json:"v1,omitempty"`
 	V2 *VsphereProviderSpec2 `json:"v2,omitempty"`
+
+	// SSHKeys is an optional array of ssh public keys to deploy to VM (may already be included in UserData)
+	// +optional
+	SSHKeys []string `json:"sshKeys,omitempty"`
+	// Tags to be placed on the VM
+	// +optional
+	Tags map[string]string `json:"tags,omitempty"`
 }
 
 // VsphereProviderSpec1 contains the fields of
@@ -101,13 +108,6 @@ type VsphereProviderSpec1 struct {
 	// Customization is an experimental option to add a CustomizationSpec
 	// +optional
 	Customization string `json:"customization,omitempty"`
-
-	// SSHKeys is an optional array of ssh public keys to deploy to VM (may already be included in UserData)
-	// +optional
-	SSHKeys []string `json:"sshKeys,omitempty"`
-	// Tags to be placed on the VM
-	// +optional
-	Tags map[string]string `json:"tags,omitempty"`
 }
 
 // SpecVersion returns spec version
@@ -154,13 +154,6 @@ type VsphereProviderSpec2 struct {
 	// e.g. sched.swap.vmxSwapEnabled=false to disable the VMX process swap file
 	// +optional
 	//ExtraConfig map[string]string `json:"extraConfig,omitempty"`
-
-	// SSHKeys is an optional array of ssh public keys to deploy to VM (may already be included in UserData)
-	// +optional
-	SSHKeys []string `json:"sshKeys,omitempty"`
-	// Tags to be placed on the VM
-	// +optional
-	Tags map[string]string `json:"tags,omitempty"`
 }
 
 // SpecVersion returns spec version

pkg/vsphere/apis/validation/validation.go

@@ -26,19 +26,20 @@ import (
 )
 
 // ValidateVsphereProviderSpec1 validates Vsphere provider spec
-func ValidateVsphereProviderSpec1(spec *api.VsphereProviderSpec1, secrets *corev1.Secret) []error {
+func ValidateVsphereProviderSpec1(spec *api.VsphereProviderSpec, secrets *corev1.Secret) []error {
 	var allErrs []error
 
-	if "" == spec.Datastore && "" == spec.DatastoreCluster {
+	v1 := spec.V1
+	if "" == v1.Datastore && "" == v1.DatastoreCluster {
 		allErrs = append(allErrs, fmt.Errorf("either datastoreCluster or datastore field is required"))
 	}
-	if "" == spec.TemplateVM {
+	if "" == v1.TemplateVM {
 		allErrs = append(allErrs, fmt.Errorf("templateVM is a required field"))
 	}
-	if "" == spec.ComputeCluster && "" == spec.ResourcePool && "" == spec.HostSystem {
+	if "" == v1.ComputeCluster && "" == v1.ResourcePool && "" == v1.HostSystem {
 		allErrs = append(allErrs, fmt.Errorf("either computeCluster or resourcePool or hostSystem field is required"))
 	}
-	if "" == spec.Network {
+	if "" == v1.Network {
 		allErrs = append(allErrs, fmt.Errorf("network is a required field"))
 	}
 
@@ -78,22 +79,23 @@ func validateSecrets(secret *corev1.Secret) []error {
 }
 
 // ValidateVsphereProviderSpec2 validates Vsphere provider spec2
-func ValidateVsphereProviderSpec2(spec *api.VsphereProviderSpec2, secrets *corev1.Secret) []error {
+func ValidateVsphereProviderSpec2(spec *api.VsphereProviderSpec, secrets *corev1.Secret) []error {
 	var allErrs []error
 
-	if "" == spec.Namespace {
+	v2 := spec.V2
+	if "" == v2.Namespace {
 		allErrs = append(allErrs, fmt.Errorf("namespace is a required field"))
 	}
-	if "" == spec.ImageName {
+	if "" == v2.ImageName {
 		allErrs = append(allErrs, fmt.Errorf("imageName is a required field"))
 	}
-	if "" == spec.NetworkType {
+	if "" == v2.NetworkType {
 		allErrs = append(allErrs, fmt.Errorf("networkType is a required field"))
 	}
-	if "" == spec.NetworkName {
+	if "" == v2.NetworkName {
 		allErrs = append(allErrs, fmt.Errorf("networkName is a required field"))
 	}
-	if "" == spec.ClassName {
+	if "" == v2.ClassName {
 		allErrs = append(allErrs, fmt.Errorf("className is a required field"))
 	}
 

pkg/vsphere/machine_server_util.go

@@ -43,33 +43,33 @@ func decodeProviderSpecAndSecret(machineClass *v1alpha1.MachineClass, secret *co
 	}
 
 	if providerSpec.V1 != nil {
-		err := validateSpec1(providerSpec.V1, secret)
+		err := validateSpecV1(providerSpec, secret)
 		return providerSpec, err
 	}
 
 	if providerSpec.V2 != nil {
-		err := validateSpec2(providerSpec.V2, secret)
+		err := validateSpecV2(providerSpec, secret)
 		return providerSpec, err
 	}
 
 	return nil, fmt.Errorf("invalid providerSpec")
 }
 
-// validateSpec1 validates api.VsphereProviderSpec1
-func validateSpec1(spec1 *api.VsphereProviderSpec1, secret *corev1.Secret) error {
+// validateSpecV1 validates api.VsphereProviderSpec1
+func validateSpecV1(spec *api.VsphereProviderSpec, secret *corev1.Secret) error {
 	//Validate the Spec and Secrets
-	ValidationErr := validation.ValidateVsphereProviderSpec1(spec1, secret)
+	ValidationErr := validation.ValidateVsphereProviderSpec1(spec, secret)
 	if ValidationErr != nil {
 		err := fmt.Errorf("Error while validating ProviderSpec V1 %v", ValidationErr)
 		return status.Error(codes.Internal, err.Error())
 	}
 	return nil
 }
 
-// validateSpec2 validates api.VsphereProviderSpec2
-func validateSpec2(spec2 *api.VsphereProviderSpec2, secret *corev1.Secret) error {
+// validateSpecV2 validates api.VsphereProviderSpec2
+func validateSpecV2(spec *api.VsphereProviderSpec, secret *corev1.Secret) error {
 	//Validate the Spec and Secrets
-	ValidationErr := validation.ValidateVsphereProviderSpec2(spec2, secret)
+	ValidationErr := validation.ValidateVsphereProviderSpec2(spec, secret)
 	if ValidationErr != nil {
 		err := fmt.Errorf("Error while validating ProviderSpec V2 %v", ValidationErr)
 		return status.Error(codes.Internal, err.Error())