Fix BackupBucket validation when ProviderConfig is nil (#1633)

Author: wpross

pkg/admission/validator/backupbucket.go

@@ -64,7 +64,10 @@ func (b *backupBucketValidator) validateCreate(backupBucket *core.BackupBucket)
 		providerConfigPath = field.NewPath("spec", "providerConfig")
 	)
 
-	allErrs = append(allErrs, awsvalidation.ValidateBackupBucketProviderConfigCreate(b.lenientDecoder, backupBucket.Spec.ProviderConfig, providerConfigPath)...)
+	if backupBucket.Spec.ProviderConfig != nil {
+		allErrs = append(allErrs, awsvalidation.ValidateBackupBucketProviderConfigCreate(b.lenientDecoder, backupBucket.Spec.ProviderConfig, providerConfigPath)...)
+	}
+
 	allErrs = append(allErrs, awsvalidation.ValidateBackupBucketCredentialsRef(backupBucket.Spec.CredentialsRef, credentialsRefPath)...)
 	return allErrs
 }
@@ -79,7 +82,10 @@ func (b *backupBucketValidator) validateUpdate(oldBackupBucket, backupBucket *co
 		providerConfigPath = field.NewPath("spec", "providerConfig")
 	)
 
-	allErrs = append(allErrs, awsvalidation.ValidateBackupBucketProviderConfigUpdate(b.decoder, b.lenientDecoder, oldBackupBucket.Spec.ProviderConfig, backupBucket.Spec.ProviderConfig, providerConfigPath)...)
+	if backupBucket.Spec.ProviderConfig != nil {
+		allErrs = append(allErrs, awsvalidation.ValidateBackupBucketProviderConfigUpdate(b.decoder, b.lenientDecoder, oldBackupBucket.Spec.ProviderConfig, backupBucket.Spec.ProviderConfig, providerConfigPath)...)
+	}
+
 	allErrs = append(allErrs, awsvalidation.ValidateBackupBucketCredentialsRef(backupBucket.Spec.CredentialsRef, credentialsRefPath)...)
 	return allErrs
 }

pkg/apis/aws/validation/backupbucket.go

@@ -43,12 +43,18 @@ func ValidateBackupBucketProviderConfigCreate(lenientDecoder runtime.Decoder, co
 
 // ValidateBackupBucketProviderConfigUpdate validates the BackupBucket provider config on update.
 func ValidateBackupBucketProviderConfigUpdate(decoder, lenientDecoder runtime.Decoder, oldConfig, newConfig *runtime.RawExtension, fldPath *field.Path) field.ErrorList {
-	allErrs := field.ErrorList{}
+	var (
+		allErrs               = field.ErrorList{}
+		oldBackupBucketConfig *apisaws.BackupBucketConfig
+		err                   error
+	)
 
-	oldBackupBucketConfig, err := apisawshelper.DecodeBackupBucketConfig(lenientDecoder, oldConfig)
-	if err != nil {
-		allErrs = append(allErrs, field.Invalid(fldPath, rawExtensionToString(oldConfig), fmt.Sprintf("failed to decode old provider config: %s", err.Error())))
-		return allErrs
+	if oldConfig != nil {
+		oldBackupBucketConfig, err = apisawshelper.DecodeBackupBucketConfig(lenientDecoder, oldConfig)
+		if err != nil {
+			allErrs = append(allErrs, field.Invalid(fldPath, rawExtensionToString(oldConfig), fmt.Sprintf("failed to decode old provider config: %s", err.Error())))
+			return allErrs
+		}
 	}
 
 	newBackupBucketConfig, err := apisawshelper.DecodeBackupBucketConfig(decoder, newConfig)
@@ -58,7 +64,9 @@ func ValidateBackupBucketProviderConfigUpdate(decoder, lenientDecoder runtime.De
 	}
 
 	allErrs = append(allErrs, ValidateBackupBucketConfig(newBackupBucketConfig, fldPath)...)
-	allErrs = append(allErrs, validateBackupBucketImmutabilityUpdate(oldBackupBucketConfig, newBackupBucketConfig, fldPath)...)
+	if oldConfig != nil {
+		allErrs = append(allErrs, validateBackupBucketImmutabilityUpdate(oldBackupBucketConfig, newBackupBucketConfig, fldPath)...)
+	}
 
 	return allErrs
 }