-
Notifications
You must be signed in to change notification settings - Fork 339
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Carry #208] Use the XDG Basedir Spec for the cache #250
Open
samuelkarp
wants to merge
2
commits into
awslabs:main
Choose a base branch
from
samuelkarp:xdg-basedir
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"). You may | ||
| // not use this file except in compliance with the License. A copy of the | ||
| // License is located at | ||
| // | ||
| // http://aws.amazon.com/apache2.0/ | ||
| // | ||
| // or in the "license" file accompanying this file. This file is distributed | ||
| // on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| // express or implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/mitchellh/go-homedir" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestGetCacheDir(t *testing.T) { | ||
| // caching is disabled so we can adjust the HOME env var | ||
| homedir.DisableCache = true | ||
| tempDir := os.TempDir() | ||
| defer os.RemoveAll(tempDir) | ||
| restore := os.Getenv("HOME") | ||
| os.Setenv("HOME", tempDir) | ||
| defer os.Setenv("HOME", restore) | ||
| home, err := homedir.Dir() | ||
| require.NoError(t, err, "home must be resolved") | ||
| require.Equal(t, tempDir, home, "expect home to be tempDir") | ||
| userCache, err := os.UserCacheDir() | ||
| require.NoError(t, err, "user cache dir must be resolved") | ||
| // Note: tests that adjust environment variables are not thread-safe | ||
| t.Run("AWS_ECR_CACHE_DIR valid", func(t *testing.T) { | ||
| restore := os.Getenv("AWS_ECR_CACHE_DIR") | ||
| os.Setenv("AWS_ECR_CACHE_DIR", "~/testval") | ||
| defer os.Setenv("AWS_ECR_CACHE_DIR", restore) | ||
|
|
||
| actual, err := GetCacheDir() | ||
| assert.NoError(t, err, "should resolve cache dir") | ||
| assert.Equal(t, filepath.Join(home, "testval"), actual) | ||
| }) | ||
|
|
||
| t.Run("AWS_ECR_CACHE_DIR invalid", func(t *testing.T) { | ||
| restore := os.Getenv("AWS_ECR_CACHE_DIR") | ||
| os.Setenv("AWS_ECR_CACHE_DIR", "~testval") | ||
| defer os.Setenv("AWS_ECR_CACHE_DIR", restore) | ||
|
|
||
| actual, err := GetCacheDir() | ||
| assert.NoError(t, err, "should resolve cache dir") | ||
| assert.Equal(t, filepath.Join(userCache, "ecr"), actual) | ||
| }) | ||
|
|
||
| t.Run("old exists", func(t *testing.T) { | ||
| err := os.Mkdir(filepath.Join(tempDir, ".ecr"), 0755) | ||
| require.NoError(t, err) | ||
| defer os.RemoveAll(filepath.Join(tempDir, ".ecr")) | ||
|
|
||
| actual, err := GetCacheDir() | ||
| assert.NoError(t, err, "should resolve cache dir") | ||
| assert.Equal(t, filepath.Join(tempDir, ".ecr"), actual) | ||
| }) | ||
|
|
||
| t.Run("default", func(t *testing.T) { | ||
| actual, err := GetCacheDir() | ||
| assert.NoError(t, err, "should resolve cache dir") | ||
| assert.Equal(t, filepath.Join(userCache, "ecr"), actual) | ||
| }) | ||
| } |
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
28 changes: 28 additions & 0 deletions
28
ecr-login/vendor/github.com/stretchr/testify/require/doc.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
ecr-login/vendor/github.com/stretchr/testify/require/forward_requirements.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
GetCacheDir does more than what this comment explains. How about removing the comment from here?