From 011911022da3b4f63d6ca79b1d8b1f96e04bb264 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 27 May 2019 20:22:37 -0400 Subject: [PATCH] Fix for build failure - viper now uses ConfigFileNotFoundError Change-Id: I51c4fe26239c4a7bf750e0a6a66b452d9138832f --- test/e2e/framework/viperconfig/viperconfig.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/viperconfig/viperconfig.go b/test/e2e/framework/viperconfig/viperconfig.go index 9a318acb1c4..0006e9bb70f 100644 --- a/test/e2e/framework/viperconfig/viperconfig.go +++ b/test/e2e/framework/viperconfig/viperconfig.go @@ -78,10 +78,16 @@ func ViperizeFlags(requiredConfig, optionalConfig string) error { // "file not found". Unfortunately error // messages are sometimes hard to understand, // so try to help the user a bit. - switch err.Error() { - case viperFileNotFound: + switch err.(type) { + case viper.ConfigFileNotFoundError: if required { - return wrapError(errors.New("not found or not using a supported file format")) + return wrapError(errors.New("not found")) + } + // Proceed without config. + return nil + case viper.UnsupportedConfigError: + if required { + return wrapError(errors.New("not using a supported file format")) } // Proceed without config. return nil