style tweaks

plugins/common/properties.go

@@ -11,18 +11,16 @@ import (
 )
 
 // CommandPropertySet is a generic function that will set a property for a given plugin/app combination
-func CommandPropertySet(pluginName string, appName string, property string, value string, validProperties map[string]bool) {
-	err := VerifyAppName(appName)
-	if err != nil {
+func CommandPropertySet(pluginName, appName, property, value string, properties map[string]string) {
+	if err := VerifyAppName(appName); err != nil {
 		LogFail(err.Error())
 	}
-
 	if property == "" {
 		LogFail("No property specified")
 	}
 
-	if !isValidProperty(validProperties, property) {
-		properties := reflect.ValueOf(validProperties).MapKeys()
+	if _, ok := properties[property]; !ok {
+		properties := reflect.ValueOf(properties).MapKeys()
 		validPropertyList := make([]string, len(properties))
 		for i := 0; i < len(properties); i++ {
 			validPropertyList[i] = properties[i].String()
@@ -44,8 +42,7 @@ func CommandPropertySet(pluginName string, appName string, property string, valu
 func PropertyDelete(pluginName string, appName string, property string) {
 	pluginAppConfigRoot := getPluginAppPropertyPath(pluginName, appName)
 	propertyPath := strings.Join([]string{pluginAppConfigRoot, property}, "/")
-	err := os.Remove(propertyPath)
-	if err != nil {
+	if err := os.Remove(propertyPath); err != nil {
 		LogFail(fmt.Sprintf("Unable to remove %s property %s.%s", pluginName, appName, property))
 	}
 }
@@ -75,9 +72,9 @@ func PropertyGet(pluginName string, appName string, property string) string {
 }
 
 // PropertyGetDefault returns the value for a given property with a specified default value
-func PropertyGetDefault(pluginName string, appName string, property string, defaultValue string) string {
+func PropertyGetDefault(pluginName, appName, property, defaultValue string) (val string) {
 	if !PropertyExists(pluginName, appName, property) {
-		return ""
+		return
 	}
 
 	pluginAppConfigRoot := getPluginAppPropertyPath(pluginName, appName)
@@ -86,16 +83,15 @@ func PropertyGetDefault(pluginName string, appName string, property string, defa
 	b, err := ioutil.ReadFile(propertyPath)
 	if err != nil {
 		LogWarn(fmt.Sprintf("Unable to read %s property %s.%s", pluginName, appName, property))
-		return ""
+		return
 	}
-
-	return string(b)
+	val = string(b)
+	return
 }
 
 // PropertyWrite writes a value for a given application property
 func PropertyWrite(pluginName string, appName string, property string, value string) {
-	err := makePropertyPath(pluginName, appName)
-	if err != nil {
+	if err := makePropertyPath(pluginName, appName); err != nil {
 		LogFail(fmt.Sprintf("Unable to create %s config directory for %s: %s", pluginName, appName, err.Error()))
 	}
 
@@ -103,7 +99,7 @@ func PropertyWrite(pluginName string, appName string, property string, value str
 	propertyPath := strings.Join([]string{pluginAppConfigRoot, property}, "/")
 	file, err := os.Create(propertyPath)
 	if err != nil {
-		LogFail(fmt.Sprintf("Unable to write %s config value %s.%s: %s", pluginName, appName, property, err.Error))
+		LogFail(fmt.Sprintf("Unable to write %s config value %s.%s: %s", pluginName, appName, property, err.Error()))
 	}
 	defer file.Close()
 
@@ -113,20 +109,14 @@ func PropertyWrite(pluginName string, appName string, property string, value str
 }
 
 // PropertySetup creates the plugin config root
-func PropertySetup(pluginName string) error {
+func PropertySetup(pluginName string) (err error) {
 	pluginConfigRoot := getPluginConfigPath(pluginName)
-	err := os.MkdirAll(pluginConfigRoot, 0755)
-	if err != nil {
-		return err
+	if err = os.MkdirAll(pluginConfigRoot, 0755); err != nil {
+		return
 	}
 	return setPermissions(pluginConfigRoot, 0755)
 }
 
-// isValidProperty returns whether a property is a valid property or not
-func isValidProperty(validProperties map[string]bool, property string) bool {
-	return validProperties[property]
-}
-
 // getPluginAppPropertyPath returns the plugin property path for a given plugin/app combination
 func getPluginAppPropertyPath(pluginName string, appName string) string {
 	return strings.Join([]string{getPluginConfigPath(pluginName), appName}, "/")
@@ -138,44 +128,37 @@ func getPluginConfigPath(pluginName string) string {
 }
 
 // makePropertyPath ensures that a property path exists
-func makePropertyPath(pluginName string, appName string) error {
+func makePropertyPath(pluginName string, appName string) (err error) {
 	pluginAppConfigRoot := getPluginAppPropertyPath(pluginName, appName)
-	err := os.MkdirAll(pluginAppConfigRoot, 0755)
-	if err != nil {
-		return err
+	if err = os.MkdirAll(pluginAppConfigRoot, 0755); err != nil {
+		return
 	}
 	return setPermissions(pluginAppConfigRoot, 0755)
 }
 
 // setPermissions sets the proper owner and filemode for a given file
-func setPermissions(path string, fileMode os.FileMode) error {
-	err := os.Chmod(path, fileMode)
-	if err != nil {
+func setPermissions(path string, fileMode os.FileMode) (err error) {
+	if err = os.Chmod(path, fileMode); err != nil {
 		return err
 	}
 
 	group, err := user.LookupGroup("dokku")
 	if err != nil {
-		return err
+		return
 	}
 	user, err := user.Lookup("dokku")
 	if err != nil {
-		return err
+		return
 	}
 
 	uid, err := strconv.Atoi(user.Uid)
 	if err != nil {
-		return err
+		return
 	}
 
 	gid, err := strconv.Atoi(group.Gid)
 	if err != nil {
-		return err
+		return
 	}
-
-	err = os.Chown(path, uid, gid)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.Chown(path, uid, gid)
 }