Added error checks for getters

k8snetworkplumbingwg · Jul 26, 2021 · a57ff7b · a57ff7b
1 parent 4787f63
commit a57ff7b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/cmd/sriovdp/main.go b/cmd/sriovdp/main.go
@@ -64,7 +64,12 @@ func main() {
 	}
 
 	config.NewConfig()
-	cfg := config.GetConfig()
+
+	cfg, err := config.GetConfig()
+	if err != nil {
+		glog.Fatalf("error while getting config: %v", err)
+		return
+	}
 
 	// Read global config
 	if err := cfg.ReadConfig(cp.configFile); err != nil {
@@ -73,7 +78,12 @@ func main() {
 	}
 
 	features.NewFeatureGate()
-	fg := features.GetFeatureGate()
+
+	fg, err := features.GetFeatureGate()
+	if err != nil {
+		glog.Fatalf("error while getting feature gate: %v", err)
+		return
+	}
 
 	// Set FeatureGates with ConfigMap
 	if err := fg.SetFromMap(cfg.FeatureGates); err != nil {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -21,8 +21,12 @@ func NewConfig() {
 }
 
 // GetConfig returns config
-func GetConfig() *Config {
-	return cfg
+func GetConfig() (*Config, error) {
+	var err error
+	if cfg == nil {
+		err = fmt.Errorf("config was not initialized")
+	}
+	return cfg, err
 }
 
 func newConfig() *Config {

diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -63,8 +63,12 @@ func NewFeatureGate() {
 }
 
 // GetFeatureGate returns current feature gate
-func GetFeatureGate() *FeatureGate {
-	return fg
+func GetFeatureGate() (*FeatureGate, error) {
+	var err error
+	if fg == nil {
+		err = fmt.Errorf("feature gate object was not initialized")
+	}
+	return fg, err
 }
 
 func newFeatureGate() *FeatureGate {