envfiles: create directory where the envfile will be written #2407
Conversation
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
yhlee-aws
approved these changes
Mar 26, 2020
|
Unit tests are failing on windows because file path delimiter is "\" not "/". |
yhlee-aws
reviewed
Mar 26, 2020
| // createEnvfileDirectory creates the directory that we will be writing the | ||
| // envfile to - needs to be called for each different bucket | ||
| func (envfile *EnvironmentFileResource) createEnvfileDirectory(bucket string) error { | ||
| envfileDir := filepath.Join(envfile.resourceDir, bucket) |
There was a problem hiding this comment.
we need to include key as subdirectory path too
yhlee-aws
reviewed
Mar 26, 2020
| // envfile to - needs to be called for each different envfile | ||
| func (envfile *EnvironmentFileResource) createEnvfileDirectory(bucket, key string) error { | ||
| // create directories to include bucket and key but not the actual resulting file | ||
| envfileDir := filepath.Join(envfile.resourceDir, bucket, strings.TrimRight(key, string(filepath.Separator))) |
There was a problem hiding this comment.
we should use filepath.Dir instead of strings.TrimRight.
fenxiong
approved these changes
Mar 26, 2020
| // envfile to - needs to be called for each different envfile | ||
| func (envfile *EnvironmentFileResource) createEnvfileDirectory(bucket, key string) error { | ||
| // create directories to include bucket and key but not the actual resulting file | ||
| envfileDir := filepath.Join(envfile.resourceDir, bucket, strings.TrimRight(key, string(filepath.Separator))) |
yhlee-aws
reviewed
Mar 26, 2020
| @@ -129,10 +130,12 @@ func TestCreateWithEnvVarFile(t *testing.T) { | |||
| }, | |||
| } | |||
|
|
|||
| envDirectories := filepath.Join(resourceDir, s3Bucket) | |||
There was a problem hiding this comment.
we should test s3Key being more than just the file name, to test that we are creating all the subdirectories correctly. And for verification, I wouldn't use the same api as what the code we are trying to test is using, but instead of known fixed value.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
creates the directories for where environment files will be written
Implementation details
Testing
make testsuccessful - running agent locally i can see the envfiles are created.New tests cover the changes: yes
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.