@@ -747,31 +747,23 @@ func IsMachineManifest(file *asset.File) bool {
747747 } else if matched {
748748 return true
749749 }
750- if matched , err := filepath .Match (secretFileNamePattern , filename ); err != nil {
751- panic ("bad format for secret file name pattern" )
752- } else if matched {
753- return true
754- }
755- if matched , err := filepath .Match (networkConfigSecretFileNamePattern , filename ); err != nil {
756- panic ("bad format for network config secret file name pattern" )
757- } else if matched {
758- return true
759- }
760- if matched , err := filepath .Match (hostFileNamePattern , filename ); err != nil {
761- panic ("bad format for host file name pattern" )
762- } else if matched {
763- return true
764- }
765- if matched , err := filepath .Match (masterMachineFileNamePattern , filename ); err != nil {
766- panic ("bad format for master machine file name pattern" )
767- } else if matched {
768- return true
769- }
770- if matched , err := filepath .Match (workerMachineSetFileNamePattern , filename ); err != nil {
771- panic ("bad format for worker machine file name pattern" )
772- } else {
773- return matched
774- }
750+ for _ , pattern := range []struct {
751+ Pattern string
752+ Type string
753+ }{
754+ {Pattern : secretFileNamePattern , Type : "secret" },
755+ {Pattern : networkConfigSecretFileNamePattern , Type : "network config secret" },
756+ {Pattern : hostFileNamePattern , Type : "host" },
757+ {Pattern : masterMachineFileNamePattern , Type : "master machine" },
758+ {Pattern : workerMachineSetFileNamePattern , Type : "worker machineset" },
759+ } {
760+ if matched , err := filepath .Match (pattern .Pattern , filename ); err != nil {
761+ panic (fmt .Sprintf ("bad format for %s file name pattern" , pattern .Type ))
762+ } else if matched {
763+ return true
764+ }
765+ }
766+ return false
775767}
776768
777769func createSecretAssetFiles (resources []corev1.Secret , fileName string ) ([]* asset.File , error ) {
0 commit comments