fix oop approach and tests

internal/config/global_config.go

@@ -15,7 +15,7 @@ import (
 
 var GetCredentialsPath = getCredentialsPath
 
-type ProjectCredentials map[string]*ProjectCredential
+type ProjectCredentials map[string]ProjectCredential
 
 type ProjectCredential struct {
 	ProjectName            string `yaml:"-"`
@@ -35,21 +35,26 @@ type CircleCiResourceConfig struct {
 	ApiKey string `yaml:"apiKey,omitempty"`
 }
 
-func (p *ProjectCredentials) Unmarshal(data []byte) error {
+func (p ProjectCredentials) Unmarshal(data []byte) error {
+	if len(data) == 0 {
+		return nil
+	}
 	err := yaml.NewDecoder(bytes.NewReader(data)).Decode(p)
 	if err != nil {
 		return err
 	}
-	for k, v := range *p {
+	for k, v := range p {
 		v.ProjectName = k
+		p[k] = v
 	}
 	return nil
 }
 
 func LoadUserCredentials() ProjectCredentials {
-	data := ReadOrCreateUserCredentialsFile()
+	data := readOrCreateUserCredentialsFile()
 
 	projects := ProjectCredentials{}
+
 	err := projects.Unmarshal(data)
 
 	if err != nil {
@@ -70,7 +75,7 @@ func getCredentialsPath() string {
 	return filePath
 }
 
-func ReadOrCreateUserCredentialsFile() []byte {
+func readOrCreateUserCredentialsFile() []byte {
 	credPath := GetCredentialsPath()
 
 	_, fileStateErr := os.Stat(credPath)
@@ -88,7 +93,7 @@ func ReadOrCreateUserCredentialsFile() []byte {
 	return data
 }
 
-func GetUserCredentials(targetProjectName string) *ProjectCredential {
+func GetUserCredentials(targetProjectName string) ProjectCredential {
 	projects := LoadUserCredentials()
 
 	if val, ok := projects[targetProjectName]; ok {
@@ -97,22 +102,22 @@ func GetUserCredentials(targetProjectName string) *ProjectCredential {
 		p := ProjectCredential{
 			ProjectName: targetProjectName,
 		}
-		projects[targetProjectName] = &p
-		return &p
+		projects[targetProjectName] = p
+		return p
 	}
 }
 
-func (project *ProjectCredential) Save() {
+func Save(project ProjectCredential) {
 	projects := LoadUserCredentials()
 	projects[project.ProjectName] = project
-	projects.Save()
+	RewriteCredentialsFile(projects)
 }
 
-func (projects *ProjectCredentials) Save() {
+func RewriteCredentialsFile(projects ProjectCredentials) {
 	credsPath := GetCredentialsPath()
-	content, _ := yaml.Marshal(&projects)
+	content, _ := yaml.Marshal(projects)
 	err := ioutil.WriteFile(credsPath, content, 0644)
 	if err != nil {
-		log.Panicf("failed to parse config: %v", err)
+		log.Panicf("failed to write config: %v", err)
 	}
 }

internal/config/global_config_test.go

@@ -41,15 +41,16 @@ func copyFile(from string, to string) {
 }
 func TestReadOrCreateUserCredentialsFile(t *testing.T) {
 	config.GetCredentialsPath = func() string {
-		return path.Join("../../tests/test_data/", "configs/does-not-exist.yml")
+		return path.Join(baseTestFixturesDir, "does-not-exist.yml")
 	}
 	credPath := config.GetCredentialsPath()
-	defer os.RemoveAll(credPath)
 
+	defer os.RemoveAll(credPath)
 	_, fileStateErr := os.Stat(credPath)
 	assert.True(t, os.IsNotExist(fileStateErr), "File should not exist")
+	// attempting to read the file should create the file
+	config.GetUserCredentials("any-project")
 
-	config.ReadOrCreateUserCredentialsFile()
 	stats, err := os.Stat(credPath)
 	assert.False(t, os.IsNotExist(err), "File should be created")
 	assert.Equal(t, "does-not-exist.yml", stats.Name(), "Should create yml automatically")
@@ -88,15 +89,15 @@ func TestEditUserCredentials(t *testing.T) {
 		projectName := "test-project3"
 		project := config.GetUserCredentials(projectName)
 		project.AWSResourceConfig.AccessKeyId = "TEST_KEY_ID_1"
-		project.Save()
+		config.Save(project)
 		newKeyID := config.GetUserCredentials(projectName).AWSResourceConfig.AccessKeyId
 		assert.Equal(t, "TEST_KEY_ID_1", newKeyID)
 	})
 	t.Run("Should edit old project if already exist", func(t *testing.T) {
 		projectName := "my-project"
 		project := config.GetUserCredentials(projectName)
 		project.AWSResourceConfig.AccessKeyId = "EDITED_ACCESS_KEY_ID"
-		project.Save()
+		config.Save(project)
 		newKeyID := config.GetUserCredentials(projectName).AWSResourceConfig.AccessKeyId
 		assert.Equal(t, "EDITED_ACCESS_KEY_ID", newKeyID)
 	})

internal/context/init.go

@@ -110,7 +110,7 @@ func promptGithubPersonalToken(projectName string) string {
 	// If its different from saved token, update it
 	if project.GithubResourceConfig.AccessToken != result {
 		project.GithubResourceConfig.AccessToken = result
-		project.Save()
+		config.Save(project)
 	}
 	return result
 }