correct var name; refactor boolean expressions

kubermatic-labs · Nov 5, 2020 · 0972782 · 0972782
1 parent 122c391
commit 0972782
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/main.go b/main.go
@@ -37,11 +37,11 @@ func main() {
 		impersonatedUserEmail = ""
 		throttleRequests      = 500 * time.Millisecond
 
-		splittedConfig = false
-		userCfg        *config.Config
-		groupCfg       *config.Config
-		orgunitsCfg    *config.Config
-		err            error
+		splitConfig = false
+		userCfg     *config.Config
+		groupCfg    *config.Config
+		orgunitsCfg *config.Config
+		err         error
 	)
 
 	flag.StringVar(&configFile, "config", configFile, "path to the config.yaml that manages whole organization; cannot be used together with separated config files for users/groups/organizational units")
@@ -63,22 +63,21 @@ func main() {
 		return
 	}
 
-	if usersConfigFile != "" || groupsConfigFile != "" || orgunitsConfigFile != "" {
-		splittedConfig = true
-	}
-	if splittedConfig == true && configFile != "" {
+	splitConfig = usersConfigFile != "" || groupsConfigFile != "" || orgunitsConfigFile != ""
+
+	if splitConfig == true && configFile != "" {
 		log.Print("⚠ General configuration file specified (-config); cannot manage resources in separated files as well (-users-config/-groups-config/-orgunits-config).\n\n")
 		flag.Usage()
 		os.Exit(1)
-	} else if splittedConfig == false && configFile == "" {
+	} else if splitConfig == false && configFile == "" {
 		// general config file must be present if no splitted ones are specified
 		configFile = os.Getenv("GMAN_CONFIG_FILE")
 		if configFile == "" {
 			log.Print("⚠ No configuration file(s) specified.\n\n")
 			flag.Usage()
 			os.Exit(1)
 		}
-	} else if splittedConfig == false && configFile != "" {
+	} else if splitConfig == false && configFile != "" {
 		// open one config file
 		cfg, err := config.LoadFromFile(configFile)
 		if err != nil {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -108,11 +108,7 @@ func SaveToFile(config *Config, filename string) error {
 
 // validateEmailFormat is a helper function that checks for existance of '@' and the length of the address
 func validateEmailFormat(email string) bool {
-	if (strings.Contains(email, "@")) && len(email) < 129 {
-		return true
-	} else {
-		return false
-	}
+	return (len(email) < 129 && strings.Contains(email, "@"))
 }
 
 func (c *Config) ValidateUsers() []error {

diff --git a/pkg/export/export.go b/pkg/export/export.go
@@ -11,7 +11,6 @@ import (
 )
 
 func ExportUsers(ctx context.Context, clientService *admin.Service, licensingService *glib.LicensingService, cfg *config.Config) error {
-	//log.Println("⇄ Exporting users from GSuite...")
 	// get the users array
 	users, err := glib.GetListOfUsers(*clientService)
 	if err != nil {
@@ -37,7 +36,6 @@ func ExportUsers(ctx context.Context, clientService *admin.Service, licensingSer
 }
 
 func ExportGroups(ctx context.Context, clientService *admin.Service, groupService *groupssettings.Service, cfg *config.Config) error {
-	//log.Println("⇄ Exporting groups from GSuite...")
 	// get the groups array
 	groups, err := glib.GetListOfGroups(clientService)
 	if err != nil {
@@ -70,7 +68,6 @@ func ExportGroups(ctx context.Context, clientService *admin.Service, groupServic
 }
 
 func ExportOrgUnits(ctx context.Context, clientService *admin.Service, cfg *config.Config) error {
-	// log.Println("⇄ Exporting organizational units from GSuite...")
 	// get the users array
 	orgUnits, err := glib.GetListOfOrgUnits(clientService)
 	if err != nil {