Integrate apply command #175
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
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
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,27 +1,41 @@ | ||
| package apply_test | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/commitdev/zero/internal/apply" | ||
| "github.com/commitdev/zero/internal/constants" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/termie/go-shutil" | ||
| ) | ||
|
|
||
| func TestApply(t *testing.T) { | ||
| dir := "../../tests/test_data/apply/" | ||
| applyConfigPath := constants.ZeroProjectYml | ||
| applyEnvironments := []string{"staging", "production"} | ||
|
|
||
| tmpDir := filepath.Join(os.TempDir(), "apply") | ||
|
|
||
| err := os.RemoveAll(tmpDir) | ||
| assert.NoError(t, err) | ||
|
|
||
| err = shutil.CopyTree(dir, tmpDir, nil) | ||
| assert.NoError(t, err) | ||
|
|
||
| t.Run("Should run apply and execute make on each folder module", func(t *testing.T) { | ||
| apply.Apply(tmpDir, applyConfigPath, applyEnvironments) | ||
| assert.FileExists(t, filepath.Join(tmpDir, "project1/project.out")) | ||
| assert.FileExists(t, filepath.Join(tmpDir, "project2/project.out")) | ||
|
|
||
| content, err := ioutil.ReadFile(filepath.Join(tmpDir, "project1/project.out")) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, "foo: bar\nrepo: github.com/commitdev/project1\n", string(content)) | ||
|
|
||
| content, err = ioutil.ReadFile(filepath.Join(tmpDir, "project2/project.out")) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, "baz: qux\n", string(content)) | ||
| }) | ||
| } |
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 |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ import ( | |
| "os" | ||
| "os/user" | ||
| "path" | ||
| "reflect" | ||
|
|
||
| "github.com/commitdev/zero/internal/constants" | ||
| "github.com/commitdev/zero/pkg/util/exit" | ||
|
|
@@ -25,14 +26,14 @@ type ProjectCredential struct { | |
| } | ||
|
|
||
| type AWSResourceConfig struct { | ||
| AccessKeyID string `yaml:"accessKeyId,omitempty" env:"AWS_ACCESS_KEY_ID"` | ||
| SecretAccessKey string `yaml:"secretAccessKey,omitempty" env:"AWS_SECRET_ACCESS_KEY"` | ||
| } | ||
| type GithubResourceConfig struct { | ||
| AccessToken string `yaml:"accessToken,omitempty" env:"GITHUB_ACCESS_TOKEN"` | ||
| } | ||
| type CircleCiResourceConfig struct { | ||
| ApiKey string `yaml:"apiKey,omitempty" env:"CIRCLECI_API_KEY"` | ||
| } | ||
|
|
||
| func (p ProjectCredentials) Unmarshal(data []byte) error { | ||
|
|
@@ -50,6 +51,35 @@ func (p ProjectCredentials) Unmarshal(data []byte) error { | |
| return nil | ||
| } | ||
|
|
||
| // AsEnvVars marshals ProjectCredential as a map of key/value strings suitable for environment variables | ||
| func (p ProjectCredential) AsEnvVars() map[string]string { | ||
|
There was a problem hiding this comment. @davidcheung This should help with #173 |
||
| t := reflect.ValueOf(p) | ||
|
|
||
| list := make(map[string]string) | ||
| list = gatherFieldTags(t, list) | ||
|
|
||
| return list | ||
| } | ||
|
|
||
| func gatherFieldTags(t reflect.Value, list map[string]string) map[string]string { | ||
| reflectType := t.Type() | ||
|
|
||
| for i := 0; i < t.NumField(); i++ { | ||
| fieldValue := t.Field(i) | ||
| fieldType := reflectType.Field(i) | ||
|
|
||
| if fieldType.Type.Kind() == reflect.Struct { | ||
| list = gatherFieldTags(fieldValue, list) | ||
| continue | ||
| } | ||
|
|
||
| if env := fieldType.Tag.Get("env"); env != "" { | ||
| list[env] = fieldValue.String() | ||
| } | ||
| } | ||
| return list | ||
| } | ||
|
|
||
| func LoadUserCredentials() ProjectCredentials { | ||
| data := readOrCreateUserCredentialsFile() | ||
|
|
||
|
|
||
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be better to return the error in this case and let the caller throw the error for consistency like
initin #130?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nvm, I just realized your comment was specific to if I wanted to test the error case so I guess that doesn't apply here because it's not a standard we're enforcing.