Small code improvments

pkg/github/options.go

@@ -104,7 +104,7 @@ func wrapReadParametersJSON(v string) (interface{}, error) {
 		return json, err
 	}
 
-	// Check if the parameters are wrapped
+	// Check if the parameters are wrapped (https://github.com/Azure/azure-sdk-for-go/issues/9283)
 	paramters, ok := json["parameters"]
 	if ok {
 		return paramters, nil

pkg/util/util.go

@@ -28,20 +28,17 @@ func ReadJSON(path string) (map[string]interface{}, error) {
 
 // MergeParameters takes the original and override parameters and merges them together
 func MergeParameters(original map[string]interface{}, override map[string]interface{}) map[string]interface{} {
-	if original == nil && override == nil {
+	switch {
+	case original == nil && override == nil:
 		return make(map[string]interface{})
-	}
-
-	if original == nil {
+	case original == nil:
 		return override
-	}
-
-	if override == nil {
+	case override == nil:
 		return original
-	}
-
-	if len(override) == 0 {
+	case len(override) == 0:
 		return original
+	default:
+		break
 	}
 
 	for key, value := range override {