Configuration fixes

Author: Jacek Ciwiś

Taskfile.yml

@@ -1,7 +1,7 @@
 version: '2'
 
 vars:
-  VERSION: 0.4.0
+  VERSION: 0.5.0
   GIT_COMMIT:
     sh: git log -n 1 --format=%h
   GIT_AUTHOR:

config.go

@@ -22,7 +22,7 @@ type globalConfigType struct {
 	logFormat               string
 	logOutput               string
 	jiraMigrationSuccessTag string
-	jiraMigrationFailTag    string
+	jiraMigrationFailedTag  string
 	jiraMigrationSkipTag    string
 }
 
@@ -43,10 +43,9 @@ func checkTogglToken() bool {
 	viper.Set(fmt.Sprintf("%v", "default_client.stachursky_mode"), "FILL_IT")
 	viper.Set(fmt.Sprintf("%v", "log_format"), "text")
 	viper.Set(fmt.Sprintf("%v", "log_output"), "stdout")
-	viper.Set(fmt.Sprintf("%v", "logged_tag"), "logged")
-	viper.Set(fmt.Sprintf("%v", "jiraMigrationSuccess"), "logged")
-	viper.Set(fmt.Sprintf("%v", "jiraMigrationFail"), "jira-migration-failed")
-	viper.Set(fmt.Sprintf("%v", "jiraMigrationSkip"), "jira-migration-skip")
+	viper.Set(fmt.Sprintf("%v", "jira_migration_success_tag"), "logged")
+	viper.Set(fmt.Sprintf("%v", "jira_migration_failed_tag"), "jira-migration-failed")
+	viper.Set(fmt.Sprintf("%v", "jira_migration_skip_tag"), "jira-migration-skip")
 	viper.Set(fmt.Sprintf("%v", "period"), 1)
 
 	err := viper.WriteConfig()
@@ -88,22 +87,14 @@ func generateClientConfigTemplate(configPath string) {
 func parseGlobalConfig() globalConfigType {
 	clientDefaultConfigPath := "default_client"
 
-	clientDefaultConfig := clientConfig{
-		jiraUsername:   getString("jira_username", clientDefaultConfigPath, globalConfig.defaultClient.jiraUsername),
-		jiraPassword:   getString("jira_password", clientDefaultConfigPath, globalConfig.defaultClient.jiraPassword),
-		jiraClientUser: getString("jira_client_user", clientDefaultConfigPath, globalConfig.defaultClient.jiraClientUser),
-		jiraHost:       getString("jira_host", clientDefaultConfigPath, globalConfig.defaultClient.jiraHost),
-		stachurskyMode: getInt("stachursky_mode", clientDefaultConfigPath, globalConfig.defaultClient.stachurskyMode),
-	}
-
 	globalConfig := globalConfigType{
-		defaultClient:           clientDefaultConfig,
+		defaultClient:           parseClientConfig(clientDefaultConfigPath, globalConfig),
 		period:                  viper.GetInt("period"),
 		logFormat:               viper.GetString("log_format"),
 		logOutput:               viper.GetString("log_output"),
-		jiraMigrationSuccessTag: viper.GetString("logged_tag"),
-		jiraMigrationFailTag:    viper.GetString("jira-migration-failed"),
-		jiraMigrationSkipTag:    viper.GetString("jira-migration-skip"),
+		jiraMigrationSuccessTag: viper.GetString("jira_migration_success_tag"),
+		jiraMigrationFailedTag:  viper.GetString("jira_migration_failed_tag"),
+		jiraMigrationSkipTag:    viper.GetString("jira_migration_skip_tag"),
 	}
 
 	return globalConfig

go.sum

@@ -15,6 +15,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
@@ -78,6 +79,7 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
@@ -108,6 +110,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
 github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=

main.go

@@ -186,11 +186,11 @@ func main() {
 					"response":      jr,
 				}).Error(err)
 
-				timeEntry.Tags = append(timeEntry.Tags, globalConfig.jiraMigrationFailTag)
-				log.Info(fmt.Sprintf("Add %v tag", globalConfig.jiraMigrationFailTag))
+				timeEntry.Tags = append(timeEntry.Tags, globalConfig.jiraMigrationFailedTag)
+				log.Info(fmt.Sprintf("Add %v tag", globalConfig.jiraMigrationFailedTag))
 			} else {
 				log.Info(fmt.Sprintf("Jira workload added"))
-				timeEntry.Tags = removeTag(timeEntry.Tags, globalConfig.jiraMigrationFailTag)
+				timeEntry.Tags = removeTag(timeEntry.Tags, globalConfig.jiraMigrationFailedTag)
 				timeEntry.Tags = append(timeEntry.Tags, globalConfig.jiraMigrationSuccessTag)
 				log.Info(fmt.Sprintf("Add %v tag", globalConfig.jiraMigrationSuccessTag))
 			}