plusieurs changements

This commit is contained in:
2023-06-30 15:25:39 -04:00
parent 7d4d6cb0e7
commit 58f291d437
18 changed files with 129 additions and 66 deletions
+28 -11
View File
@@ -2,7 +2,7 @@ package config
import (
"fmt"
"kode-starter/utils"
"kode-creator/utils"
"time"
"github.com/spf13/cobra"
@@ -15,6 +15,8 @@ type Config struct {
ModifDate string
ConfigFileYmlName string
TokenEnv string
GithubTokenEnv string
GitTeaTokenEnv string
VerboseFlag bool
JsonFlag bool
VersionFlag bool
@@ -113,14 +115,24 @@ func (c *Config) SetConfigFileYmlName(value string) {
c.ConfigFileYmlName = value
}
// Getter for tokenEnv field
func (c *Config) GetTokenEnv() string {
return c.TokenEnv
// Getter for GithubTokenEnv field
func (c *Config) GetGithubTokenEnv() string {
return c.GithubTokenEnv
}
// Setter for tokenEnv field
func (c *Config) SetTokenEnv(value string) {
c.TokenEnv = value
// Setter for GithubTokenEnv field
func (c *Config) SetGithubTokenEnv(value string) {
c.GithubTokenEnv = value
}
// Getter for GithubTokenEnv field
func (c *Config) GetGitTeaTokenEnv() string {
return c.GitTeaTokenEnv
}
// Setter for GithubTokenEnv field
func (c *Config) SetGitTeaTokenEnv(value string) {
c.GitTeaTokenEnv = value
}
// Getter for verboseFlag field
@@ -443,9 +455,13 @@ func (c *Config) Init() {
var configFileYmlName string = utils.GetProgramDir() + "/config.yml"
c.SetConfigFileYmlName(configFileYmlName)
// set token from environment variable
var tokenEnv string = utils.GetGitTokenFromOsEnv()
c.SetTokenEnv(tokenEnv)
// set Github token from environment variable
var githubTokenEnv string = utils.GetEnvVarValueFromOsEnv("GITHUB_TOKEN")
c.SetGithubTokenEnv(githubTokenEnv)
// set Gitea token from environment variable
var giteaTokenEnv string = utils.GetEnvVarValueFromOsEnv("GITEA_TOKEN")
c.SetGithubTokenEnv(giteaTokenEnv)
// set verbose flag
c.SetVerboseFlag(false)
@@ -665,7 +681,8 @@ func (c *Config) printAllConfiguration() {
fmt.Println("config: Author: ", c.GetAuthor())
fmt.Println("config: ModifDate: ", c.GetModifDate())
fmt.Println("config: ConfigFileYmlName: ", c.GetConfigFileYmlName())
fmt.Println("config: TokenEnv: ", c.GetTokenEnv())
fmt.Println("config: GithubTokenEnv: ", c.GetGithubTokenEnv())
fmt.Println("config: GiteaTokenEnv: ", c.GetGitTeaTokenEnv())
fmt.Println("config: VerboseFlag: ", c.GetVerboseFlag())
fmt.Println("config: JsonFlag: ", c.GetJsonFlag())
fmt.Println("config: VersionFlag: ", c.GetVersionFlag())