-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
zero init features: dedupe/new prompts/config file
- Loading branch information
1 parent
d4f95bf
commit 7e655d1
Showing
9 changed files
with
325 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| package configs | ||
|
|
||
| const ( | ||
| TemplatesDir = "tmp/templates" | ||
| ZeroProjectYml = "zero-project.yml" | ||
| IgnoredPaths = "(?i)zero.module.yml|.git/" | ||
| TemplateExtn = ".tmpl" | ||
| TemplatesDir = "tmp/templates" | ||
| ZeroProjectYml = "zero-project.yml" | ||
| ZeroHomeDirectory = ".zero" | ||
| UserCredentials = "credentials.yml" | ||
| IgnoredPaths = "(?i)zero.module.yml|.git/" | ||
| TemplateExtn = ".tmpl" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "io/ioutil" | ||
| "log" | ||
| "os" | ||
| "os/user" | ||
| "path" | ||
|
|
||
| "github.com/commitdev/zero/configs" | ||
| yaml "gopkg.in/yaml.v2" | ||
| ) | ||
|
|
||
| var GetCredentialsPath = getCredentialsPath | ||
|
|
||
| type Projects map[string]*Project | ||
|
|
||
| type Project struct { | ||
| ProjectName string `yaml:"-"` | ||
| AWSResourceConfig `yaml:"aws,omitempty"` | ||
| GithubResourceConfig `yaml:"github,omitempty"` | ||
| CircleCiResourceConfig `yaml:"circleci,omitempty"` | ||
| } | ||
|
|
||
| type AWSResourceConfig struct { | ||
| AccessKeyId string `yaml:"accessKeyId,omitempty"` | ||
| SecretAccessKey string `yaml:"secretAccessKey,omitempty"` | ||
| } | ||
| type GithubResourceConfig struct { | ||
| AccessToken string `yaml:"accessToken,omitempty"` | ||
| } | ||
| type CircleCiResourceConfig struct { | ||
| ApiKey string `yaml:"apiKey,omitempty"` | ||
| } | ||
|
|
||
| func (p *Projects) Unmarshal(data []byte) error { | ||
| err := yaml.NewDecoder(bytes.NewReader(data)).Decode(p) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for k, v := range *p { | ||
| v.ProjectName = k | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func LoadUserCredentials() Projects { | ||
| data := ReadOrCreateUserCredentialsFile() | ||
|
|
||
| projects := Projects{} | ||
| err := projects.Unmarshal(data) | ||
|
|
||
| if err != nil { | ||
| log.Fatalf("Failed to parse configuration: %v", err) | ||
| } | ||
| return projects | ||
| } | ||
|
|
||
| func getCredentialsPath() string { | ||
| usr, err := user.Current() | ||
| if err != nil { | ||
| log.Fatalf("Failed to get user directory path: %v", err) | ||
| } | ||
|
|
||
| rootDir := path.Join(usr.HomeDir, configs.ZeroHomeDirectory) | ||
| os.MkdirAll(rootDir, os.ModePerm) | ||
| filePath := path.Join(rootDir, configs.UserCredentials) | ||
| return filePath | ||
| } | ||
|
|
||
| func ReadOrCreateUserCredentialsFile() []byte { | ||
| credPath := GetCredentialsPath() | ||
|
|
||
| _, fileStateErr := os.Stat(credPath) | ||
| if os.IsNotExist(fileStateErr) { | ||
| var file, fileStateErr = os.Create(credPath) | ||
| if fileStateErr != nil { | ||
| log.Fatalf("Failed to create config file: %v", fileStateErr) | ||
| } | ||
| defer file.Close() | ||
| } | ||
| data, err := ioutil.ReadFile(credPath) | ||
| if err != nil { | ||
| log.Fatalf("Failed to read credentials file: %v", err) | ||
| } | ||
| return data | ||
|
|
||
| } | ||
|
|
||
| func GetUserCredentials(targetProjectName string) *Project { | ||
| projects := LoadUserCredentials() | ||
|
|
||
| if val, ok := projects[targetProjectName]; ok { | ||
| return val | ||
| } else { | ||
| p := Project{ | ||
| ProjectName: targetProjectName, | ||
| } | ||
| projects[targetProjectName] = &p | ||
| return &p | ||
| } | ||
| } | ||
|
|
||
| func (project *Project) Save() { | ||
| projects := LoadUserCredentials() | ||
| projects[project.ProjectName] = project | ||
| projects.Save() | ||
| } | ||
|
|
||
| func (projects *Projects) Save() { | ||
| credsPath := GetCredentialsPath() | ||
| content, _ := yaml.Marshal(&projects) | ||
| err := ioutil.WriteFile(credsPath, content, 0644) | ||
| if err != nil { | ||
| log.Panicf("failed to parse config: %v", err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package config_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "log" | ||
| "os" | ||
| "path" | ||
| "testing" | ||
|
|
||
| "github.com/commitdev/zero/internal/config" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| const baseTestFixturesDir = "../../tests/test_data/configs/" | ||
|
|
||
| var testCredentialFile = func() (func() string, func()) { | ||
| tmpConfigPath := getTmpConfig() | ||
| mockFunc := func() string { return tmpConfigPath } | ||
| teardownFunc := func() { os.RemoveAll(tmpConfigPath) } | ||
| return mockFunc, teardownFunc | ||
| } | ||
|
|
||
| func getTmpConfig() string { | ||
| pathFrom := path.Join(baseTestFixturesDir, fmt.Sprintf("credentials%s.yml", "")) | ||
| pathTo := path.Join(baseTestFixturesDir, fmt.Sprintf("credentials%s.yml", "-tmp")) | ||
| copyFile(pathFrom, pathTo) | ||
| return pathTo | ||
| } | ||
|
|
||
| func copyFile(from string, to string) { | ||
| bytesRead, err := ioutil.ReadFile(from) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| err = ioutil.WriteFile(to, bytesRead, 0644) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| } | ||
| func TestReadOrCreateUserCredentialsFile(t *testing.T) { | ||
| config.GetCredentialsPath = func() string { | ||
| return path.Join("../../tests/test_data/", "configs/does-not-exist.yml") | ||
| } | ||
| credPath := config.GetCredentialsPath() | ||
| defer os.RemoveAll(credPath) | ||
|
|
||
| _, fileStateErr := os.Stat(credPath) | ||
| assert.True(t, os.IsNotExist(fileStateErr), "File should not exist") | ||
|
|
||
| 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") | ||
| } | ||
|
|
||
| func TestGetUserCredentials(t *testing.T) { | ||
| var teardownFn func() | ||
| config.GetCredentialsPath, teardownFn = testCredentialFile() | ||
| defer teardownFn() | ||
|
|
||
| t.Run("Fixture file should have existing project with creds", func(t *testing.T) { | ||
| projectName := "my-project" | ||
| project := config.GetUserCredentials(projectName) | ||
|
|
||
| // Reading from fixtures: tests/test_data/configs/credentials.yml | ||
| assert.Equal(t, "AKIAABCD", project.AWSResourceConfig.AccessKeyId) | ||
| assert.Equal(t, "ZXCV", project.AWSResourceConfig.SecretAccessKey) | ||
| assert.Equal(t, "0987", project.GithubResourceConfig.AccessToken) | ||
| assert.Equal(t, "SOME_API_KEY", project.CircleCiResourceConfig.ApiKey) | ||
| }) | ||
|
|
||
| t.Run("Fixture file should support multiple projects", func(t *testing.T) { | ||
| projectName := "another-project" | ||
| project := config.GetUserCredentials(projectName) | ||
| assert.Equal(t, "654", project.GithubResourceConfig.AccessToken) | ||
| }) | ||
|
|
||
| } | ||
|
|
||
| func TestEditUserCredentials(t *testing.T) { | ||
| var teardownFn func() | ||
| config.GetCredentialsPath, teardownFn = testCredentialFile() | ||
| defer teardownFn() | ||
|
|
||
| t.Run("Should create new project if not exist", func(t *testing.T) { | ||
| projectName := "test-project3" | ||
| project := config.GetUserCredentials(projectName) | ||
| project.AWSResourceConfig.AccessKeyId = "TEST_KEY_ID_1" | ||
| project.Save() | ||
| 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() | ||
| newKeyID := config.GetUserCredentials(projectName).AWSResourceConfig.AccessKeyId | ||
| assert.Equal(t, "EDITED_ACCESS_KEY_ID", newKeyID) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.